Simplify PaymentMethod, remove extra methods

Remove a couple of extra methods that created either single or
multiple in/out payments.

They have not really been useful since we created the Payment.TYPE_IN/OUT
enums a while back.

Change-Id: I4e050ef13d85ff80a7b209ed4bf54a6935076e90