Removing remaining demo code