remove regular (bool) from fields of Payment
PaymentSystem fromString now works