[PricingAnalytics] partial rollback; class code moved to dev branch