Umshot clean up

STANDARD - 76,465   GOLD - 15,926