Minor demo cleanup