diff --git a/src/Mollie.Api/Client/Abstract/IBalanceClient.cs b/src/Mollie.Api/Client/Abstract/IBalanceClient.cs
index 4f6bf073..3255d68a 100644
--- a/src/Mollie.Api/Client/Abstract/IBalanceClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IBalanceClient.cs
@@ -3,7 +3,6 @@
 using Mollie.Api.Models.Balance.Response;
 using Mollie.Api.Models.Balance.Response.BalanceReport;
 using Mollie.Api.Models.Balance.Response.BalanceTransaction;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Url;
 
@@ -19,4 +18,4 @@ public interface IBalanceClient : IBaseMollieClient {
         Task<BalanceTransactionResponse> ListBalanceTransactionsAsync(string balanceId, string? from = null, int? limit = null);
         Task<BalanceTransactionResponse> ListPrimaryBalanceTransactionsAsync(string? from = null, int? limit = null);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/ICaptureClient.cs b/src/Mollie.Api/Client/Abstract/ICaptureClient.cs
index a4708ee2..d62a4e63 100644
--- a/src/Mollie.Api/Client/Abstract/ICaptureClient.cs
+++ b/src/Mollie.Api/Client/Abstract/ICaptureClient.cs
@@ -1,6 +1,4 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.List;
-using Mollie.Api.Models.Capture;
 using Mollie.Api.Models.Capture.Request;
 using Mollie.Api.Models.Capture.Response;
 using Mollie.Api.Models.List.Response;
@@ -14,4 +12,4 @@ public interface ICaptureClient : IBaseMollieClient {
         Task<ListResponse<CaptureResponse>> GetCapturesListAsync(UrlObjectLink<ListResponse<CaptureResponse>> url);
         Task<CaptureResponse> CreateCapture(string paymentId, CaptureRequest captureRequest, bool testmode = false);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs b/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs
index acea7ba3..7f14b1f1 100644
--- a/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IChargebacksClient.cs
@@ -1,7 +1,5 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.Chargeback;
 using Mollie.Api.Models.Chargeback.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Url;
 
@@ -12,4 +10,4 @@ public interface IChargebacksClient : IBaseMollieClient {
         Task<ListResponse<ChargebackResponse>> GetChargebacksListAsync(string? profileId = null, bool testmode = false);
         Task<ListResponse<ChargebackResponse>> GetChargebacksListAsync(UrlObjectLink<ListResponse<ChargebackResponse>> url);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/IConnectClient.cs b/src/Mollie.Api/Client/Abstract/IConnectClient.cs
index 93070497..5f0586a1 100644
--- a/src/Mollie.Api/Client/Abstract/IConnectClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IConnectClient.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Mollie.Api.Models.Connect;
 using Mollie.Api.Models.Connect.Request;
 using Mollie.Api.Models.Connect.Response;
 
@@ -25,8 +24,8 @@ public interface IConnectClient : IDisposable
         ///     merchant, even when it is not necessary
         /// </param>
         /// <param name="locale">
-        ///     Allows you to preset the language to be used in the login / sign up / authorize flow if the merchant is not known by Mollie. 
-        ///     When this parameter is omitted, the browser language will be used instead. 
+        ///     Allows you to preset the language to be used in the login / sign up / authorize flow if the merchant is not known by Mollie.
+        ///     When this parameter is omitted, the browser language will be used instead.
         ///     You can provide any ISO 15897 locale, but the authorize flow currently only supports the following languages:
         ///     Possible values: en_US nl_NL nl_BE fr_FR fr_BE de_DE es_ES it_IT
         /// </param>
@@ -58,4 +57,4 @@ string GetAuthorizationUrl(
         /// <returns></returns>
         Task RevokeTokenAsync(RevokeTokenRequest request);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/ICustomerClient.cs b/src/Mollie.Api/Client/Abstract/ICustomerClient.cs
index 924289df..2cc29c1f 100644
--- a/src/Mollie.Api/Client/Abstract/ICustomerClient.cs
+++ b/src/Mollie.Api/Client/Abstract/ICustomerClient.cs
@@ -1,8 +1,6 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.Customer;
 using Mollie.Api.Models.Customer.Request;
 using Mollie.Api.Models.Customer.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment.Request;
 using Mollie.Api.Models.Payment.Response;
@@ -20,4 +18,4 @@ public interface ICustomerClient : IBaseMollieClient {
         Task<ListResponse<PaymentResponse>> GetCustomerPaymentListAsync(string customerId, string? from = null, int? limit = null, string? profileId = null, bool testmode = false);
         Task<PaymentResponse> CreateCustomerPayment(string customerId, PaymentRequest paymentRequest);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs b/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs
index 87258665..3d6d487d 100644
--- a/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IInvoicesClient.cs
@@ -1,7 +1,5 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.Invoice;
 using Mollie.Api.Models.Invoice.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Url;
 
@@ -13,4 +11,4 @@ Task<ListResponse<InvoiceResponse>> GetInvoiceListAsync(
             string? reference = null, int? year = null, string? from = null, int? limit = null);
         Task<ListResponse<InvoiceResponse>> GetInvoiceListAsync(UrlObjectLink<ListResponse<InvoiceResponse>> url);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/IMandateClient.cs b/src/Mollie.Api/Client/Abstract/IMandateClient.cs
index ca6e0e73..cebcaa3e 100644
--- a/src/Mollie.Api/Client/Abstract/IMandateClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IMandateClient.cs
@@ -1,7 +1,5 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Mandate;
 using Mollie.Api.Models.Mandate.Request;
 using Mollie.Api.Models.Mandate.Response;
 using Mollie.Api.Models.Url;
@@ -15,4 +13,4 @@ public interface IMandateClient : IBaseMollieClient {
         Task<MandateResponse> GetMandateAsync(UrlObjectLink<MandateResponse> url);
         Task RevokeMandate(string customerId, string mandateId, bool testmode = false);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/IOrderClient.cs b/src/Mollie.Api/Client/Abstract/IOrderClient.cs
index 8eb2b3f3..c5c3f9a6 100644
--- a/src/Mollie.Api/Client/Abstract/IOrderClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IOrderClient.cs
@@ -1,13 +1,10 @@
 using System.Threading.Tasks;
 using Mollie.Api.Models;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Order;
 using Mollie.Api.Models.Order.Request;
 using Mollie.Api.Models.Order.Request.ManageOrderLines;
 using Mollie.Api.Models.Order.Response;
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Response;
 using Mollie.Api.Models.Url;
 
@@ -29,4 +26,4 @@ Task<ListResponse<OrderResponse>> GetOrderListAsync(
         Task<ListResponse<RefundResponse>> GetOrderRefundListAsync(
             string orderId, string? from = null, int? limit = null, bool testmode = false);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs b/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs
index d8fda26e..7d23efd4 100644
--- a/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IOrganizationsClient.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Organization;
 using Mollie.Api.Models.Url;
@@ -12,4 +11,4 @@ public interface IOrganizationsClient : IBaseMollieClient {
         Task<ListResponse<OrganizationResponse>> GetOrganizationsListAsync(UrlObjectLink<ListResponse<OrganizationResponse>> url);
         Task<OrganizationResponse> GetOrganizationAsync(UrlObjectLink<OrganizationResponse> url);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/IPaymentClient.cs b/src/Mollie.Api/Client/Abstract/IPaymentClient.cs
index 1e8e581a..28c9bd43 100644
--- a/src/Mollie.Api/Client/Abstract/IPaymentClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IPaymentClient.cs
@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Mollie.Api.Models;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment.Request;
 using Mollie.Api.Models.Payment.Response;
@@ -17,11 +16,11 @@ public interface IPaymentClient : IBaseMollieClient {
         /// <param name="testmode">Oauth - Optional – Set this to true to get a payment made in test mode. If you omit this parameter, you can only retrieve live mode payments.</param>
         /// <returns></returns>
         Task<PaymentResponse> GetPaymentAsync(
-            string paymentId, 
-            bool testmode = false, 
-            bool includeQrCode = false, 
-            bool includeRemainderDetails = false, 
-            bool embedRefunds = false, 
+            string paymentId,
+            bool testmode = false,
+            bool includeQrCode = false,
+            bool includeRemainderDetails = false,
+            bool embedRefunds = false,
             bool embedChargebacks = false);
 
         /// <summary>
@@ -40,19 +39,19 @@ Task<PaymentResponse> GetPaymentAsync(
         /// <param name="testmode"></param>
         /// <returns></returns>
 		Task<ListResponse<PaymentResponse>> GetPaymentListAsync(
-            string? from = null, 
-            int? limit = null, 
+            string? from = null,
+            int? limit = null,
             string? profileId = null,
-            bool testmode = false, 
-            bool includeQrCode = false, 
-            bool embedRefunds = false, 
+            bool testmode = false,
+            bool includeQrCode = false,
+            bool embedRefunds = false,
             bool embedChargebacks = false,
             SortDirection? sort = null);
-        
+
         Task<ListResponse<PaymentResponse>> GetPaymentListAsync(UrlObjectLink<ListResponse<PaymentResponse>> url);
-        
+
         Task<PaymentResponse> GetPaymentAsync(UrlObjectLink<PaymentResponse> url);
-        
+
         Task<PaymentResponse> UpdatePaymentAsync(string paymentId, PaymentUpdateRequest paymentUpdateRequest);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/IPaymentLinkClient.cs b/src/Mollie.Api/Client/Abstract/IPaymentLinkClient.cs
index 2027ce83..513589cf 100644
--- a/src/Mollie.Api/Client/Abstract/IPaymentLinkClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IPaymentLinkClient.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.PaymentLink.Request;
 using Mollie.Api.Models.PaymentLink.Response;
@@ -13,7 +12,7 @@ public interface IPaymentLinkClient : IBaseMollieClient {
         ///	Retrieve a single payment link object by its token.
         /// </summary>
         Task<PaymentLinkResponse> GetPaymentLinkAsync(string paymentLinkId, bool testmode = false);
-         
+
         /// <summary>
         /// Retrieve all payment links created with the current payment link profile, ordered from newest to oldest.
         /// </summary>
@@ -22,6 +21,6 @@ public interface IPaymentLinkClient : IBaseMollieClient {
         /// <returns></returns>
 		Task<ListResponse<PaymentLinkResponse>> GetPaymentLinkListAsync(string? from = null, int? limit = null, string? profileId = null, bool testmode = false);
         Task<ListResponse<PaymentLinkResponse>> GetPaymentLinkListAsync(UrlObjectLink<ListResponse<PaymentLinkResponse>> url);
-        Task<PaymentLinkResponse> GetPaymentLinkAsync(UrlObjectLink<PaymentLinkResponse> url); 
+        Task<PaymentLinkResponse> GetPaymentLinkAsync(UrlObjectLink<PaymentLinkResponse> url);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs b/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs
index ada107f7..e3a3f04f 100644
--- a/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IPaymentMethodClient.cs
@@ -1,42 +1,40 @@
 using System.Threading.Tasks;
 using Mollie.Api.Models;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment;
-using Mollie.Api.Models.PaymentMethod;
 using Mollie.Api.Models.PaymentMethod.Response;
 using Mollie.Api.Models.Url;
 
 namespace Mollie.Api.Client.Abstract {
     public interface IPaymentMethodClient : IBaseMollieClient {
 		Task<PaymentMethodResponse> GetPaymentMethodAsync(
-            string paymentMethod, 
-            bool includeIssuers = false, 
-            string? locale = null, 
-            bool includePricing = false, 
-            string? profileId = null, 
-            bool testmode = false, 
+            string paymentMethod,
+            bool includeIssuers = false,
+            string? locale = null,
+            bool includePricing = false,
+            string? profileId = null,
+            bool testmode = false,
             string? currency = null);
-        
+
         Task<ListResponse<PaymentMethodResponse>> GetAllPaymentMethodListAsync(
-            string? locale = null, 
-            Amount? amount = null, 
-            bool includeIssuers = false, 
-            bool includePricing = false, 
+            string? locale = null,
+            Amount? amount = null,
+            bool includeIssuers = false,
+            bool includePricing = false,
             string? profileId = null);
-        
+
         Task<ListResponse<PaymentMethodResponse>> GetPaymentMethodListAsync(
-            string? sequenceType = null, 
-            string? locale = null, 
-            Amount? amount = null, 
-            bool includeIssuers = false, 
-            bool includePricing = false, 
-            string? profileId = null, 
-            bool testmode = false, 
-            Resource? resource = null, 
-            string? billingCountry = null, 
+            string? sequenceType = null,
+            string? locale = null,
+            Amount? amount = null,
+            bool includeIssuers = false,
+            bool includePricing = false,
+            string? profileId = null,
+            bool testmode = false,
+            Resource? resource = null,
+            string? billingCountry = null,
             string? includeWallets = null);
-        
+
         Task<PaymentMethodResponse> GetPaymentMethodAsync(UrlObjectLink<PaymentMethodResponse> url);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs b/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs
index b08ac362..10129161 100644
--- a/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IPermissionsClient.cs
@@ -1,7 +1,5 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Permission;
 using Mollie.Api.Models.Permission.Response;
 using Mollie.Api.Models.Url;
 
@@ -11,4 +9,4 @@ public interface IPermissionsClient : IBaseMollieClient {
         Task<PermissionResponse> GetPermissionAsync(UrlObjectLink<PermissionResponse> url);
         Task<ListResponse<PermissionResponse>> GetPermissionListAsync();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/IProfileClient.cs b/src/Mollie.Api/Client/Abstract/IProfileClient.cs
index 2d020027..11155371 100644
--- a/src/Mollie.Api/Client/Abstract/IProfileClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IProfileClient.cs
@@ -1,7 +1,5 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.PaymentMethod;
 using Mollie.Api.Models.PaymentMethod.Response;
 using Mollie.Api.Models.Profile.Request;
 using Mollie.Api.Models.Profile.Response;
@@ -26,4 +24,4 @@ public interface IProfileClient : IBaseMollieClient {
         Task DisableGiftCardIssuerAsync(string profileId, string issuer);
         Task DisableGiftCardIssuerAsync(string issuer);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/IRefundClient.cs b/src/Mollie.Api/Client/Abstract/IRefundClient.cs
index 2cb26897..0e629262 100644
--- a/src/Mollie.Api/Client/Abstract/IRefundClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IRefundClient.cs
@@ -1,7 +1,5 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Request;
 using Mollie.Api.Models.Refund.Response;
 using Mollie.Api.Models.Url;
@@ -15,4 +13,4 @@ public interface IRefundClient : IBaseMollieClient {
         Task<ListResponse<RefundResponse>> GetRefundListAsync(UrlObjectLink<ListResponse<RefundResponse>> url);
         Task<RefundResponse> GetRefundAsync(UrlObjectLink<RefundResponse> url);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs b/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs
index ef5c7b52..cb44bffa 100644
--- a/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs
+++ b/src/Mollie.Api/Client/Abstract/ISettlementsClient.cs
@@ -1,14 +1,10 @@
 using System;
 using System.Threading.Tasks;
 using Mollie.Api.Models.Capture.Response;
-using Mollie.Api.Models.Chargeback;
 using Mollie.Api.Models.Chargeback.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Response;
-using Mollie.Api.Models.Settlement;
 using Mollie.Api.Models.Settlement.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/Client/Abstract/IShipmentClient.cs b/src/Mollie.Api/Client/Abstract/IShipmentClient.cs
index 7287dfd6..9df71ab5 100644
--- a/src/Mollie.Api/Client/Abstract/IShipmentClient.cs
+++ b/src/Mollie.Api/Client/Abstract/IShipmentClient.cs
@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Shipment.Request;
 using Mollie.Api.Models.Shipment.Response;
diff --git a/src/Mollie.Api/Client/Abstract/ISubscriptionClient.cs b/src/Mollie.Api/Client/Abstract/ISubscriptionClient.cs
index dd35379e..171d4e4c 100644
--- a/src/Mollie.Api/Client/Abstract/ISubscriptionClient.cs
+++ b/src/Mollie.Api/Client/Abstract/ISubscriptionClient.cs
@@ -1,8 +1,6 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.Subscription;
 using Mollie.Api.Models.Subscription.Request;
 using Mollie.Api.Models.Subscription.Response;
 using Mollie.Api.Models.Url;
@@ -19,4 +17,4 @@ public interface ISubscriptionClient : IBaseMollieClient {
         Task<SubscriptionResponse> UpdateSubscriptionAsync(string customerId, string subscriptionId, SubscriptionUpdateRequest request);
         Task<ListResponse<PaymentResponse>> GetSubscriptionPaymentListAsync(string customerId, string subscriptionId, string? from = null, int? limit = null, bool testmode = false);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Client/Abstract/ITerminalClient.cs b/src/Mollie.Api/Client/Abstract/ITerminalClient.cs
index 88ba634f..389712f5 100644
--- a/src/Mollie.Api/Client/Abstract/ITerminalClient.cs
+++ b/src/Mollie.Api/Client/Abstract/ITerminalClient.cs
@@ -1,7 +1,5 @@
 using System.Threading.Tasks;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Terminal;
 using Mollie.Api.Models.Terminal.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/Client/BalanceClient.cs b/src/Mollie.Api/Client/BalanceClient.cs
index cea5f448..f9a98406 100644
--- a/src/Mollie.Api/Client/BalanceClient.cs
+++ b/src/Mollie.Api/Client/BalanceClient.cs
@@ -8,7 +8,6 @@
 using Mollie.Api.Models.Balance.Response;
 using Mollie.Api.Models.Balance.Response.BalanceReport;
 using Mollie.Api.Models.Balance.Response.BalanceTransaction;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/Client/CaptureClient.cs b/src/Mollie.Api/Client/CaptureClient.cs
index a784939e..c1cfecf3 100644
--- a/src/Mollie.Api/Client/CaptureClient.cs
+++ b/src/Mollie.Api/Client/CaptureClient.cs
@@ -5,7 +5,6 @@
 using Mollie.Api.Extensions;
 using Mollie.Api.Models.Capture.Request;
 using Mollie.Api.Models.Capture.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/Client/ChargebacksClient.cs b/src/Mollie.Api/Client/ChargebacksClient.cs
index 4c7ba09d..d7c5d052 100644
--- a/src/Mollie.Api/Client/ChargebacksClient.cs
+++ b/src/Mollie.Api/Client/ChargebacksClient.cs
@@ -3,9 +3,7 @@
 using System.Threading.Tasks;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
-using Mollie.Api.Models.Chargeback;
 using Mollie.Api.Models.Chargeback.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/Client/ConnectClient.cs b/src/Mollie.Api/Client/ConnectClient.cs
index 0e0dcc06..476db114 100644
--- a/src/Mollie.Api/Client/ConnectClient.cs
+++ b/src/Mollie.Api/Client/ConnectClient.cs
@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
-using Mollie.Api.Models.Connect;
 using Mollie.Api.Models.Connect.Request;
 using Mollie.Api.Models.Connect.Response;
 
diff --git a/src/Mollie.Api/Client/CustomerClient.cs b/src/Mollie.Api/Client/CustomerClient.cs
index 01f23dbb..e326beb2 100644
--- a/src/Mollie.Api/Client/CustomerClient.cs
+++ b/src/Mollie.Api/Client/CustomerClient.cs
@@ -4,10 +4,8 @@
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
 using Mollie.Api.Models;
-using Mollie.Api.Models.Customer;
 using Mollie.Api.Models.Customer.Request;
 using Mollie.Api.Models.Customer.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment.Request;
 using Mollie.Api.Models.Payment.Response;
diff --git a/src/Mollie.Api/Client/InvoicesClient.cs b/src/Mollie.Api/Client/InvoicesClient.cs
index 07909406..ad560769 100644
--- a/src/Mollie.Api/Client/InvoicesClient.cs
+++ b/src/Mollie.Api/Client/InvoicesClient.cs
@@ -4,9 +4,7 @@
 using System.Threading.Tasks;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
-using Mollie.Api.Models.Invoice;
 using Mollie.Api.Models.Invoice.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/Client/MandateClient.cs b/src/Mollie.Api/Client/MandateClient.cs
index eb3ce05c..15a26902 100644
--- a/src/Mollie.Api/Client/MandateClient.cs
+++ b/src/Mollie.Api/Client/MandateClient.cs
@@ -4,9 +4,7 @@
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
 using Mollie.Api.Models;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Mandate;
 using Mollie.Api.Models.Mandate.Request;
 using Mollie.Api.Models.Mandate.Response;
 using Mollie.Api.Models.Url;
diff --git a/src/Mollie.Api/Client/OrderClient.cs b/src/Mollie.Api/Client/OrderClient.cs
index 5398a908..9ba3db38 100644
--- a/src/Mollie.Api/Client/OrderClient.cs
+++ b/src/Mollie.Api/Client/OrderClient.cs
@@ -4,13 +4,11 @@
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
 using Mollie.Api.Models;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Order.Request;
 using Mollie.Api.Models.Order.Request.ManageOrderLines;
 using Mollie.Api.Models.Order.Response;
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/Client/OrganizationsClient.cs b/src/Mollie.Api/Client/OrganizationsClient.cs
index bc4f60b8..75a25e8b 100644
--- a/src/Mollie.Api/Client/OrganizationsClient.cs
+++ b/src/Mollie.Api/Client/OrganizationsClient.cs
@@ -1,7 +1,6 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Mollie.Api.Client.Abstract;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Organization;
 using Mollie.Api.Models.Url;
diff --git a/src/Mollie.Api/Client/PaymentClient.cs b/src/Mollie.Api/Client/PaymentClient.cs
index 0191995c..492c52d1 100644
--- a/src/Mollie.Api/Client/PaymentClient.cs
+++ b/src/Mollie.Api/Client/PaymentClient.cs
@@ -4,7 +4,6 @@
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
 using Mollie.Api.Models;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment.Request;
 using Mollie.Api.Models.Payment.Response;
diff --git a/src/Mollie.Api/Client/PaymentLinkClient.cs b/src/Mollie.Api/Client/PaymentLinkClient.cs
index fe27d10a..074c6686 100644
--- a/src/Mollie.Api/Client/PaymentLinkClient.cs
+++ b/src/Mollie.Api/Client/PaymentLinkClient.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.PaymentLink.Request;
 using Mollie.Api.Models.PaymentLink.Response;
diff --git a/src/Mollie.Api/Client/PaymentMethodClient.cs b/src/Mollie.Api/Client/PaymentMethodClient.cs
index e670b4e7..a13bc0ad 100644
--- a/src/Mollie.Api/Client/PaymentMethodClient.cs
+++ b/src/Mollie.Api/Client/PaymentMethodClient.cs
@@ -4,10 +4,8 @@
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
 using Mollie.Api.Models;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment;
-using Mollie.Api.Models.PaymentMethod;
 using Mollie.Api.Models.PaymentMethod.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/Client/PermissionsClient.cs b/src/Mollie.Api/Client/PermissionsClient.cs
index 8ef43965..9f871a4d 100644
--- a/src/Mollie.Api/Client/PermissionsClient.cs
+++ b/src/Mollie.Api/Client/PermissionsClient.cs
@@ -1,9 +1,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Mollie.Api.Client.Abstract;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Permission;
 using Mollie.Api.Models.Permission.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/Client/ProfileClient.cs b/src/Mollie.Api/Client/ProfileClient.cs
index 5695cbaf..a585315b 100644
--- a/src/Mollie.Api/Client/ProfileClient.cs
+++ b/src/Mollie.Api/Client/ProfileClient.cs
@@ -1,9 +1,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Mollie.Api.Client.Abstract;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.PaymentMethod;
 using Mollie.Api.Models.PaymentMethod.Response;
 using Mollie.Api.Models.Profile.Request;
 using Mollie.Api.Models.Profile.Response;
diff --git a/src/Mollie.Api/Client/RefundClient.cs b/src/Mollie.Api/Client/RefundClient.cs
index e73a1f13..b771ffd0 100644
--- a/src/Mollie.Api/Client/RefundClient.cs
+++ b/src/Mollie.Api/Client/RefundClient.cs
@@ -3,9 +3,7 @@
 using System.Threading.Tasks;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Request;
 using Mollie.Api.Models.Refund.Response;
 using Mollie.Api.Models.Url;
diff --git a/src/Mollie.Api/Client/SettlementsClient.cs b/src/Mollie.Api/Client/SettlementsClient.cs
index 92211f5b..022cff0a 100644
--- a/src/Mollie.Api/Client/SettlementsClient.cs
+++ b/src/Mollie.Api/Client/SettlementsClient.cs
@@ -2,14 +2,10 @@
 using System.Threading.Tasks;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Models.Capture.Response;
-using Mollie.Api.Models.Chargeback;
 using Mollie.Api.Models.Chargeback.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Response;
-using Mollie.Api.Models.Settlement;
 using Mollie.Api.Models.Settlement.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/Client/ShipmentClient.cs b/src/Mollie.Api/Client/ShipmentClient.cs
index e0c80a21..e3146c16 100644
--- a/src/Mollie.Api/Client/ShipmentClient.cs
+++ b/src/Mollie.Api/Client/ShipmentClient.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Shipment.Request;
 using Mollie.Api.Models.Shipment.Response;
diff --git a/src/Mollie.Api/Client/SubscriptionClient.cs b/src/Mollie.Api/Client/SubscriptionClient.cs
index dadc8ebf..e2ff16d2 100644
--- a/src/Mollie.Api/Client/SubscriptionClient.cs
+++ b/src/Mollie.Api/Client/SubscriptionClient.cs
@@ -4,10 +4,8 @@
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
 using Mollie.Api.Models;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.Subscription;
 using Mollie.Api.Models.Subscription.Request;
 using Mollie.Api.Models.Subscription.Response;
 using Mollie.Api.Models.Url;
diff --git a/src/Mollie.Api/Client/TerminalClient.cs b/src/Mollie.Api/Client/TerminalClient.cs
index 10b948fd..dbca1538 100644
--- a/src/Mollie.Api/Client/TerminalClient.cs
+++ b/src/Mollie.Api/Client/TerminalClient.cs
@@ -3,9 +3,7 @@
 using System.Threading.Tasks;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Terminal;
 using Mollie.Api.Models.Terminal.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/JsonConverters/SettlementPeriodConverter.cs b/src/Mollie.Api/JsonConverters/SettlementPeriodConverter.cs
index 08ed307c..0b3493e7 100644
--- a/src/Mollie.Api/JsonConverters/SettlementPeriodConverter.cs
+++ b/src/Mollie.Api/JsonConverters/SettlementPeriodConverter.cs
@@ -1,5 +1,4 @@
-using Mollie.Api.Models.Settlement;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -12,7 +11,7 @@ public override bool CanConvert(Type objectType) {
         }
 
         public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) {
-            // If we have no periods, Mollie returns a empty array instead of an object      
+            // If we have no periods, Mollie returns a empty array instead of an object
             JToken token = JToken.Load(reader);
             if (token is JArray) {
                 return new Dictionary<int, Dictionary<int, SettlementPeriod>>();
diff --git a/src/Mollie.Api/Models/Capture/Response/CaptureResponseLinks.cs b/src/Mollie.Api/Models/Capture/Response/CaptureResponseLinks.cs
index c3443984..28443eac 100644
--- a/src/Mollie.Api/Models/Capture/Response/CaptureResponseLinks.cs
+++ b/src/Mollie.Api/Models/Capture/Response/CaptureResponseLinks.cs
@@ -1,5 +1,4 @@
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.Settlement;
 using Mollie.Api.Models.Settlement.Response;
 using Mollie.Api.Models.Shipment.Response;
 using Mollie.Api.Models.Url;
diff --git a/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseLinks.cs b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseLinks.cs
index bb508f9e..fc65c50b 100644
--- a/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseLinks.cs
+++ b/src/Mollie.Api/Models/Chargeback/Response/ChargebackResponseLinks.cs
@@ -1,5 +1,4 @@
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.Settlement;
 using Mollie.Api.Models.Settlement.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/Models/Customer/Response/CustomerResponseLinks.cs b/src/Mollie.Api/Models/Customer/Response/CustomerResponseLinks.cs
index 4db262b2..98e3d87c 100644
--- a/src/Mollie.Api/Models/Customer/Response/CustomerResponseLinks.cs
+++ b/src/Mollie.Api/Models/Customer/Response/CustomerResponseLinks.cs
@@ -1,7 +1,5 @@
-using Mollie.Api.Models.List;
-using Mollie.Api.Models.List.Response;
+using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.Subscription;
 using Mollie.Api.Models.Subscription.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/src/Mollie.Api/Models/Order/Response/OrderEmbeddedResponse.cs b/src/Mollie.Api/Models/Order/Response/OrderEmbeddedResponse.cs
index 96beefdb..51ea5d06 100644
--- a/src/Mollie.Api/Models/Order/Response/OrderEmbeddedResponse.cs
+++ b/src/Mollie.Api/Models/Order/Response/OrderEmbeddedResponse.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Response;
 using Mollie.Api.Models.Shipment.Response;
 
diff --git a/src/Mollie.Api/Models/Order/Response/OrderRefundResponse.cs b/src/Mollie.Api/Models/Order/Response/OrderRefundResponse.cs
index 7b1d213f..4b01e84f 100644
--- a/src/Mollie.Api/Models/Order/Response/OrderRefundResponse.cs
+++ b/src/Mollie.Api/Models/Order/Response/OrderRefundResponse.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Response;
 
 namespace Mollie.Api.Models.Order.Response {
diff --git a/src/Mollie.Api/Models/Organization/OrganizationResponseLinks.cs b/src/Mollie.Api/Models/Organization/OrganizationResponseLinks.cs
index b55147d8..c47fa66b 100644
--- a/src/Mollie.Api/Models/Organization/OrganizationResponseLinks.cs
+++ b/src/Mollie.Api/Models/Organization/OrganizationResponseLinks.cs
@@ -1,16 +1,10 @@
-using Mollie.Api.Models.Chargeback;
-using Mollie.Api.Models.Chargeback.Response;
-using Mollie.Api.Models.Customer;
+using Mollie.Api.Models.Chargeback.Response;
 using Mollie.Api.Models.Customer.Response;
-using Mollie.Api.Models.Invoice;
 using Mollie.Api.Models.Invoice.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment.Response;
 using Mollie.Api.Models.Profile.Response;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Response;
-using Mollie.Api.Models.Settlement;
 using Mollie.Api.Models.Settlement.Response;
 using Mollie.Api.Models.Url;
 
@@ -66,4 +60,4 @@ public record OrganizationResponseLinks {
         /// </summary>
         public required UrlLink Documentation { get; init; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Models/Payment/Response/PaymentEmbeddedResponse.cs b/src/Mollie.Api/Models/Payment/Response/PaymentEmbeddedResponse.cs
index c96b4d0d..de0de9af 100644
--- a/src/Mollie.Api/Models/Payment/Response/PaymentEmbeddedResponse.cs
+++ b/src/Mollie.Api/Models/Payment/Response/PaymentEmbeddedResponse.cs
@@ -1,7 +1,5 @@
 using System.Collections.Generic;
-using Mollie.Api.Models.Chargeback;
 using Mollie.Api.Models.Chargeback.Response;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Response;
 
 namespace Mollie.Api.Models.Payment.Response {
@@ -9,4 +7,4 @@ public record PaymentEmbeddedResponse {
         public IEnumerable<RefundResponse>? Refunds { get; set; }
         public IEnumerable<ChargebackResponse>? Chargebacks { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Models/Payment/Response/PaymentResponseLinks.cs b/src/Mollie.Api/Models/Payment/Response/PaymentResponseLinks.cs
index ae5bdda5..d91fd765 100644
--- a/src/Mollie.Api/Models/Payment/Response/PaymentResponseLinks.cs
+++ b/src/Mollie.Api/Models/Payment/Response/PaymentResponseLinks.cs
@@ -1,14 +1,8 @@
-using Mollie.Api.Models.Chargeback;
-using Mollie.Api.Models.Chargeback.Response;
-using Mollie.Api.Models.Customer;
+using Mollie.Api.Models.Chargeback.Response;
 using Mollie.Api.Models.Customer.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Mandate;
 using Mollie.Api.Models.Mandate.Response;
-using Mollie.Api.Models.Settlement;
 using Mollie.Api.Models.Settlement.Response;
-using Mollie.Api.Models.Subscription;
 using Mollie.Api.Models.Subscription.Response;
 using Mollie.Api.Models.Url;
 
@@ -23,12 +17,12 @@ public record PaymentResponseLinks {
         /// The URL your customer should visit to make the payment. This is where you should redirect the consumer to.
         /// </summary>
         public UrlLink? Checkout { get; set; }
-        
+
         /// <summary>
         /// The deeplink URL to the app of the payment method. Currently only available for bancontact.
         /// </summary>
         public UrlLink? MobileAppCheckout { get; set; }
-        
+
         /// <summary>
         /// Direct link to the payment in the Mollie Dashboard.
         /// </summary>
@@ -43,7 +37,7 @@ public record PaymentResponseLinks {
         /// The API resource URL of the chargebacks that belong to this payment.
         /// </summary>
         public UrlObjectLink<ListResponse<ChargebackResponse>>? Chargebacks { get; set; }
-        
+
         /// <summary>
         /// The API resource URL of the captures that belong to this payment.
         /// </summary>
@@ -73,11 +67,11 @@ public record PaymentResponseLinks {
         /// The API resource URL of the customer this payment belongs to. Not present if not linked to a customer.
         /// </summary>
         public UrlObjectLink<CustomerResponse>? Customer { get; set; }
-        
+
         /// <summary>
         /// Recurring payments do not have a checkout URL, because these payments are executed without any user interaction.
         /// This link is included for test mode recurring payments, and allows you to set the final payment state for such payments.
         /// </summary>
         public UrlLink? ChangePaymentState { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Models/Profile/Response/ProfileResponseLinks.cs b/src/Mollie.Api/Models/Profile/Response/ProfileResponseLinks.cs
index af36160c..0600c128 100644
--- a/src/Mollie.Api/Models/Profile/Response/ProfileResponseLinks.cs
+++ b/src/Mollie.Api/Models/Profile/Response/ProfileResponseLinks.cs
@@ -1,11 +1,7 @@
-using Mollie.Api.Models.Chargeback;
-using Mollie.Api.Models.Chargeback.Response;
-using Mollie.Api.Models.List;
+using Mollie.Api.Models.Chargeback.Response;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.PaymentMethod;
 using Mollie.Api.Models.PaymentMethod.Response;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Response;
 using Mollie.Api.Models.Url;
 
@@ -20,4 +16,4 @@ public record ProfileResponseLinks {
         public UrlLink? CheckoutPreviewUrl { get; set; }
         public required UrlLink Documentation { get; init; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Mollie.Api/Models/Refund/Response/RefundResponseLinks.cs b/src/Mollie.Api/Models/Refund/Response/RefundResponseLinks.cs
index 89b7e393..84fdac04 100644
--- a/src/Mollie.Api/Models/Refund/Response/RefundResponseLinks.cs
+++ b/src/Mollie.Api/Models/Refund/Response/RefundResponseLinks.cs
@@ -1,5 +1,4 @@
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.Settlement;
 using Mollie.Api.Models.Settlement.Response;
 using Mollie.Api.Models.Url;
 
diff --git a/tests/Mollie.Tests.Integration/Api/ConnectTests.cs b/tests/Mollie.Tests.Integration/Api/ConnectTests.cs
index f1f39292..fa9c2b64 100644
--- a/tests/Mollie.Tests.Integration/Api/ConnectTests.cs
+++ b/tests/Mollie.Tests.Integration/Api/ConnectTests.cs
@@ -1,5 +1,4 @@
 using Mollie.Api.Client;
-using Mollie.Api.Models.Connect;
 using Mollie.Tests.Integration.Framework;
 using System.Collections.Generic;
 using System.Threading.Tasks;
diff --git a/tests/Mollie.Tests.Integration/Api/CustomerTests.cs b/tests/Mollie.Tests.Integration/Api/CustomerTests.cs
index df450cfc..8371688a 100644
--- a/tests/Mollie.Tests.Integration/Api/CustomerTests.cs
+++ b/tests/Mollie.Tests.Integration/Api/CustomerTests.cs
@@ -6,10 +6,8 @@
 using Mollie.Api.Client;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Models;
-using Mollie.Api.Models.Customer;
 using Mollie.Api.Models.Customer.Request;
 using Mollie.Api.Models.Customer.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment;
 using Mollie.Api.Models.Payment.Request;
diff --git a/tests/Mollie.Tests.Integration/Api/MandateTests.cs b/tests/Mollie.Tests.Integration/Api/MandateTests.cs
index cbf13ad5..c45ba16f 100644
--- a/tests/Mollie.Tests.Integration/Api/MandateTests.cs
+++ b/tests/Mollie.Tests.Integration/Api/MandateTests.cs
@@ -4,11 +4,8 @@
 using FluentAssertions;
 using Mollie.Api.Client;
 using Mollie.Api.Client.Abstract;
-using Mollie.Api.Models.Customer;
 using Mollie.Api.Models.Customer.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Mandate;
 using Mollie.Api.Models.Mandate.Request;
 using Mollie.Api.Models.Mandate.Response;
 using Mollie.Api.Models.Payment;
diff --git a/tests/Mollie.Tests.Integration/Api/OrderTests.cs b/tests/Mollie.Tests.Integration/Api/OrderTests.cs
index d10b4d1b..3012689a 100644
--- a/tests/Mollie.Tests.Integration/Api/OrderTests.cs
+++ b/tests/Mollie.Tests.Integration/Api/OrderTests.cs
@@ -6,7 +6,6 @@
 using Mollie.Api.Client;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Models;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Order;
 using Mollie.Api.Models.Order.Request;
diff --git a/tests/Mollie.Tests.Integration/Api/PaymentLinkTests.cs b/tests/Mollie.Tests.Integration/Api/PaymentLinkTests.cs
index 0742a388..bc135bb6 100644
--- a/tests/Mollie.Tests.Integration/Api/PaymentLinkTests.cs
+++ b/tests/Mollie.Tests.Integration/Api/PaymentLinkTests.cs
@@ -5,7 +5,6 @@
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Extensions;
 using Mollie.Api.Models;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.PaymentLink.Request;
 using Mollie.Api.Models.PaymentLink.Response;
diff --git a/tests/Mollie.Tests.Integration/Api/PaymentMethodTests.cs b/tests/Mollie.Tests.Integration/Api/PaymentMethodTests.cs
index 2fc4233c..430ab132 100644
--- a/tests/Mollie.Tests.Integration/Api/PaymentMethodTests.cs
+++ b/tests/Mollie.Tests.Integration/Api/PaymentMethodTests.cs
@@ -5,10 +5,8 @@
 using Mollie.Api.Client;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Models;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment;
-using Mollie.Api.Models.PaymentMethod;
 using Mollie.Api.Models.PaymentMethod.Response;
 using Mollie.Tests.Integration.Framework;
 using Xunit;
diff --git a/tests/Mollie.Tests.Integration/Api/PaymentTests.cs b/tests/Mollie.Tests.Integration/Api/PaymentTests.cs
index 449d2a20..c4a74d33 100644
--- a/tests/Mollie.Tests.Integration/Api/PaymentTests.cs
+++ b/tests/Mollie.Tests.Integration/Api/PaymentTests.cs
@@ -6,21 +6,17 @@
 using Mollie.Api.Models;
 using Mollie.Api.Models.Capture;
 using Mollie.Api.Models.Capture.Request;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.Payment;
 using Mollie.Api.Models.Payment.Request;
 using Mollie.Api.Models.Payment.Response;
 using Mollie.Api.Models.Payment.Response.Specific;
-using Mollie.Api.Models.Terminal;
 using Mollie.Tests.Integration.Framework;
 using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
 using Mollie.Api.Models.Capture.Response;
-using Mollie.Api.Models.Customer;
 using Mollie.Api.Models.Customer.Response;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Mandate;
 using Mollie.Api.Models.Mandate.Response;
 using Mollie.Api.Models.Terminal.Response;
 
diff --git a/tests/Mollie.Tests.Integration/Api/ProfileTests.cs b/tests/Mollie.Tests.Integration/Api/ProfileTests.cs
index 801f3227..76ee2bf4 100644
--- a/tests/Mollie.Tests.Integration/Api/ProfileTests.cs
+++ b/tests/Mollie.Tests.Integration/Api/ProfileTests.cs
@@ -1,9 +1,7 @@
 
 using System;
 using Mollie.Api.Client;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.Payment;
-using Mollie.Api.Models.PaymentMethod;
 using Mollie.Api.Models.Profile.Response;
 using Mollie.Tests.Integration.Framework;
 using System.Linq;
diff --git a/tests/Mollie.Tests.Integration/Api/RefundTests.cs b/tests/Mollie.Tests.Integration/Api/RefundTests.cs
index a797f42d..e856a973 100644
--- a/tests/Mollie.Tests.Integration/Api/RefundTests.cs
+++ b/tests/Mollie.Tests.Integration/Api/RefundTests.cs
@@ -5,11 +5,9 @@
 using Mollie.Api.Client;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Models;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Payment.Request;
 using Mollie.Api.Models.Payment.Response;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Request;
 using Mollie.Api.Models.Refund.Response;
 using Mollie.Tests.Integration.Framework;
diff --git a/tests/Mollie.Tests.Integration/Api/ShipmentTests.cs b/tests/Mollie.Tests.Integration/Api/ShipmentTests.cs
index 9abdfb1f..b17023e8 100644
--- a/tests/Mollie.Tests.Integration/Api/ShipmentTests.cs
+++ b/tests/Mollie.Tests.Integration/Api/ShipmentTests.cs
@@ -4,7 +4,6 @@
 using FluentAssertions;
 using Mollie.Api.Client;
 using Mollie.Api.Client.Abstract;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
 using Mollie.Api.Models.Shipment.Request;
 using Mollie.Api.Models.Shipment.Response;
diff --git a/tests/Mollie.Tests.Integration/Api/SubscriptionTests.cs b/tests/Mollie.Tests.Integration/Api/SubscriptionTests.cs
index d353e48d..42121da4 100644
--- a/tests/Mollie.Tests.Integration/Api/SubscriptionTests.cs
+++ b/tests/Mollie.Tests.Integration/Api/SubscriptionTests.cs
@@ -5,13 +5,9 @@
 using Mollie.Api.Client;
 using Mollie.Api.Client.Abstract;
 using Mollie.Api.Models;
-using Mollie.Api.Models.Customer;
 using Mollie.Api.Models.Customer.Response;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Mandate;
 using Mollie.Api.Models.Mandate.Response;
-using Mollie.Api.Models.Subscription;
 using Mollie.Api.Models.Subscription.Request;
 using Mollie.Api.Models.Subscription.Response;
 using Mollie.Tests.Integration.Framework;
diff --git a/tests/Mollie.Tests.Integration/Api/TerminalTests.cs b/tests/Mollie.Tests.Integration/Api/TerminalTests.cs
index 2c8e8eb6..b1e458f6 100644
--- a/tests/Mollie.Tests.Integration/Api/TerminalTests.cs
+++ b/tests/Mollie.Tests.Integration/Api/TerminalTests.cs
@@ -4,9 +4,7 @@
 using FluentAssertions;
 using Mollie.Api.Client;
 using Mollie.Api.Client.Abstract;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Terminal;
 using Mollie.Api.Models.Terminal.Response;
 using Mollie.Tests.Integration.Framework;
 
diff --git a/tests/Mollie.Tests.Unit/Client/CaptureClientTests.cs b/tests/Mollie.Tests.Unit/Client/CaptureClientTests.cs
index d71f05f1..f35d71ec 100644
--- a/tests/Mollie.Tests.Unit/Client/CaptureClientTests.cs
+++ b/tests/Mollie.Tests.Unit/Client/CaptureClientTests.cs
@@ -1,6 +1,5 @@
 using System;
 using Mollie.Api.Client;
-using Mollie.Api.Models.List;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
diff --git a/tests/Mollie.Tests.Unit/Client/ChargebacksClientTests.cs b/tests/Mollie.Tests.Unit/Client/ChargebacksClientTests.cs
index be8dc660..fcaa97d9 100644
--- a/tests/Mollie.Tests.Unit/Client/ChargebacksClientTests.cs
+++ b/tests/Mollie.Tests.Unit/Client/ChargebacksClientTests.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Mollie.Api.Client;
-using Mollie.Api.Models.Chargeback;
 using Mollie.Api.Models.Chargeback.Response;
 using RichardSzalay.MockHttp;
 using Xunit;
@@ -14,7 +13,7 @@ public class ChargebacksClientTests : BaseClientTests {
         private const string defaultChargebackId = "chb_n9z0tp";
         private const string defaultChargebackReasonCode = "AC01";
         private const string defaultChargebackReason = "Account identifier incorrect (i.e. invalid IBAN)";
-        
+
         private string defaultGetChargebacksResponse = @$"{{
     ""resource"": ""chargeback"",
     ""id"": ""{defaultChargebackId}"",
@@ -48,7 +47,7 @@ public class ChargebacksClientTests : BaseClientTests {
         }}
     }}
 }}";
-        
+
         [Fact]
         public async Task GetChargebackAsync_ResponseIsDeserializedInExpectedFormat() {
             // Given: we retrieve the chargeback by id and payment id
@@ -56,7 +55,7 @@ public async Task GetChargebackAsync_ResponseIsDeserializedInExpectedFormat() {
             mockHttp.When($"{BaseMollieClient.ApiEndPoint}*")
                 .Respond("application/json", defaultGetChargebacksResponse);
             HttpClient httpClient = mockHttp.ToHttpClient();
-            ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); 
+            ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient);
 
             // When: We send the request
             ChargebackResponse chargebackResponse = await chargebacksClient.GetChargebackAsync(defaultPaymentId, defaultChargebackId);
@@ -68,7 +67,7 @@ public async Task GetChargebackAsync_ResponseIsDeserializedInExpectedFormat() {
             chargebackResponse.Reason.Code.Should().Be(defaultChargebackReasonCode);
             chargebackResponse.Reason.Description.Should().Be(defaultChargebackReason);
         }
-        
+
         [Theory]
         [InlineData(false, "")]
         [InlineData(true, "?testmode=true")]
@@ -78,7 +77,7 @@ public async Task GetOrderRefundListAsync_QueryParameterOptions_CorrectParameter
             mockHttp.When($"{BaseMollieClient.ApiEndPoint}payments/{defaultPaymentId}/chargebacks/{defaultChargebackId}{expectedQueryString}")
                 .Respond("application/json", defaultGetChargebacksResponse);
             HttpClient httpClient = mockHttp.ToHttpClient();
-            ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); 
+            ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient);
 
             // When: We send the request
             await chargebacksClient.GetChargebackAsync(defaultPaymentId, defaultChargebackId, testmode);
@@ -86,7 +85,7 @@ public async Task GetOrderRefundListAsync_QueryParameterOptions_CorrectParameter
             // Then
             mockHttp.VerifyNoOutstandingRequest();
         }
-        
+
         [Theory]
         [InlineData(null, null, false, "")]
         [InlineData("from", null, false, "?from=from")]
@@ -98,7 +97,7 @@ public async Task GetChargebacksListAsync_FromLimitTestmodeQueryParameterOptions
             mockHttp.When($"{BaseMollieClient.ApiEndPoint}payments/{defaultPaymentId}/chargebacks{expectedQueryString}")
                 .Respond("application/json", defaultGetChargebacksResponse);
             HttpClient httpClient = mockHttp.ToHttpClient();
-            ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); 
+            ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient);
 
             // When: We send the request
             await chargebacksClient.GetChargebacksListAsync(defaultPaymentId, from, limit, testmode);
@@ -106,7 +105,7 @@ public async Task GetChargebacksListAsync_FromLimitTestmodeQueryParameterOptions
             // Then
             mockHttp.VerifyNoOutstandingRequest();
         }
-        
+
         [Theory]
         [InlineData(null, false, "")]
         [InlineData("profileId", false, "?profileId=profileId")]
@@ -117,7 +116,7 @@ public async Task GetChargebacksListAsync_ProfileTestModeQueryParameterOptions_C
             mockHttp.When($"{BaseMollieClient.ApiEndPoint}chargebacks{expectedQueryString}")
                 .Respond("application/json", defaultGetChargebacksResponse);
             HttpClient httpClient = mockHttp.ToHttpClient();
-            ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient); 
+            ChargebacksClient chargebacksClient = new ChargebacksClient("abcde", httpClient);
 
             // When: We send the request
             await chargebacksClient.GetChargebacksListAsync(profileId, testmode);
@@ -125,7 +124,7 @@ public async Task GetChargebacksListAsync_ProfileTestModeQueryParameterOptions_C
             // Then
             mockHttp.VerifyNoOutstandingRequest();
         }
-        
+
         [Theory]
         [InlineData("")]
         [InlineData(" ")]
@@ -142,7 +141,7 @@ public async Task GetChargebackAsync_NoPaymentIdIsGiven_ArgumentExceptionIsThrow
             // Then
             exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty");
         }
-        
+
         [Theory]
         [InlineData("")]
         [InlineData(" ")]
@@ -159,7 +158,7 @@ public async Task GetChargebackAsync_NoChargeBackIdIsGiven_ArgumentExceptionIsTh
             // Then
             exception.Message.Should().Be("Required URL argument 'chargebackId' is null or empty");
         }
-        
+
         [Theory]
         [InlineData("")]
         [InlineData(" ")]
@@ -177,4 +176,4 @@ public async Task GetChargebacksListAsync_NoPaymentIdIsGiven_ArgumentExceptionIs
             exception.Message.Should().Be("Required URL argument 'paymentId' is null or empty");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Mollie.Tests.Unit/Client/ConnectClientTests.cs b/tests/Mollie.Tests.Unit/Client/ConnectClientTests.cs
index b140f0c9..e902e979 100644
--- a/tests/Mollie.Tests.Unit/Client/ConnectClientTests.cs
+++ b/tests/Mollie.Tests.Unit/Client/ConnectClientTests.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Mollie.Api.Client;
-using Mollie.Api.Models.Connect;
 using Mollie.Api.Models.Connect.Request;
 using Mollie.Api.Models.Connect.Response;
 using RichardSzalay.MockHttp;
@@ -16,7 +15,7 @@ public class ConnectClientTests : BaseClientTests
 {
     private const string ClientId = "client-id";
     private const string ClientSecret = "client-secret";
-    
+
     [Fact]
     public void GetAuthorizationUrl_WithSingleScope_GeneratesAuthorizationUrl()
     {
@@ -32,7 +31,7 @@ public void GetAuthorizationUrl_WithSingleScope_GeneratesAuthorizationUrl()
         string expectedUrl = $"https://www.mollie.com/oauth2/authorize?client_id={ClientId}&state=abcde&scope=payments.read&response_type=code&approval_prompt=auto";
         authorizationUrl.Should().Be(expectedUrl);
     }
-    
+
     [Theory]
     [InlineData("refresh_abcde", "refresh_token")]
     [InlineData("abcde", "authorization_code")]
@@ -74,7 +73,7 @@ public async Task RevokeTokenAsync_SendsRequest()
             Token = "access_46EUJ6x8jFJZZeAvhNH4JVey6qVpqR",
             TokenTypeHint = "refresh_token"
         };
-        
+
         // Act
         await connectClient.RevokeTokenAsync(revokeTokenRequest);
 
@@ -90,4 +89,4 @@ public async Task RevokeTokenAsync_SendsRequest()
     ""token_type"": ""bearer"",
     ""scope"": ""payments.read organizations.read""
 }";
-}
\ No newline at end of file
+}
diff --git a/tests/Mollie.Tests.Unit/Client/CustomerClientTests.cs b/tests/Mollie.Tests.Unit/Client/CustomerClientTests.cs
index 1d65eb18..597b3777 100644
--- a/tests/Mollie.Tests.Unit/Client/CustomerClientTests.cs
+++ b/tests/Mollie.Tests.Unit/Client/CustomerClientTests.cs
@@ -4,7 +4,6 @@
 using FluentAssertions;
 using Mollie.Api.Client;
 using Mollie.Api.Models;
-using Mollie.Api.Models.Customer;
 using Mollie.Api.Models.Customer.Request;
 using Mollie.Api.Models.Customer.Response;
 using Mollie.Api.Models.Payment.Request;
diff --git a/tests/Mollie.Tests.Unit/Client/MandateClientTests.cs b/tests/Mollie.Tests.Unit/Client/MandateClientTests.cs
index 119d175f..65cec84c 100644
--- a/tests/Mollie.Tests.Unit/Client/MandateClientTests.cs
+++ b/tests/Mollie.Tests.Unit/Client/MandateClientTests.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Mollie.Api.Client;
-using Mollie.Api.Models.Mandate;
 using Mollie.Api.Models.Mandate.Request;
 using Mollie.Api.Models.Payment;
 using RichardSzalay.MockHttp;
diff --git a/tests/Mollie.Tests.Unit/Client/RefundClientTests.cs b/tests/Mollie.Tests.Unit/Client/RefundClientTests.cs
index ed105bd1..268a636c 100644
--- a/tests/Mollie.Tests.Unit/Client/RefundClientTests.cs
+++ b/tests/Mollie.Tests.Unit/Client/RefundClientTests.cs
@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Mollie.Api.Models;
-using Mollie.Api.Models.Refund;
 using Mollie.Api.Models.Refund.Request;
 using RichardSzalay.MockHttp;
 using Xunit;
diff --git a/tests/Mollie.Tests.Unit/Client/SettlementClientTests.cs b/tests/Mollie.Tests.Unit/Client/SettlementClientTests.cs
index c83762bb..36629cf6 100644
--- a/tests/Mollie.Tests.Unit/Client/SettlementClientTests.cs
+++ b/tests/Mollie.Tests.Unit/Client/SettlementClientTests.cs
@@ -1,7 +1,5 @@
 using System;
 using Mollie.Api.Client;
-using Mollie.Api.Models.List;
-using Mollie.Api.Models.Settlement;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
diff --git a/tests/Mollie.Tests.Unit/Client/SubscriptionClientTests.cs b/tests/Mollie.Tests.Unit/Client/SubscriptionClientTests.cs
index 2dfa8c8e..2614e447 100644
--- a/tests/Mollie.Tests.Unit/Client/SubscriptionClientTests.cs
+++ b/tests/Mollie.Tests.Unit/Client/SubscriptionClientTests.cs
@@ -4,7 +4,6 @@
 using FluentAssertions;
 using Mollie.Api.Client;
 using Mollie.Api.Models;
-using Mollie.Api.Models.Subscription;
 using Mollie.Api.Models.Subscription.Request;
 using RichardSzalay.MockHttp;
 using Xunit;
diff --git a/tests/Mollie.Tests.Unit/Client/TerminalClientTests.cs b/tests/Mollie.Tests.Unit/Client/TerminalClientTests.cs
index 4e4ee54f..5b819d38 100644
--- a/tests/Mollie.Tests.Unit/Client/TerminalClientTests.cs
+++ b/tests/Mollie.Tests.Unit/Client/TerminalClientTests.cs
@@ -3,9 +3,7 @@
 using System.Threading.Tasks;
 using FluentAssertions;
 using Mollie.Api.Client;
-using Mollie.Api.Models.List;
 using Mollie.Api.Models.List.Response;
-using Mollie.Api.Models.Terminal;
 using Mollie.Api.Models.Terminal.Response;
 using RichardSzalay.MockHttp;
 using Xunit;