diff --git a/ember-basic-dropdown/package.json b/ember-basic-dropdown/package.json
index 8286b925..6fb7425b 100644
--- a/ember-basic-dropdown/package.json
+++ b/ember-basic-dropdown/package.json
@@ -63,7 +63,6 @@
   "dependencies": {
     "@embroider/addon-shim": "^1.10.2",
     "@embroider/macros": "^1.19.5",
-    "@embroider/util": "^1.13.5",
     "decorator-transforms": "^2.3.0",
     "ember-element-helper": "^0.8.8",
     "ember-modifier": "^4.2.2",
diff --git a/ember-basic-dropdown/src/components/basic-dropdown.gts b/ember-basic-dropdown/src/components/basic-dropdown.gts
index e5930378..f1af9c80 100644
--- a/ember-basic-dropdown/src/components/basic-dropdown.gts
+++ b/ember-basic-dropdown/src/components/basic-dropdown.gts
@@ -15,7 +15,6 @@ import { schedule } from '@ember/runloop';
 import type { ComponentLike } from '@glint/template';
 import type { BasicDropdownTriggerSignature } from './basic-dropdown-trigger.ts';
 import type { BasicDropdownContentSignature } from './basic-dropdown-content.ts';
-import { ensureSafeComponent } from '@embroider/util';
 import { hash } from '@ember/helper';
 import BasicDropdownTrigger from './basic-dropdown-trigger.gts';
 import BasicDropdownContent from './basic-dropdown-content.gts';
@@ -69,14 +68,8 @@ export interface BasicDropdownArgs {
   registerAPI?: (dropdown: Dropdown | null) => void;
   onOpen?: (dropdown: Dropdown, e?: Event) => boolean | void;
   onClose?: (dropdown: Dropdown, e?: Event) => boolean | void;
-  triggerComponent?:
-    | string
-    | ComponentLike<BasicDropdownTriggerSignature>
-    | undefined;
-  contentComponent?:
-    | string
-    | ComponentLike<BasicDropdownContentSignature>
-    | undefined;
+  triggerComponent?: ComponentLike<BasicDropdownTriggerSignature> | undefined;
+  contentComponent?: ComponentLike<BasicDropdownContentSignature> | undefined;
   calculatePosition?: CalculatePosition;
 }
 
@@ -499,25 +492,17 @@ export default class BasicDropdown extends Component<BasicDropdownSignature> {
   }
 
   get triggerComponent(): ComponentLike<BasicDropdownTriggerSignature> {
-    if (this.args.triggerComponent) {
-      return ensureSafeComponent(
-        this.args.triggerComponent,
-        this,
-      ) as ComponentLike<BasicDropdownTriggerSignature>;
-    }
-
-    return BasicDropdownTrigger as ComponentLike<BasicDropdownTriggerSignature>;
+    return (
+      this.args.triggerComponent ||
+      (BasicDropdownTrigger as ComponentLike<BasicDropdownTriggerSignature>)
+    );
   }
 
   get contentComponent(): ComponentLike<BasicDropdownContentSignature> {
-    if (this.args.contentComponent) {
-      return ensureSafeComponent(
-        this.args.contentComponent,
-        this,
-      ) as ComponentLike<BasicDropdownContentSignature>;
-    }
-
-    return BasicDropdownContent as ComponentLike<BasicDropdownContentSignature>;
+    return (
+      this.args.contentComponent ||
+      (BasicDropdownContent as ComponentLike<BasicDropdownContentSignature>)
+    );
   }
 
   <template>
diff --git a/ember-basic-dropdown/src/types/global.d.ts b/ember-basic-dropdown/src/types/global.d.ts
index b516025c..abbb7434 100644
--- a/ember-basic-dropdown/src/types/global.d.ts
+++ b/ember-basic-dropdown/src/types/global.d.ts
@@ -1,7 +1,6 @@
 import '@glint/environment-ember-loose';
 
 import type EmberTruthRegistry from 'ember-truth-helpers/template-registry';
-import type { EmbroiderUtilRegistry } from '@embroider/util';
 import type EmberElementHelperRegistry from 'ember-element-helper/template-registry';
 
 // export interface StyleHelperRegistry {
@@ -18,7 +17,6 @@ declare module '@glint/environment-ember-loose/registry' {
   export default interface Registry
     extends
       EmberTruthRegistry,
-      EmbroiderUtilRegistry,
       EmberElementHelperRegistry /* other registries here */ {
     // ...
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 122bbf12..175809eb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -37,7 +37,7 @@ importers:
     dependencies:
       ember-basic-dropdown:
         specifier: workspace:*
-        version: file:ember-basic-dropdown(@babel/core@7.28.5)(@ember/string@4.0.1)(@ember/test-helpers@5.4.1(@babel/core@7.28.5)(@glint/template@1.5.2))(@glimmer/component@2.0.0)(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5))
+        version: link:../ember-basic-dropdown
     dependenciesMeta:
       ember-basic-dropdown:
         injected: true
@@ -234,9 +234,6 @@ importers:
       '@embroider/macros':
         specifier: ^1.19.5
         version: 1.19.5(@glint/template@1.5.2)
-      '@embroider/util':
-        specifier: ^1.13.5
-        version: 1.13.5(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.9.0(@glimmer/component@2.0.0)(rsvp@4.8.5))
       decorator-transforms:
         specifier: ^2.3.0
         version: 2.3.0(@babel/core@7.28.5)
@@ -1291,19 +1288,6 @@ packages:
       '@embroider/webpack':
         optional: true
 
-  '@embroider/util@1.13.5':
-    resolution: {integrity: sha512-rHhGUzAQ5iOr5Swvk7yaarVe5SJtcjK2t/C8ts9agWfhTq4DVfy8+axF0KOf1jALRiJao3l9ALRGd6letKw2ZQ==}
-    engines: {node: 12.* || 14.* || >= 16}
-    peerDependencies:
-      '@glint/environment-ember-loose': ^1.0.0
-      '@glint/template': ^1.0.0
-      ember-source: '*'
-    peerDependenciesMeta:
-      '@glint/environment-ember-loose':
-        optional: true
-      '@glint/template':
-        optional: true
-
   '@embroider/vite@1.4.4':
     resolution: {integrity: sha512-5yi7wYpBfeVCNd+gSwsAYZMA6kgQ/xZyDwbBtT2wopBrEL+sddCDT9s4eVGqTRm9cWDLdhqt4si/2d+DJX6Vyw==}
     peerDependencies:
@@ -3987,12 +3971,6 @@ packages:
     resolution: {integrity: sha512-J9wVTddnpx1ZPf6CgtMs8byp5t9ZZITUX9v+H+PgSDSgbYbDrVlKr2RGDfJLrnaTpuWwZqh1b54/9jLaERr6QA==}
     engines: {node: 12.* || 14.* || >= 16}
 
-  ember-basic-dropdown@file:ember-basic-dropdown:
-    resolution: {directory: ember-basic-dropdown, type: directory}
-    peerDependencies:
-      '@ember/test-helpers': ^2.9.4 || ^3.2.1 || ^4.0.2 || ^5.0.0
-      '@glimmer/component': ^1.1.2 || ^2.0.0
-
   ember-cli-app-version@7.0.0:
     resolution: {integrity: sha512-zWIkxvlRrW7w1/vp+bGkmS27QsVum7NKp8N9DgAjhFMWuKewVqGyl/jeYaujMS/I4WSKBzSG9WHwBy2rjbUWxA==}
     engines: {node: '>= 18'}
@@ -9591,30 +9569,6 @@ snapshots:
       lodash: 4.17.21
       resolve: 1.22.11
 
-  '@embroider/util@1.13.5(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5))':
-    dependencies:
-      '@embroider/macros': 1.19.5(@glint/template@1.5.2)
-      broccoli-funnel: 3.0.8
-      ember-cli-babel: 7.26.11
-      ember-source: 6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5)
-    optionalDependencies:
-      '@glint/environment-ember-loose': 1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5))
-      '@glint/template': 1.5.2
-    transitivePeerDependencies:
-      - supports-color
-
-  '@embroider/util@1.13.5(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.9.0(@glimmer/component@2.0.0)(rsvp@4.8.5))':
-    dependencies:
-      '@embroider/macros': 1.19.5(@glint/template@1.5.2)
-      broccoli-funnel: 3.0.8
-      ember-cli-babel: 7.26.11
-      ember-source: 6.9.0(@glimmer/component@2.0.0)(rsvp@4.8.5)
-    optionalDependencies:
-      '@glint/environment-ember-loose': 1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5))
-      '@glint/template': 1.5.2
-    transitivePeerDependencies:
-      - supports-color
-
   '@embroider/vite@1.4.4(@embroider/core@4.4.0(@glint/template@1.5.2))(@glint/template@1.5.2)(rollup@4.53.3)(vite@7.2.6(@types/node@24.10.1)(jiti@2.6.1)(sass-embedded@1.93.3)(sass@1.94.2)(terser@5.44.1)(yaml@2.8.2))':
     dependencies:
       '@babel/core': 7.28.5
@@ -12591,26 +12545,6 @@ snapshots:
       - supports-color
       - webpack
 
-  ember-basic-dropdown@file:ember-basic-dropdown(@babel/core@7.28.5)(@ember/string@4.0.1)(@ember/test-helpers@5.4.1(@babel/core@7.28.5)(@glint/template@1.5.2))(@glimmer/component@2.0.0)(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5)):
-    dependencies:
-      '@ember/test-helpers': 5.4.1(@babel/core@7.28.5)(@glint/template@1.5.2)
-      '@embroider/addon-shim': 1.10.2
-      '@embroider/macros': 1.19.5(@glint/template@1.5.2)
-      '@embroider/util': 1.13.5(@glint/environment-ember-loose@1.5.2(@glimmer/component@2.0.0)(@glint/template@1.5.2)(ember-cli-htmlbars@6.3.0)(ember-modifier@4.2.2(@babel/core@7.28.5)))(@glint/template@1.5.2)(ember-source@6.7.0(@glimmer/component@2.0.0)(rsvp@4.8.5))
-      '@glimmer/component': 2.0.0
-      decorator-transforms: 2.3.0(@babel/core@7.28.5)
-      ember-element-helper: 0.8.8
-      ember-modifier: 4.2.2(@babel/core@7.28.5)
-      ember-style-modifier: 4.5.1(@babel/core@7.28.5)(@ember/string@4.0.1)
-      ember-truth-helpers: 5.0.0
-    transitivePeerDependencies:
-      - '@babel/core'
-      - '@ember/string'
-      - '@glint/environment-ember-loose'
-      - '@glint/template'
-      - ember-source
-      - supports-color
-
   ember-cli-app-version@7.0.0(ember-source@6.9.0(@glimmer/component@2.0.0)(rsvp@4.8.5)):
     dependencies:
       ember-cli-babel: 7.26.11