diff --git a/goldens/aria/listbox/index.api.md b/goldens/aria/listbox/index.api.md
index 9bab3e7021fd..66cd7591a273 100644
--- a/goldens/aria/listbox/index.api.md
+++ b/goldens/aria/listbox/index.api.md
@@ -42,7 +42,6 @@ class Option_2<V> {
     readonly id: _angular_core.InputSignal<string>;
     readonly label: _angular_core.InputSignal<string | undefined>;
     readonly _pattern: OptionPattern<V>;
-    protected readonly searchTerm: _angular_core.Signal<string>;
     readonly selected: _angular_core.Signal<boolean | undefined>;
     readonly value: _angular_core.InputSignal<V>;
     // (undocumented)
diff --git a/src/aria/BUILD.bazel b/src/aria/BUILD.bazel
index 956d7a2fa55f..f634f4d0e925 100644
--- a/src/aria/BUILD.bazel
+++ b/src/aria/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 load("//src/aria:config.bzl", "ARIA_TARGETS")
-load("//tools:defaults.bzl", "ng_examples_db", "ng_package", "ts_project")
+load("//tools:defaults.bzl", "ng_package", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -16,25 +16,11 @@ ts_project(
     deps = ["//:node_modules/@angular/core"],
 )
 
-ng_examples_db(
-    name = "aria_example_database",
-    srcs = glob(
-        include = [
-            "examples/**/*.md",
-        ],
-        # TODO: Remove this once examples are created. It should never be empty at that point.
-        allow_empty = True,
-    ),
-    out = "resources/code-examples.db",
-    path = "src/aria/examples",
-)
-
 ng_package(
     name = "npm_package",
     package_name = "@angular/aria",
     srcs = [
         "package.json",
-        "resources/code-examples.db",
     ],
     nested_packages = select({
         "//:snapshot_adev_assets": [":adev_assets"],
diff --git a/src/aria/accordion/accordion-group.ts b/src/aria/accordion/accordion-group.ts
index 10ec5cae8d49..487936a1f953 100644
--- a/src/aria/accordion/accordion-group.ts
+++ b/src/aria/accordion/accordion-group.ts
@@ -116,7 +116,6 @@ export class AccordionGroup {
     element: () => this.element,
     activeItem: signal(undefined),
     items: this._triggerPatterns,
-    // TODO(ok7sai): Investigate whether an accordion should support horizontal mode.
     orientation: () => 'vertical',
   });
 
diff --git a/src/aria/listbox/option.ts b/src/aria/listbox/option.ts
index 9ace2b204dc5..6f4d9505d0b4 100644
--- a/src/aria/listbox/option.ts
+++ b/src/aria/listbox/option.ts
@@ -56,11 +56,6 @@ export class Option<V> {
   /** A unique identifier for the option. */
   readonly id = input(inject(_IdGenerator).getId('ng-option-', true));
 
-  // TODO(wagnermaciel): See if we want to change how we handle this since textContent is not
-  // reactive. See https://github.com/angular/components/pull/30495#discussion_r1961260216.
-  /** The text used by the typeahead search. */
-  protected readonly searchTerm = computed(() => this.label() ?? this.element.textContent);
-
   /** The parent Listbox UIPattern. */
   private readonly _listboxPattern = computed(() => this._listbox._pattern);
 
@@ -83,6 +78,6 @@ export class Option<V> {
     value: this.value,
     listbox: this._listboxPattern,
     element: () => this.element,
-    searchTerm: () => this.searchTerm() ?? '',
+    searchTerm: () => this.label() ?? '',
   });
 }
diff --git a/src/aria/menu/menu-item.ts b/src/aria/menu/menu-item.ts
index cf0d87d0988b..f2f94a7687a4 100644
--- a/src/aria/menu/menu-item.ts
+++ b/src/aria/menu/menu-item.ts
@@ -62,8 +62,6 @@ export class MenuItem<V> {
   /** Whether the menu item is disabled. */
   readonly disabled = input<boolean>(false);
 
-  // TODO(wagnermaciel): Discuss whether all inputs should be models.
-
   /** The search term associated with the menu item. */
   readonly searchTerm = model<string>('');
 
diff --git a/src/aria/private/behaviors/signal-like/signal-like.ts b/src/aria/private/behaviors/signal-like/signal-like.ts
index ee11e6ff9fa9..36081d4100b8 100644
--- a/src/aria/private/behaviors/signal-like/signal-like.ts
+++ b/src/aria/private/behaviors/signal-like/signal-like.ts
@@ -41,8 +41,6 @@ export function convertGetterSetterToWritableSignalLike<T>(
 
 export function computed<T>(computation: () => T): SignalLike<T> {
   const computed = createComputed(computation);
-  // TODO: Remove the `toString` after https://github.com/angular/angular/pull/65948 is merged.
-  computed.toString = () => `[Computed: ${computed()}]`;
   computed[SIGNAL].debugName = '';
   return computed;
 }
diff --git a/src/aria/private/behaviors/tree/tree.ts b/src/aria/private/behaviors/tree/tree.ts
index 4ba301369d27..e460be1f8b36 100644
--- a/src/aria/private/behaviors/tree/tree.ts
+++ b/src/aria/private/behaviors/tree/tree.ts
@@ -260,9 +260,11 @@ export class Tree<T extends TreeItem<V, T>, V> {
     item ??= this.inputs.activeItem();
     if (!item) return;
 
+    // If the item has a parent, get all of the parent's children.
+    // Otherwise, it is a root item, and get all other root items.
     const parent = item.parent?.();
-    // TODO: This assumes that items without a parent are root items.
     const siblings = parent ? parent.children?.() : this.inputs.items().filter(i => !i.parent?.());
+
     siblings?.forEach(s => this.expand(s));
   }