Remove some lines from the old way of generating the map that were just wasting time.
Starting to clean up the main mapper file so it's less embarassing.