getting rid of more demo stuff.