diff --git a/dev-packages/e2e-tests/maestro/utils/sentryApi.js b/dev-packages/e2e-tests/maestro/utils/sentryApi.js
index fb78ded03e..89fe410984 100644
--- a/dev-packages/e2e-tests/maestro/utils/sentryApi.js
+++ b/dev-packages/e2e-tests/maestro/utils/sentryApi.js
@@ -5,9 +5,9 @@ const RETRY_INTERVAL = 1000;
 const requestHeaders = { 'Authorization': `Bearer ${sentryAuthToken}` }
 
 function sleep(ms) {
-  // TODO reach out to Maestro & GrallJS via GitHub issues.
+  // Maestro's GraalJS runtime has no setTimeout/Promise, so instead of
   //   return new Promise(resolve => setTimeout(resolve, ms));
-  // Instead, we need to do a busy wait.
+  // we busy-wait.
   const until = Date.now() + ms;
   while (Date.now() < until) {
     // console.log(`Sleeping for ${until - Date.now()} ms`);
diff --git a/packages/core/ios/RNSentryStart.m b/packages/core/ios/RNSentryStart.m
index b5493dcd5b..68539d06d6 100644
--- a/packages/core/ios/RNSentryStart.m
+++ b/packages/core/ios/RNSentryStart.m
@@ -125,8 +125,8 @@ + (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
 
     // Exclude Dev Server and Sentry Dsn request from Breadcrumbs
     NSString *dsn = [self getURLFromDSN:[mutableOptions valueForKey:@"dsn"]];
-    // TODO: For Auto Init from JS dev server is resolved automatically, for init from options file
-    // dev server has to be specified manually
+    // devServerUrl is resolved by the JS layer on auto-init; for init from an options file it comes
+    // from the options instead (JS isn't available here to resolve it).
     NSString *devServerUrl = [mutableOptions valueForKey:@"devServerUrl"];
     sentryOptions.beforeBreadcrumb
         = ^SentryBreadcrumb *_Nullable(SentryBreadcrumb *_Nonnull breadcrumb)
@@ -159,8 +159,8 @@ + (SentryOptions *_Nullable)createOptionsWithDictionary:(NSDictionary *_Nonnull)
             sentryOptions.spotlightUrl = spotlightValue;
         } else if ([spotlightValue isKindOfClass:[NSNumber class]]) {
             sentryOptions.enableSpotlight = [spotlightValue boolValue];
-            // TODO: For Auto init from JS set automatically for init from options file have to be
-            // set manually
+            // defaultSidecarUrl is resolved by the JS layer on auto-init; for init from an options
+            // file it comes from the options instead.
             id defaultSpotlightUrl = [mutableOptions valueForKey:@"defaultSidecarUrl"];
             if (defaultSpotlightUrl != nil) {
                 sentryOptions.spotlightUrl = defaultSpotlightUrl;
diff --git a/samples/expo/app/(tabs)/index.tsx b/samples/expo/app/(tabs)/index.tsx
index 85d1c8cf17..34a2e96d63 100644
--- a/samples/expo/app/(tabs)/index.tsx
+++ b/samples/expo/app/(tabs)/index.tsx
@@ -86,7 +86,7 @@ export default function TabOneScreen() {
           <Button
             title="Unhandled Promise Rejection"
             onPress={() => {
-              // TODO: No working in Expo Go App
+              // Not captured when running in Expo Go.
               Promise.reject(new Error('Unhandled Promise Rejection'));
             }}
           />
diff --git a/samples/react-native/e2e/tests/captureAppStartCrash/captureAppStartCrash.test.ios.manual.ts b/samples/react-native/e2e/tests/captureAppStartCrash/captureAppStartCrash.test.ios.manual.ts
index c00efb7ad2..128908ef6f 100644
--- a/samples/react-native/e2e/tests/captureAppStartCrash/captureAppStartCrash.test.ios.manual.ts
+++ b/samples/react-native/e2e/tests/captureAppStartCrash/captureAppStartCrash.test.ios.manual.ts
@@ -40,18 +40,13 @@ describe('Capture app start crash', () => {
         sdk: {
           features: ['experimentalViewRenderer', 'dataSwizzling'],
           integrations: [
+            // Only SessionReplay appears here, by design. App-start crashes are flushed
+            // synchronously by sentry-cocoa during SDK init, from inside SentryCrashIntegration,
+            // before the later integrations are added to the hub. sdk.integrations is computed
+            // from the live installed-integration list at send time, so it reflects only what is
+            // ordered before the crash integration (SessionReplay). Non-startup crashes are sent
+            // async after init completes and carry the full list. See #6845.
             'SessionReplay',
-            // FIXME: Why are these not included?
-            // 'WatchdogTerminationTracking',
-            // 'Screenshot',
-            // 'Crash',
-            // 'ANRTracking',
-            // 'ViewHierarchy',
-            // 'AutoBreadcrumbTracking',
-            // 'AutoSessionTracking',
-            // 'NetworkTracking',
-            // 'AppStartTracking',
-            // 'FramesTracking',
           ],
           name: 'sentry.cocoa.react-native',
           packages: [
diff --git a/samples/react-native/e2e/utils/parseEnvelope.ts b/samples/react-native/e2e/utils/parseEnvelope.ts
index e6b29b201e..5083465d63 100644
--- a/samples/react-native/e2e/utils/parseEnvelope.ts
+++ b/samples/react-native/e2e/utils/parseEnvelope.ts
@@ -39,7 +39,6 @@ export function parseEnvelope(env: string | Uint8Array): Envelope {
     const isBinaryAttachment =
       itemHeader.type === 'attachment' &&
       itemHeader.content_type !== 'application/json';
-    // TODO: Parse when needed for the tests
     const isReplayVideo = (itemHeader.type as string) === 'replay_video';
 
     try {