Clean up of combat rules