Remove two-factor contrast code in favor of model based code.