Revert "Map Rework"

This reverts commit 992d4ffae79afc6f16fb622a0eb4aec4ec42f5fc.