safer cleanup of unit locations