Revert "Maps"

This reverts commit abd09b2583a6d72c0012e0d5e0c4051b274dd3d9.