Remove make_map and purge it from the code.

closes #938