Combatant Refactor

Changes to Combatant and Namespace to remove unused artifacts.