remove Model and PaymentInstruction interfaces.