Revert "Small modifications to map"

This reverts commit d42b6dacc271ae6cd04ae733847f0ae8ff36f51b.