Remove unused code from demo