Remove remaining references to the param values