more PricingSet related clean up