Umshot clean up

STANDARD - 75,658   GOLD - 15,810