Umshot clean up

STANDARD - 2,326   GOLD - 981