Clean up PaymentGroup code