Removed PaymentMethod type

Better to query the known Payment subclasses in the
right contexts.