now can remove a unit.
minor:  code cleanup.