Revert "Map"

This reverts commit af07b69afaebc90d783422d03af2ad0c2ba16905.