Remove payment_method enrollment check