Gunrack and Fire Barrel tweaks (Remove/comment out eventhandler)

#721