More maps
Revert "More maps"

This reverts commit 973e5dbbb335915e6d2e6dc295caa75219eaa8cf.