Code clean up and remove unused method in DemoApp. Made a copy of
demoapp in my own directory