Remove payment_method reference