Some demo cleanup