Misc cleanup before adding sawblade attacking