A little cleanup
Back with resume in unite.
clean up some unused maps.