Mitigation techniques include using grooved chamber surfaces (left) in the dipoles and clearing electrodes (right) in the high-field wigglers.