Removed BattleTest as it is no longer used
Cleaned source code

Should not affect functionality at all