Remove overlays, refactor vector layer creation, etc