Map System
Revert "Map System"

This reverts commit 59df3b029e7c2f28daa6d0b28f830522ae734e20.