Rewrite calc. of promotions, remove ref. to tax_cloud