more demo cleanup