overlay: Clean-Up of useless overlays