Cleaning up the map data