Just did some more cleanup

Removed some testing code I had left in there. Starting to think about
writing battle functions.