Clean up overlays on shutdown
Clean up temporary (monkey) patches