Removed some unnecessary logic from the Battle