Clean up some more map related stuff