Removing debug code from demo