Remove CombatTag system dependency