more post demo cleanup