Revert "Map updates"

This reverts commit 3038c29cf60de900194a378d458537064a80deae.