cleaned map file

uses clean_map_git to fix the map change, hopefully not everything can
automerge, otherwise I'm going to revert everything and use mapmerge
this time