Remove make_map and purge it from the code.
Merge pull request #1053 from Cadair/0.5_make_map

Remove make_map and purge it from the code.