I have several NPCs that were at one time combatants and in the Combat Tracker. (Horses, villages, surrender opponents, etc.) I can remove them from the combat tracker, but doing so deletes them from the map. Is there a way to remove non-combatants from the combat tracker and leave their tokens on the battle mat?