Revert "Start of new map"

This reverts commit f4aa4cc17a024bca646ca3fbdfaaa9794ef87f79.