Removed some unnecessary code, fixed battlemod compat issues

Removed some unnecessary code, fixed battlemod compat issues
Merge pull request #295 from Podginator/master

Removed some unnecessary code, fixed battlemod compat issues