removed a lot of battle stuff