diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java
index cff10354573..2ae24c2f6b6 100644
--- a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java
+++ b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java
@@ -56,8 +56,6 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
       }
     }
 
-    ContextStorage.addWrapper((storage) -> new SentryContextStorage(storage));
-
     autoConfiguration
         .addTracerProviderCustomizer(this::configureSdkTracerProvider)
         .addPropertiesSupplier(this::getDefaultProperties);
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
index 6057a37f149..146d17461f5 100644
--- a/sentry/api/sentry.api
+++ b/sentry/api/sentry.api
@@ -953,7 +953,6 @@ public abstract interface class io/sentry/ISpan {
 	public abstract fun getContexts ()Lio/sentry/protocol/Contexts;
 	public abstract fun getData (Ljava/lang/String;)Ljava/lang/Object;
 	public abstract fun getDescription ()Ljava/lang/String;
-	public abstract fun getEventId ()Lio/sentry/protocol/SentryId;
 	public abstract fun getFinishDate ()Lio/sentry/SentryDate;
 	public abstract fun getLocalMetricsAggregator ()Lio/sentry/metrics/LocalMetricsAggregator;
 	public abstract fun getOperation ()Ljava/lang/String;
@@ -1551,7 +1550,6 @@ public final class io/sentry/NoOpSpan : io/sentry/ISpan {
 	public fun getContexts ()Lio/sentry/protocol/Contexts;
 	public fun getData (Ljava/lang/String;)Ljava/lang/Object;
 	public fun getDescription ()Ljava/lang/String;
-	public fun getEventId ()Lio/sentry/protocol/SentryId;
 	public fun getFinishDate ()Lio/sentry/SentryDate;
 	public static fun getInstance ()Lio/sentry/NoOpSpan;
 	public fun getLocalMetricsAggregator ()Lio/sentry/metrics/LocalMetricsAggregator;
@@ -3112,7 +3110,6 @@ public final class io/sentry/Span : io/sentry/ISpan {
 	public fun getData ()Ljava/util/Map;
 	public fun getData (Ljava/lang/String;)Ljava/lang/Object;
 	public fun getDescription ()Ljava/lang/String;
-	public fun getEventId ()Lio/sentry/protocol/SentryId;
 	public fun getFinishDate ()Lio/sentry/SentryDate;
 	public fun getLocalMetricsAggregator ()Lio/sentry/metrics/LocalMetricsAggregator;
 	public fun getMeasurements ()Ljava/util/Map;
diff --git a/sentry/src/main/java/io/sentry/ISpan.java b/sentry/src/main/java/io/sentry/ISpan.java
index f624bb79ef0..0b8f9310331 100644
--- a/sentry/src/main/java/io/sentry/ISpan.java
+++ b/sentry/src/main/java/io/sentry/ISpan.java
@@ -280,9 +280,6 @@ ISpan startChild(
   @Nullable
   TracesSamplingDecision getSamplingDecision();
 
-  //  @NotNull
-  //  SentryId getEventId();
-
   @ApiStatus.Internal
   @NotNull
   ISentryLifecycleToken makeCurrent();
diff --git a/sentry/src/main/java/io/sentry/Sentry.java b/sentry/src/main/java/io/sentry/Sentry.java
index 3091a925c41..7206df9b376 100644
--- a/sentry/src/main/java/io/sentry/Sentry.java
+++ b/sentry/src/main/java/io/sentry/Sentry.java
@@ -278,10 +278,14 @@ private static synchronized void init(
 
     options.getLogger().log(SentryLevel.INFO, "GlobalHubMode: '%s'", String.valueOf(globalHubMode));
     Sentry.globalHubMode = globalHubMode;
+    globalScope.replaceOptions(options);
 
     final IScopes scopes = getCurrentScopes();
     final IScope rootScope = new Scope(options);
     final IScope rootIsolationScope = new Scope(options);
+    rootScopes = new Scopes(rootScope, rootIsolationScope, globalScope, "Sentry.init");
+
+    getScopesStorage().set(rootScopes);
 
     scopes.close(true);
     globalScope.bindClient(new SentryClient(rootScopes.getOptions()));
diff --git a/sentry/src/main/java/io/sentry/Span.java b/sentry/src/main/java/io/sentry/Span.java
index 9a17a1a83a7..12fcf87c200 100644
--- a/sentry/src/main/java/io/sentry/Span.java
+++ b/sentry/src/main/java/io/sentry/Span.java
@@ -306,11 +306,6 @@ public boolean isFinished() {
     return context.getSamplingDecision();
   }
 
-  //  @Override
-  //  public @NotNull SentryId getEventId() {
-  //    return new SentryId(UUID.nameUUIDFromBytes(getSpanId().toString().getBytes()));
-  //  }
-
   @Override
   public void setThrowable(final @Nullable Throwable throwable) {
     this.throwable = throwable;