Revert "Map"

This reverts commit 99fa3db76de406da934ad4a19f9ff02ac2fffca3.