clean up the map a bit