Removed useless code

Also removed unused OCombatTracker.
A remainder of testing something.