Removing garbage form grenade mode (see issue #1)