[Hotfix] OPD A3P price/contingent class cleanup