Clean up the surface demos.