Removed some unnecessary code, fixed battlemod compat issues

Removed some unnecessary code, fixed battlemod compat issues