Capture demo cleanup