only track units in combat & general cleanup