cleanup and starting work on UnitID