Umshot clean up

STANDARD - 9,531   GOLD - 4,131