Clean DemoApp's code