Lots of coupon code cleanup