Removing a bunch of stuff from the demo project.