Cleanup Map.cpp