more state cleanup for battle component