Revert "overlays: enable all location overlays + misc cleanup"

This reverts commit 7a01edb35b92726f614ddda15b60b868640b89cb.