Remove deprecated plan_id and payment_id attributes

That