Current you not use the `payment_choice` field, so it would be nice to remove it and use only the `payment_method `.