Remove InvoicePayer and replace with util methods