Remove extra dump vars, s/WAIT_TRIG/CAP_START/