more parameterization removal