a little more demo cleanup