Revert "Maps"

This reverts commit 628ccc9488832364abe10167c4893c76f610becf.