diff --git a/app/components/class-field-description.gjs b/app/components/class-field-description.gjs
index 3988fc32..595dd691 100644
--- a/app/components/class-field-description.gjs
+++ b/app/components/class-field-description.gjs
@@ -1,7 +1,5 @@
 import { service } from '@ember/service';
 import Component from '@glimmer/component';
-import join from 'ember-composable-helpers/helpers/join';
-import mapBy from 'ember-composable-helpers/helpers/map-by';
 import svgJar from 'ember-svg-jar/helpers/svg-jar';
 import { LinkTo } from '@ember/routing';
 import { array, concat } from '@ember/helper';
@@ -11,6 +9,15 @@ import eq from 'ember-api-docs/helpers/eq';
 import ImportExample from 'ember-api-docs/components/import-example';
 import MarkdownToHtml from 'ember-cli-showdown/components/markdown-to-html';
 
+/**
+ * Extract the name field from the passed items an string-join them with `, ` in the middle
+ *
+ * @param {[{name: string}]} items
+ */
+function combineNames(items) {
+  return items.map((item) => item.name).join(', ');
+}
+
 export default class ClassFieldDescription extends Component {
   <template>
     {{! template-lint-disable no-invalid-interactive }}
@@ -20,9 +27,8 @@ export default class ClassFieldDescription extends Component {
           <span class="{{@type}}-name">
             {{@field.name}}
           </span>
-          {{#if @field.params}}(<span class="args">{{join
-                ", "
-                (mapBy "name" @field.params)
+          {{#if @field.params}}(<span class="args">{{combineNames
+                @field.params
               }}</span>){{/if}}
           {{#if @field.return}}
             :
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 4e70ea53..79293c51 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -19,9 +19,6 @@ module.exports = function (defaults) {
       sourcemap: !envIsProduction,
       overrideBrowsersList: ['default'],
     },
-    'ember-composable-helpers': {
-      only: ['join', 'map-by'],
-    },
     'asset-cache': {
       version: '4', //Might have to change this with the app build,
     },
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 2dc7fd23..7b6e0b5f 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -43,7 +43,13 @@ export default [
    * https://eslint.org/docs/latest/use/configure/ignore
    */
   {
-    ignores: ['dist/', 'node_modules/', 'coverage/', '!**/.*'],
+    ignores: [
+      'dist/',
+      'node_modules/',
+      'coverage/',
+      '!**/.*',
+      'ember-api-docs-data',
+    ],
   },
   /**
    * https://eslint.org/docs/latest/use/configure/configuration-files#configuring-linter-options
diff --git a/package.json b/package.json
index 8e0efe9f..63655243 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,6 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-showdown": "^9.0.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-composable-helpers": "^5.0.0",
     "ember-concurrency": "^4.0.6",
     "ember-data": "~4.12.8",
     "ember-data-fastboot": "https://github.com/kategengler/ember-data-fastboot#v0.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8ffb10bd..1c50ff3f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -134,9 +134,6 @@ importers:
       ember-cli-terser:
         specifier: ^4.0.2
         version: 4.0.2
-      ember-composable-helpers:
-        specifier: ^5.0.0
-        version: 5.0.0
       ember-concurrency:
         specifier: ^4.0.6
         version: 4.0.6(@babel/core@7.29.0)
@@ -3580,10 +3577,6 @@ packages:
   broccoli-funnel-reducer@1.0.0:
     resolution: {integrity: sha512-SaOCEdh+wnt2jFUV2Qb32m7LXyElvFwW3NKNaEJyi5PGQNwxfqpkc0KI6AbQANKgdj/40U2UC0WuGThFwuEUaA==}
 
-  broccoli-funnel@2.0.1:
-    resolution: {integrity: sha512-C8Lnp9TVsSSiZMGEF16C0dCiNg2oJqUKwuZ1K4kVC6qRPG/2Cj/rtB5kRCC9qEbwqhX71bDbfHROx0L3J7zXQg==}
-    engines: {node: ^4.5 || 6.* || >= 7.*}
-
   broccoli-funnel@2.0.2:
     resolution: {integrity: sha512-/vDTqtv7ipjEZQOVqO4vGDVAOZyuYzQ/EgGoyewfOgh1M7IQAToBKZI0oAQPgMBeFPPlIbfMuAngk+ohPBuaHQ==}
     engines: {node: ^4.5 || 6.* || >= 7.*}
@@ -4812,10 +4805,6 @@ packages:
     resolution: {integrity: sha512-BtkjulweiXo9c3yVWrtexw2dTmBrvavD/xixNC6TKOBdrixUwU+6nuOO9dufDWsMxoid7MvtmDpzc9+mE8PdaA==}
     engines: {node: 10.* || >= 12.*}
 
-  ember-composable-helpers@5.0.0:
-    resolution: {integrity: sha512-gyUrjiSju4QwNrsCLbBpP0FL6VDFZaELNW7Kbcp60xXhjvNjncYgzm4zzYXhT+i1lLA6WEgRZ3lOGgyBORYD0w==}
-    engines: {node: 12.* || 14.* || >= 16}
-
   ember-concurrency@2.3.7:
     resolution: {integrity: sha512-sz6sTIXN/CuLb5wdpauFa+rWXuvXXSnSHS4kuNzU5GSMDX1pLBWSuovoUk61FUe6CYRqBmT1/UushObwBGickQ==}
     engines: {node: 10.* || 12.* || 14.* || >= 16}
@@ -13964,24 +13953,6 @@ snapshots:
 
   broccoli-funnel-reducer@1.0.0: {}
 
-  broccoli-funnel@2.0.1:
-    dependencies:
-      array-equal: 1.0.2
-      blank-object: 1.0.2
-      broccoli-plugin: 1.3.1
-      debug: 2.6.9(supports-color@8.1.1)
-      fast-ordered-set: 1.0.3
-      fs-tree-diff: 0.5.9
-      heimdalljs: 0.2.6
-      minimatch: 3.1.5
-      mkdirp: 0.5.6
-      path-posix: 1.0.0
-      rimraf: 2.7.1
-      symlink-or-copy: 1.3.1
-      walk-sync: 0.3.4
-    transitivePeerDependencies:
-      - supports-color
-
   broccoli-funnel@2.0.2:
     dependencies:
       array-equal: 1.0.2
@@ -15765,15 +15736,6 @@ snapshots:
       - '@babel/core'
       - supports-color
 
-  ember-composable-helpers@5.0.0:
-    dependencies:
-      '@babel/core': 7.29.0(supports-color@8.1.1)
-      broccoli-funnel: 2.0.1
-      ember-cli-babel: 7.26.11
-      resolve: 1.22.11
-    transitivePeerDependencies:
-      - supports-color
-
   ember-concurrency@2.3.7(@babel/core@7.29.0):
     dependencies:
       '@babel/helper-plugin-utils': 7.28.6