diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/CallbackConfiguration.java b/client/src/main/com/sinch/sdk/domains/numbers/models/CallbackConfiguration.java
index 9fc758ae..f24915c2 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/CallbackConfiguration.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/CallbackConfiguration.java
@@ -1,7 +1,5 @@
 package com.sinch.sdk.domains.numbers.models;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
-
 /**
  * Callback configuration
  *
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/Money.java b/client/src/main/com/sinch/sdk/domains/numbers/models/Money.java
index c9d63ee5..8303c14b 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/Money.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/Money.java
@@ -1,7 +1,5 @@
 package com.sinch.sdk.domains.numbers.models;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
-
 /**
  * An object giving details on currency code and the amount charged.
  *
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/NumberPattern.java b/client/src/main/com/sinch/sdk/domains/numbers/models/NumberPattern.java
index 9505827e..4d589a2e 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/NumberPattern.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/NumberPattern.java
@@ -1,7 +1,5 @@
 package com.sinch.sdk.domains.numbers.models;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
-
 /**
  * An object enabling to identify number by pattern
  *
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/Region.java b/client/src/main/com/sinch/sdk/domains/numbers/models/Region.java
index c4b26ae9..dba8f7ca 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/Region.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/Region.java
@@ -1,6 +1,5 @@
 package com.sinch.sdk.domains.numbers.models;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
 import java.util.Collection;
 
 /**
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberListRequestParameters.java b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberListRequestParameters.java
index 377f53b2..ddf58417 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberListRequestParameters.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberListRequestParameters.java
@@ -1,6 +1,5 @@
 package com.sinch.sdk.domains.numbers.models.requests;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
 import com.sinch.sdk.domains.numbers.models.Capability;
 import com.sinch.sdk.domains.numbers.models.NumberPattern;
 import com.sinch.sdk.domains.numbers.models.NumberType;
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberUpdateRequestParameters.java b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberUpdateRequestParameters.java
index 734cb6e8..8cc04bdb 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberUpdateRequestParameters.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberUpdateRequestParameters.java
@@ -1,6 +1,5 @@
 package com.sinch.sdk.domains.numbers.models.requests;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
 import java.util.Optional;
 
 /**
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberUpdateSMSConfigurationRequestParameters.java b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberUpdateSMSConfigurationRequestParameters.java
index 93ca4008..7c67aaf6 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberUpdateSMSConfigurationRequestParameters.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberUpdateSMSConfigurationRequestParameters.java
@@ -1,6 +1,5 @@
 package com.sinch.sdk.domains.numbers.models.requests;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
 import java.util.Optional;
 
 /***
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberUpdateVoiceConfigurationRequestParameters.java b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberUpdateVoiceConfigurationRequestParameters.java
index 0989c0a6..a27c9461 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberUpdateVoiceConfigurationRequestParameters.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/ActiveNumberUpdateVoiceConfigurationRequestParameters.java
@@ -1,7 +1,5 @@
 package com.sinch.sdk.domains.numbers.models.requests;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
-
 /***
  * SMS configuration parameters request to update an active number for a project
  * @since 1.0
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableNumberListAllRequestParameters.java b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableNumberListAllRequestParameters.java
index 65be9f07..cb26cbc5 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableNumberListAllRequestParameters.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableNumberListAllRequestParameters.java
@@ -1,6 +1,5 @@
 package com.sinch.sdk.domains.numbers.models.requests;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
 import com.sinch.sdk.domains.numbers.models.Capability;
 import com.sinch.sdk.domains.numbers.models.NumberPattern;
 import com.sinch.sdk.domains.numbers.models.NumberType;
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableNumberRentAnyRequestParameters.java b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableNumberRentAnyRequestParameters.java
index 72235ff0..3501b8fd 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableNumberRentAnyRequestParameters.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableNumberRentAnyRequestParameters.java
@@ -1,6 +1,5 @@
 package com.sinch.sdk.domains.numbers.models.requests;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
 import com.sinch.sdk.domains.numbers.models.Capability;
 import com.sinch.sdk.domains.numbers.models.NumberPattern;
 import com.sinch.sdk.domains.numbers.models.NumberType;
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableNumberRentRequestParameters.java b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableNumberRentRequestParameters.java
index 8227363a..e1b04c06 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableNumberRentRequestParameters.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableNumberRentRequestParameters.java
@@ -1,6 +1,5 @@
 package com.sinch.sdk.domains.numbers.models.requests;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
 import java.util.Optional;
 
 /**
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableRegionListAllRequestParameters.java b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableRegionListAllRequestParameters.java
index 543e89e4..bd3f9bb1 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableRegionListAllRequestParameters.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/AvailableRegionListAllRequestParameters.java
@@ -1,6 +1,5 @@
 package com.sinch.sdk.domains.numbers.models.requests;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
 import com.sinch.sdk.domains.numbers.models.NumberType;
 import java.util.Collection;
 import java.util.Optional;
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/CallbackConfigurationUpdateRequestParameters.java b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/CallbackConfigurationUpdateRequestParameters.java
index 3afb2f88..eeb30b2c 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/CallbackConfigurationUpdateRequestParameters.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/CallbackConfigurationUpdateRequestParameters.java
@@ -1,7 +1,5 @@
 package com.sinch.sdk.domains.numbers.models.requests;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
-
 /**
  * Parameters request to update callback configuration
  *
diff --git a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/RentSMSConfigurationRequestParameters.java b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/RentSMSConfigurationRequestParameters.java
index 9820089c..7df93647 100644
--- a/client/src/main/com/sinch/sdk/domains/numbers/models/requests/RentSMSConfigurationRequestParameters.java
+++ b/client/src/main/com/sinch/sdk/domains/numbers/models/requests/RentSMSConfigurationRequestParameters.java
@@ -1,6 +1,5 @@
 package com.sinch.sdk.domains.numbers.models.requests;
 
-import com.sinch.sdk.domains.numbers.models.ActiveNumber.Builder;
 import java.util.Optional;
 
 /**
diff --git a/client/src/main/com/sinch/sdk/domains/sms/adapters/converters/ParametersDtoConverter.java b/client/src/main/com/sinch/sdk/domains/sms/adapters/converters/ParametersDtoConverter.java
index 73515eff..a82be356 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/adapters/converters/ParametersDtoConverter.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/adapters/converters/ParametersDtoConverter.java
@@ -68,5 +68,4 @@ public static ParameterObjDto convert(Parameters parameters) {
             });
     return dto;
   }
-  ;
 }
diff --git a/client/src/main/com/sinch/sdk/domains/sms/models/DeliveryReportErrorCode.java b/client/src/main/com/sinch/sdk/domains/sms/models/DeliveryReportErrorCode.java
index 5dda5cab..e2b57a2f 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/models/DeliveryReportErrorCode.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/models/DeliveryReportErrorCode.java
@@ -22,7 +22,6 @@ public class DeliveryReportErrorCode extends EnumDynamic<Integer, DeliveryReport
   /** Message has been dispatched to SMSC. */
   public static final DeliveryReportErrorCode DISPATCHED = new DeliveryReportErrorCode(401);
   /** SMSC rejected message. Retrying is likely to cause the same error. */
-  /** */
   public static final DeliveryReportErrorCode MESSAGE_UNROUTABLE = new DeliveryReportErrorCode(402);
   /** An unexpected error caused the message to fail. */
   public static final DeliveryReportErrorCode INTERNAL_ERROR = new DeliveryReportErrorCode(403);
diff --git a/client/src/main/com/sinch/sdk/domains/sms/models/Group.java b/client/src/main/com/sinch/sdk/domains/sms/models/Group.java
index b7c6b3be..aa40e6e0 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/models/Group.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/models/Group.java
@@ -1,6 +1,5 @@
 package com.sinch.sdk.domains.sms.models;
 
-import com.sinch.sdk.domains.sms.models.GroupAutoUpdateKeyword.Builder;
 import java.time.Instant;
 import java.util.Collection;
 
@@ -107,7 +106,6 @@ public static class Builder {
     GroupAutoUpdate autoUpdate;
 
     private Builder() {}
-    ;
 
     public Builder setId(String id) {
       this.id = id;
diff --git a/client/src/main/com/sinch/sdk/domains/sms/models/GroupAutoUpdate.java b/client/src/main/com/sinch/sdk/domains/sms/models/GroupAutoUpdate.java
index 95111419..988e63b3 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/models/GroupAutoUpdate.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/models/GroupAutoUpdate.java
@@ -1,7 +1,5 @@
 package com.sinch.sdk.domains.sms.models;
 
-import com.sinch.sdk.domains.sms.models.GroupAutoUpdateKeyword.Builder;
-
 public class GroupAutoUpdate {
   private final String to;
   private final GroupAutoUpdateKeyword add;
@@ -47,7 +45,6 @@ public static class Builder {
     GroupAutoUpdateKeyword remove;
 
     private Builder() {}
-    ;
 
     public Builder setTo(String to) {
       this.to = to;
diff --git a/client/src/main/com/sinch/sdk/domains/sms/models/GroupAutoUpdateKeyword.java b/client/src/main/com/sinch/sdk/domains/sms/models/GroupAutoUpdateKeyword.java
index 49145883..3b405edc 100644
--- a/client/src/main/com/sinch/sdk/domains/sms/models/GroupAutoUpdateKeyword.java
+++ b/client/src/main/com/sinch/sdk/domains/sms/models/GroupAutoUpdateKeyword.java
@@ -1,7 +1,5 @@
 package com.sinch.sdk.domains.sms.models;
 
-import com.sinch.sdk.domains.sms.models.InboundBinary.Builder;
-
 public class GroupAutoUpdateKeyword {
 
   private final String firstWord;
@@ -47,7 +45,6 @@ public static class Builder {
     String secondWord;
 
     private Builder() {}
-    ;
 
     public Builder setFirstWord(String firstWord) {
       this.firstWord = firstWord;
diff --git a/client/src/main/com/sinch/sdk/domains/verification/models/requests/StartVerificationFlashCallRequestParameters.java b/client/src/main/com/sinch/sdk/domains/verification/models/requests/StartVerificationFlashCallRequestParameters.java
index 764a6472..0d805148 100644
--- a/client/src/main/com/sinch/sdk/domains/verification/models/requests/StartVerificationFlashCallRequestParameters.java
+++ b/client/src/main/com/sinch/sdk/domains/verification/models/requests/StartVerificationFlashCallRequestParameters.java
@@ -1,6 +1,5 @@
 package com.sinch.sdk.domains.verification.models.requests;
 
-import com.sinch.sdk.domains.sms.models.requests.SendSmsBatchBinaryRequest.Builder;
 import com.sinch.sdk.domains.verification.models.Identity;
 import com.sinch.sdk.domains.verification.models.VerificationMethod;
 import java.util.Optional;
diff --git a/client/src/main/com/sinch/sdk/domains/verification/models/requests/StartVerificationRequestParameters.java b/client/src/main/com/sinch/sdk/domains/verification/models/requests/StartVerificationRequestParameters.java
index 9d7bbe16..d6f817e3 100644
--- a/client/src/main/com/sinch/sdk/domains/verification/models/requests/StartVerificationRequestParameters.java
+++ b/client/src/main/com/sinch/sdk/domains/verification/models/requests/StartVerificationRequestParameters.java
@@ -1,6 +1,5 @@
 package com.sinch.sdk.domains.verification.models.requests;
 
-import com.sinch.sdk.domains.sms.models.BaseDeliveryReport.Builder;
 import com.sinch.sdk.domains.verification.models.Identity;
 import com.sinch.sdk.domains.verification.models.VerificationMethod;
 import java.util.Objects;
diff --git a/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponse.java b/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponse.java
index 66574600..0cc34ae6 100644
--- a/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponse.java
+++ b/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponse.java
@@ -1,7 +1,6 @@
 package com.sinch.sdk.domains.verification.models.response;
 
 import com.sinch.sdk.domains.verification.models.Link;
-import com.sinch.sdk.domains.verification.models.requests.StartVerificationRequestParameters.Builder;
 import java.util.Collection;
 
 /** Comme class to all Start verification requests */
diff --git a/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseCallout.java b/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseCallout.java
index 0e34ed70..c2f510ef 100644
--- a/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseCallout.java
+++ b/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseCallout.java
@@ -1,7 +1,6 @@
 package com.sinch.sdk.domains.verification.models.response;
 
 import com.sinch.sdk.domains.verification.models.Link;
-import com.sinch.sdk.domains.verification.models.requests.StartVerificationFlashCallRequestParameters.Builder;
 import java.util.Collection;
 
 /** Dedicated response type for a callout verification */
diff --git a/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseFlashCall.java b/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseFlashCall.java
index 478b458f..a51cb324 100644
--- a/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseFlashCall.java
+++ b/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseFlashCall.java
@@ -1,7 +1,6 @@
 package com.sinch.sdk.domains.verification.models.response;
 
 import com.sinch.sdk.domains.verification.models.Link;
-import com.sinch.sdk.domains.verification.models.response.VerificationResponseCallout.Builder;
 import java.util.Collection;
 
 /** Dedicated response type for a flashcall verification */
diff --git a/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseSMS.java b/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseSMS.java
index 4c4c7579..aaaba2ec 100644
--- a/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseSMS.java
+++ b/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseSMS.java
@@ -1,7 +1,6 @@
 package com.sinch.sdk.domains.verification.models.response;
 
 import com.sinch.sdk.domains.verification.models.Link;
-import com.sinch.sdk.domains.verification.models.response.VerificationResponseSeamless.Builder;
 import java.util.Collection;
 
 /** Dedicated response type for a sms verification */
diff --git a/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseSeamless.java b/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseSeamless.java
index aaeca8b9..a630b06d 100644
--- a/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseSeamless.java
+++ b/client/src/main/com/sinch/sdk/domains/verification/models/response/StartVerificationResponseSeamless.java
@@ -1,7 +1,6 @@
 package com.sinch.sdk.domains.verification.models.response;
 
 import com.sinch.sdk.domains.verification.models.Link;
-import com.sinch.sdk.domains.verification.models.response.VerificationResponseCallout.Builder;
 import java.util.Collection;
 
 /** Dedicated response type for a seamless verification */
diff --git a/client/src/test/java/com/sinch/sdk/auth/adapters/BearerAuthManagerTest.java b/client/src/test/java/com/sinch/sdk/auth/adapters/BearerAuthManagerTest.java
index 12eb1b80..affa6fb3 100644
--- a/client/src/test/java/com/sinch/sdk/auth/adapters/BearerAuthManagerTest.java
+++ b/client/src/test/java/com/sinch/sdk/auth/adapters/BearerAuthManagerTest.java
@@ -1,7 +1,6 @@
 package com.sinch.sdk.auth.adapters;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 import com.adelean.inject.resources.junit.jupiter.GivenTextResource;
diff --git a/client/src/test/java/com/sinch/sdk/domains/sms/models/requests/BatchesListRequestParametersTest.java b/client/src/test/java/com/sinch/sdk/domains/sms/models/requests/BatchesListRequestParametersTest.java
index 3ffa9828..a88c1a13 100644
--- a/client/src/test/java/com/sinch/sdk/domains/sms/models/requests/BatchesListRequestParametersTest.java
+++ b/client/src/test/java/com/sinch/sdk/domains/sms/models/requests/BatchesListRequestParametersTest.java
@@ -1,7 +1,5 @@
 package com.sinch.sdk.domains.sms.models.requests;
 
-import static org.junit.jupiter.api.Assertions.*;
-
 import java.time.Instant;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/core/src/main/com/sinch/sdk/core/http/URLParameter.java b/core/src/main/com/sinch/sdk/core/http/URLParameter.java
index 5d6e063d..82a54171 100644
--- a/core/src/main/com/sinch/sdk/core/http/URLParameter.java
+++ b/core/src/main/com/sinch/sdk/core/http/URLParameter.java
@@ -7,7 +7,7 @@ public class URLParameter {
   private final boolean explode;
 
   /**
-   * Create a URL parameter from an object and a style: matrix, label, form, ... (see OAS <a
+   * Create a URL parameter from an object and a style: matrix, label, form, ... (see <a
    * href="https://spec.openapis.org/oas/latest.html#parameter-object">OAS site</a>)
    *
    * @param name The name of the parameter.