Revert "Modifying map, this time after preparing and cleaning it hopefully"

This reverts commit 0bc86aa4d1b6dd8dec0629a94d243cd976032bd4.