diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm
index 19daad723f..56398156d9 100644
--- a/packages/core/ios/RNSentry.mm
+++ b/packages/core/ios/RNSentry.mm
@@ -495,8 +495,6 @@ - (void)handleShakeDetected
         NSLog(@"Bridge call to: deviceContexts");
     }
     __block NSMutableDictionary<NSString *, id> *serializedScope;
-    // Temp work around until sorted out this API in sentry-cocoa.
-    // TODO: If the callback isnt' executed the promise wouldn't be resolved.
     [SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) {
         serializedScope = [[scope serialize] mutableCopy];
 
diff --git a/packages/core/src/js/tracing/reactnativenavigation.ts b/packages/core/src/js/tracing/reactnativenavigation.ts
index 5a3eb9e422..c881e1647a 100644
--- a/packages/core/src/js/tracing/reactnativenavigation.ts
+++ b/packages/core/src/js/tracing/reactnativenavigation.ts
@@ -179,7 +179,7 @@ export const reactNativeNavigationIntegration = ({
       latestNavigationSpan.updateName(event.componentName);
     }
     latestNavigationSpan.setAttributes({
-      // TODO: Should we include pass props? I don't know exactly what it contains, cant find it in the RNavigation docs
+      // `passProps` is intentionally omitted: arbitrary app data (potential PII); gate on `sendDefaultPii` if ever added.
       'route.name': event.componentName,
       'route.component_id': event.componentId,
       'route.component_type': event.componentType,
@@ -227,7 +227,7 @@ export const reactNativeNavigationIntegration = ({
       if (isSentrySpan(latestNavigationSpan)) {
         markRootSpanForDiscard(latestNavigationSpan, 'discarded_latest_navigation');
       }
-      // TODO: What if it's not SentrySpan?
+      // A non-SentrySpan here is a non-recording span whose end() is a no-op, so nothing to discard.
       latestNavigationSpan.end();
       latestNavigationSpan = undefined;
     }
diff --git a/packages/core/src/js/tracing/reactnavigation.ts b/packages/core/src/js/tracing/reactnavigation.ts
index 7b7def8d57..dc303bb1e7 100644
--- a/packages/core/src/js/tracing/reactnavigation.ts
+++ b/packages/core/src/js/tracing/reactnavigation.ts
@@ -867,7 +867,7 @@ export const reactNavigationIntegration = ({
       if (isSentrySpan(latestNavigationSpan)) {
         markRootSpanForDiscard(latestNavigationSpan, 'discarded_latest_navigation');
       }
-      // TODO: What if it's not SentrySpan?
+      // A non-SentrySpan here is a non-recording span whose end() is a no-op, so nothing to discard.
       latestNavigationSpan.end();
       latestNavigationSpan = undefined;
     }