diff --git a/cloudplatform/connectivity-dwc/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteServiceBindingAccessor.java b/cloudplatform/connectivity-dwc/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteServiceBindingAccessor.java
index 38a769f2c..c85a3718e 100644
--- a/cloudplatform/connectivity-dwc/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteServiceBindingAccessor.java
+++ b/cloudplatform/connectivity-dwc/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteServiceBindingAccessor.java
@@ -11,7 +11,6 @@
 
 import javax.annotation.Nonnull;
 
-import com.google.common.annotations.Beta;
 import com.sap.cloud.environment.servicebinding.api.ServiceBinding;
 import com.sap.cloud.environment.servicebinding.api.ServiceBindingAccessor;
 import com.sap.cloud.environment.servicebinding.api.ServiceIdentifier;
@@ -30,7 +29,6 @@
  *
  * @since 4.17.0
  */
-@Beta
 @Slf4j
 public class MegacliteServiceBindingAccessor implements ServiceBindingAccessor
 {
diff --git a/cloudplatform/connectivity-dwc/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteServiceBindingDestinationLoader.java b/cloudplatform/connectivity-dwc/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteServiceBindingDestinationLoader.java
index bd7d5353d..57b402177 100644
--- a/cloudplatform/connectivity-dwc/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteServiceBindingDestinationLoader.java
+++ b/cloudplatform/connectivity-dwc/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/MegacliteServiceBindingDestinationLoader.java
@@ -7,7 +7,6 @@
 
 import javax.annotation.Nonnull;
 
-import com.google.common.annotations.Beta;
 import com.sap.cloud.environment.servicebinding.api.ServiceBinding;
 import com.sap.cloud.environment.servicebinding.api.ServiceIdentifier;
 import com.sap.cloud.sdk.cloudplatform.connectivity.ServiceBindingDestinationOptions.Options;
@@ -29,7 +28,6 @@
  * @see MegacliteServiceBindingAccessor
  * @since 4.17.0
  */
-@Beta
 @Slf4j
 public final class MegacliteServiceBindingDestinationLoader implements ServiceBindingDestinationLoader
 {
@@ -147,8 +145,8 @@ MegacliteServiceBinding.MandateConfiguration getMandateConfigurationOrThrow(
     private MegacliteServiceBinding getBindingOrThrow( @Nonnull final ServiceBindingDestinationOptions options )
     {
         final ServiceBinding serviceBinding = options.getServiceBinding();
-        if( serviceBinding instanceof MegacliteServiceBinding ) {
-            return (MegacliteServiceBinding) serviceBinding;
+        if( serviceBinding instanceof MegacliteServiceBinding megacliteServiceBinding ) {
+            return megacliteServiceBinding;
         }
         final String msg =
             "Unable to transform the provided service binding for service '%s' into a Megaclite based destination. Expected the service binding to be of type '%s' but got a '%s' instead.";
diff --git a/cloudplatform/connectivity-oauth/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2PropertySupplier.java b/cloudplatform/connectivity-oauth/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2PropertySupplier.java
index 06f53693a..1b0ed2875 100644
--- a/cloudplatform/connectivity-oauth/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2PropertySupplier.java
+++ b/cloudplatform/connectivity-oauth/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2PropertySupplier.java
@@ -8,7 +8,6 @@
 
 import javax.annotation.Nonnull;
 
-import com.google.common.annotations.Beta;
 import com.sap.cloud.security.config.ClientIdentity;
 
 /**
@@ -17,7 +16,6 @@
  *
  * @since 4.20.0
  */
-@Beta
 public interface OAuth2PropertySupplier
 {
     /**
diff --git a/cloudplatform/connectivity-oauth/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2ServiceBindingDestinationLoader.java b/cloudplatform/connectivity-oauth/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2ServiceBindingDestinationLoader.java
index 80e2a249a..ed40f6f9e 100644
--- a/cloudplatform/connectivity-oauth/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2ServiceBindingDestinationLoader.java
+++ b/cloudplatform/connectivity-oauth/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/OAuth2ServiceBindingDestinationLoader.java
@@ -14,7 +14,6 @@
 
 import org.apache.http.HttpHeaders;
 
-import com.google.common.annotations.Beta;
 import com.sap.cloud.environment.servicebinding.api.ServiceIdentifier;
 import com.sap.cloud.sdk.cloudplatform.connectivity.ServiceBindingDestinationOptions.Options;
 import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException;
@@ -34,7 +33,6 @@
  * @since 4.16.0
  */
 @Slf4j
-@Beta
 public class OAuth2ServiceBindingDestinationLoader implements ServiceBindingDestinationLoader
 {
     @Nonnull