Cleaned up the battle system

I removed some of the stuff that was unnecessary and will probably
refactor more. It's a lot better than it was that's for sure.