cleaning some code in demo-app