Revert "Map Stuff (initial)"

This reverts commit 790f2d00d4f27f9ee4e4344260d65c3f18d3190d.