More copies of PaymentHelper to remove