Removed unused stuff from demo (master)