Some battle system cleanup.