Clean up deprecated DCAE parameters from R2