Revert "Maps"

This reverts commit da92ee1ac6f9d9d3643ec9e5c686ab7858be4cfa.