Revert "Map Select"

This reverts commit 981acd30c9b734f4e6f99076ab477ae0f8665980.