[FOLD] Overlay cleanup