More Overlay Cleanup