Fix the upsell recurring so that it properly records the future payments, and remove duplicates when decoupling.