more DemoScene clean up