Remove some of the crap try to get down to the bare bones of the demo