Move grenade timer removal to appropriate function