Cleaned up DemoScene