Revert "Revert "cleanup overlay. This goes in common""

This reverts commit 0900cc98f9000ab9397d7ae561420de34f989f49.