some demo cleanup