Revert "Major Rendering Changes to the Map class"

This reverts commit 8f5a9f676c3e01ba94e5ebd48e94a0f39dc2def2.