Overlaycleanup

Cleaning up Overlays for #148