Capture cleanup