removing most of the demo stuff