diff --git a/addon/association.js b/addon/association.js
deleted file mode 100644
index cebb404e9..000000000
--- a/addon/association.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { association } from 'miragejs';
-import { deprecateNestedImport } from './deprecate-imports';
-
-/**
- @function association
- @hide
- */
-export default function (...args) {
-  deprecateNestedImport(
-    "Importing 'association' from 'ember-cli-mirage/association' is deprecated. " +
-      "Add the `miragejs` package to devDependencies and use `import { association } from 'miragejs';` instead."
-  );
-
-  return association(...args);
-}
diff --git a/addon/db-collection.js b/addon/db-collection.js
deleted file mode 100644
index c6a2a9159..000000000
--- a/addon/db-collection.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _DbCollection } from 'miragejs';
-import { deprecateNestedImport } from './deprecate-imports';
-
-/**
- @class DeprecatedDbCollection
- @hide
- */
-export default class DeprecatedDbCollection extends _DbCollection {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'DbCollection' from 'ember-cli-mirage/db-collection' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _DbCollection } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/db.js b/addon/db.js
deleted file mode 100644
index 799904125..000000000
--- a/addon/db.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _Db } from 'miragejs';
-import { deprecateNestedImport } from './deprecate-imports';
-
-/**
- @class DeprecatedDB
- @hide
- */
-export default class DeprecatedDB extends _Db {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'Db' from 'ember-cli-mirage/db' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _Db } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/deprecate-imports.js b/addon/deprecate-imports.js
deleted file mode 100644
index 3a3cbdf52..000000000
--- a/addon/deprecate-imports.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { deprecate } from '@ember/debug';
-
-/**
- @function getMessage
- @hide
- */
-export function getMessage(importName) {
-  return (
-    `Importing '${importName}' from 'ember-cli-mirage' is deprecated. ` +
-    `Install the \`miragejs\` package and use ` +
-    `\`import { ${importName} } from 'miragejs';\` instead.`
-  );
-}
-
-/**
- @function deprecateImport
- @hide
- */
-export function deprecateImport(importName) {
-  deprecate(getMessage(importName), false, {
-    id: 'ember-cli-mirage.miragejs.import',
-    until: '3.0.0',
-    for: 'ember-cli-mirage',
-    since: {
-      enabled: '2.3.0',
-    },
-  });
-}
-
-/**
- @function deprecateNestedImport
- @hide
- */
-export function deprecateNestedImport(message) {
-  deprecate(message, false, {
-    id: 'ember-cli-mirage.miragejs.import',
-    until: '3.0.0',
-    for: 'ember-cli-mirage',
-    since: {
-      enabled: '2.3.0',
-    },
-  });
-}
diff --git a/addon/deprecate-reexports.js b/addon/deprecate-reexports.js
deleted file mode 100644
index cba594200..000000000
--- a/addon/deprecate-reexports.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { deprecate } from '@ember/debug';
-import { importSync, isTesting, dependencySatisfies } from '@embroider/macros';
-import * as mirage from 'miragejs';
-import * as ecMirageExports from './index';
-
-const nonDeprecatedImports = ['default'];
-
-/**
- @function initDeprecatedReExports
- @hide
- */
-export function initDeprecatedReExports() {
-  Object.entries(mirage).forEach(([name, value]) => {
-    if (!nonDeprecatedImports.includes(name)) {
-      // eslint-disable-next-line no-import-assign
-      Object.defineProperty(ecMirageExports, name, {
-        get() {
-          if (isTesting() && dependencySatisfies('ember-qunit', '*')) {
-            const { waitUntil, getContext } = importSync('@ember/test-helpers');
-
-            window.QUnit.begin(function () {
-              // Make sure deprecation message does not get "swallowed"
-              // when tests run due to
-              // https://github.com/emberjs/ember-test-helpers/blob/master/addon-test-support/%40ember/test-helpers/setup-context.ts#L41
-              waitUntil(() => getContext() !== undefined).then(() =>
-                _deprecate(name)
-              );
-            });
-          } else {
-            _deprecate(name);
-          }
-
-          return value;
-        },
-
-        enumerable: true,
-      });
-    }
-  });
-}
-
-function _deprecate(name) {
-  const message =
-    `Importing '${name}' from 'ember-cli-mirage' is deprecated.` +
-    ` Install the \`miragejs\` package and use ` +
-    `\`import { ${name} } from 'miragejs';\` instead.`;
-
-  deprecate(message, false, {
-    id: 'ember-cli-mirage.miragejs.import',
-    until: '3.0.0',
-    for: 'ember-cli-mirage',
-    since: {
-      enabled: '2.3.0',
-    },
-  });
-}
diff --git a/addon/factory.js b/addon/factory.js
deleted file mode 100644
index 6b9204154..000000000
--- a/addon/factory.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Factory } from 'miragejs';
-import { deprecateNestedImport } from './deprecate-imports';
-
-/**
- @class DeprecatedFactory
- @hide
- */
-export default class DeprecatedFactory extends Factory {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'Factory' from 'ember-cli-mirage/factory' is deprecated. ` +
-        `Install the \`miragejs\` package and use \`import { Factory } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/identity-manager.js b/addon/identity-manager.js
deleted file mode 100644
index fab723234..000000000
--- a/addon/identity-manager.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { IdentityManager } from 'miragejs';
-import { deprecateNestedImport } from './deprecate-imports';
-
-/**
- @class DeprecatedIdentityManager
- @hide
- */
-export default class DeprecatedIdentityManager extends IdentityManager {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'IdentityManager' from 'ember-cli-mirage/identity-manager' is deprecated. ` +
-        `Install the \`miragejs\` package and use \`import { IdentityManager } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/index.js b/addon/index.js
index 3363f9400..f34c2d323 100644
--- a/addon/index.js
+++ b/addon/index.js
@@ -3,52 +3,3 @@ export {
   applyEmberDataSerializers,
 } from './ember-data';
 export { default as EmberDataSerializer } from 'ember-cli-mirage/serializers/ember-data-serializer';
-
-import { deprecateImport } from './deprecate-imports';
-
-import { initDeprecatedReExports } from './deprecate-reexports';
-initDeprecatedReExports();
-
-import { Factory, Response, HasMany, BelongsTo } from 'miragejs';
-
-const DeprecatedFactory = function (...args) {
-  deprecateImport('Factory');
-
-  return Factory.call(this, ...args);
-};
-
-// Copy extend
-DeprecatedFactory.extend = Factory.extend;
-DeprecatedFactory.extractAfterCreateCallbacks =
-  Factory.extractAfterCreateCallbacks;
-DeprecatedFactory.isTrait = Factory.isTrait;
-
-// // Store a reference on the class for future subclasses
-// DeprecatedFactory.attrs = newAttrs;
-
-class DeprecatedResponse extends Response {
-  constructor(...args) {
-    deprecateImport('Response');
-
-    super(...args);
-  }
-}
-
-function hasMany(...args) {
-  deprecateImport('hasMany');
-
-  return new HasMany(...args);
-}
-
-function belongsTo(...args) {
-  deprecateImport('belongsTo');
-
-  return new BelongsTo(...args);
-}
-
-export default {
-  Factory: DeprecatedFactory,
-  Response: DeprecatedResponse,
-  hasMany,
-  belongsTo,
-};
diff --git a/addon/orm/associations/association.js b/addon/orm/associations/association.js
deleted file mode 100644
index 8176a753c..000000000
--- a/addon/orm/associations/association.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _ormAssociationsAssociation } from 'miragejs';
-import { deprecateNestedImport } from '../../deprecate-imports';
-
-/**
- @class DeprecatedAssociation
- @hide
- */
-export default class DeprecatedAssociation extends _ormAssociationsAssociation {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'Association' from 'ember-cli-mirage/orm/associations/association' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _ormAssociationsAssociation } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/orm/associations/belongs-to.js b/addon/orm/associations/belongs-to.js
deleted file mode 100644
index c4c1cbc7b..000000000
--- a/addon/orm/associations/belongs-to.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _ormAssociationsBelongsTo } from 'miragejs';
-import { deprecateNestedImport } from '../../deprecate-imports';
-
-/**
- @class DeprecatedBelongsTo
- @hide
- */
-export default class DeprecatedBelongsTo extends _ormAssociationsBelongsTo {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'BelongsTo' from 'ember-cli-mirage/orm/associations/belongs-to' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _ormAssociationsBelongsTo } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/orm/associations/has-many.js b/addon/orm/associations/has-many.js
deleted file mode 100644
index 96766fcc7..000000000
--- a/addon/orm/associations/has-many.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _ormAssociationsHasMany } from 'miragejs';
-import { deprecateNestedImport } from '../../deprecate-imports';
-
-/**
- @class DeprecatedHasMany
- @hide
- */
-export default class DeprecatedHasMany extends _ormAssociationsHasMany {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'HasMany' from 'ember-cli-mirage/orm/associations/has-many' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _ormAssociationsHasMany } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/orm/collection.js b/addon/orm/collection.js
deleted file mode 100644
index f45096140..000000000
--- a/addon/orm/collection.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Collection } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @class DeprecatedCollection
- @hide
- */
-export default class DeprecatedCollection extends Collection {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'Collection' from 'ember-cli-mirage/orm/collection' is deprecated. ` +
-        `Install the \`miragejs\` package and use \`import { Collection } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/orm/model.js b/addon/orm/model.js
deleted file mode 100644
index 135fb7b73..000000000
--- a/addon/orm/model.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Model } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @class DeprecatedModel
- @hide
- */
-export default class DeprecatedModel extends Model {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'Model' from 'ember-cli-mirage/orm/model' is deprecated. ` +
-        `Install the \`miragejs\` package and use \`import { Model } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/orm/polymorphic-collection.js b/addon/orm/polymorphic-collection.js
deleted file mode 100644
index ad3f2fc1c..000000000
--- a/addon/orm/polymorphic-collection.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _ormPolymorphicCollection } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @class DeprecatedPolymorphicCollection
- @hide
- */
-export default class DeprecatedPolymorphicCollection extends _ormPolymorphicCollection {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'PolymorphicCollection' from 'ember-cli-mirage/orm/polymorphic-collection' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _ormPolymorphicCollection } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/orm/schema.js b/addon/orm/schema.js
deleted file mode 100644
index 39a55ed36..000000000
--- a/addon/orm/schema.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _ormSchema } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @class DeprecatedSchema
- @hide
- */
-export default class DeprecatedSchema extends _ormSchema {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'Schema' from 'ember-cli-mirage/orm/schema' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _ormSchema } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/response.js b/addon/response.js
deleted file mode 100644
index 6b99b08b0..000000000
--- a/addon/response.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Response } from 'miragejs';
-import { deprecateNestedImport } from './deprecate-imports';
-
-/**
- @class DeprecatedResponse
- @hide
- */
-export default class DeprecatedResponse extends Response {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'Response' from 'ember-cli-mirage/response' is deprecated. ` +
-        `Install the \`miragejs\` package and use \`import { Response } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/route-handler.js b/addon/route-handler.js
deleted file mode 100644
index 3ec95aa35..000000000
--- a/addon/route-handler.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _RouteHandler } from 'miragejs';
-import { deprecateNestedImport } from './deprecate-imports';
-
-/**
- @class DeprecatedRouteHandler
- @hide
- */
-export default class DeprecatedRouteHandler extends _RouteHandler {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'RouteHandler' from 'ember-cli-mirage/route-handler' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _RouteHandler } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/route-handlers/base.js b/addon/route-handlers/base.js
deleted file mode 100644
index 8e1e4687c..000000000
--- a/addon/route-handlers/base.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _routeHandlersBase } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @class DeprecatedBaseRouteHandler
- @hide
- */
-export default class DeprecatedBaseRouteHandler extends _routeHandlersBase {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'BaseRouteHandler' from 'ember-cli-mirage/route-handlers/base' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _routeHandlersBase } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/route-handlers/function.js b/addon/route-handlers/function.js
deleted file mode 100644
index d3d1fd3ec..000000000
--- a/addon/route-handlers/function.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _routeHandlersFunction } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @class DeprecatedFunctionRouteHandler
- @hide
- */
-export default class DeprecatedFunctionRouteHandler extends _routeHandlersFunction {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'FunctionRouteHandler' from 'ember-cli-mirage/route-handlers/function' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _routeHandlersFunction } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/route-handlers/object.js b/addon/route-handlers/object.js
deleted file mode 100644
index 747b6abdd..000000000
--- a/addon/route-handlers/object.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _routeHandlersObject } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @class DeprecatedObjectRouteHandler
- @hide
- */
-export default class DeprecatedObjectRouteHandler extends _routeHandlersObject {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'ObjectRouteHandler' from 'ember-cli-mirage/route-handlers/object' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _routeHandlersObject } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/route-handlers/shorthands/base.js b/addon/route-handlers/shorthands/base.js
deleted file mode 100644
index 0bbcc1af8..000000000
--- a/addon/route-handlers/shorthands/base.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _routeHandlersShorthandsBase } from 'miragejs';
-import { deprecateNestedImport } from '../../deprecate-imports';
-
-/**
- @class DeprecatedBaseShorthandRouteHandler
- @hide
- */
-export default class DeprecatedBaseShorthandRouteHandler extends _routeHandlersShorthandsBase {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'BaseShorthandRouteHandler' from 'ember-cli-mirage/route-handlers/shorthands/base' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _routeHandlersShorthandsBase } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/route-handlers/shorthands/delete.js b/addon/route-handlers/shorthands/delete.js
deleted file mode 100644
index c4cfe804b..000000000
--- a/addon/route-handlers/shorthands/delete.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _routeHandlersShorthandsDelete } from 'miragejs';
-import { deprecateNestedImport } from '../../deprecate-imports';
-
-/**
- @class DeprecatedDeleteShorthandRouteHandler
- @hide
- */
-export default class DeprecatedDeleteShorthandRouteHandler extends _routeHandlersShorthandsDelete {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'DeleteShorthandRouteHandler' from 'ember-cli-mirage/route-handlers/shorthands/delete' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _routeHandlersShorthandsDelete } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/route-handlers/shorthands/get.js b/addon/route-handlers/shorthands/get.js
deleted file mode 100644
index 4cac4dbed..000000000
--- a/addon/route-handlers/shorthands/get.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _routeHandlersShorthandsGet } from 'miragejs';
-import { deprecateNestedImport } from '../../deprecate-imports';
-
-/**
- @class DeprecatedGetShorthandRouteHandler
- @hide
- */
-export default class DeprecatedGetShorthandRouteHandler extends _routeHandlersShorthandsGet {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'GetShorthandRouteHandler' from 'ember-cli-mirage/route-handlers/shorthands/get' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _routeHandlersShorthandsGet } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/route-handlers/shorthands/head.js b/addon/route-handlers/shorthands/head.js
deleted file mode 100644
index 98f5bd146..000000000
--- a/addon/route-handlers/shorthands/head.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _routeHandlersShorthandsHead } from 'miragejs';
-import { deprecateNestedImport } from '../../deprecate-imports';
-
-/**
- @class DeprecatedHeadShorthandRouteHandler
- @hide
- */
-export default class DeprecatedHeadShorthandRouteHandler extends _routeHandlersShorthandsHead {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'HeadShorthandRouteHandler' from 'ember-cli-mirage/route-handlers/shorthands/head' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _routeHandlersShorthandsHead } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/route-handlers/shorthands/post.js b/addon/route-handlers/shorthands/post.js
deleted file mode 100644
index ccaf1b49a..000000000
--- a/addon/route-handlers/shorthands/post.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _routeHandlersShorthandsPost } from 'miragejs';
-import { deprecateNestedImport } from '../../deprecate-imports';
-
-/**
- @class DeprecatedPostShorthandRouteHandler
- @hide
- */
-export default class DeprecatedPostShorthandRouteHandler extends _routeHandlersShorthandsPost {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'PostShorthandRouteHandler' from 'ember-cli-mirage/route-handlers/shorthands/post' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _routeHandlersShorthandsPost } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/route-handlers/shorthands/put.js b/addon/route-handlers/shorthands/put.js
deleted file mode 100644
index d0e1399d5..000000000
--- a/addon/route-handlers/shorthands/put.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _routeHandlersShorthandsPut } from 'miragejs';
-import { deprecateNestedImport } from '../../deprecate-imports';
-
-/**
- @class DeprecatedPutShorthandRouteHandler
- @hide
- */
-export default class DeprecatedPutShorthandRouteHandler extends _routeHandlersShorthandsPut {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'PutShorthandRouteHandler' from 'ember-cli-mirage/route-handlers/shorthands/put' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _routeHandlersShorthandsPut } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/serializer-registry.js b/addon/serializer-registry.js
deleted file mode 100644
index 4d534f342..000000000
--- a/addon/serializer-registry.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _SerializerRegistry } from 'miragejs';
-import { deprecateNestedImport } from './deprecate-imports';
-
-/**
- @class DeprecatedSerializerRegistry
- @hide
- */
-export default class DeprecatedSerializerRegistry extends _SerializerRegistry {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'SerializerRegistry' from 'ember-cli-mirage/serializer-registry' is deprecated. ` +
-        `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-        `install the \`miragejs\` package and use \`import { _SerializerRegistry } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/serializer.js b/addon/serializer.js
deleted file mode 100644
index 937b58c2e..000000000
--- a/addon/serializer.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Serializer } from 'miragejs';
-import { deprecateNestedImport } from './deprecate-imports';
-
-/**
- @class DeprecatedSerializer
- @hide
- */
-export default class DeprecatedSerializer extends Serializer {
-  constructor(...args) {
-    deprecateNestedImport(
-      `Importing 'Serializer' from 'ember-cli-mirage/serializer' is deprecated. ` +
-        `Install the \`miragejs\` package and use \`import { Serializer } from 'miragejs';\` instead.`
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/serializers/active-model-serializer.js b/addon/serializers/active-model-serializer.js
deleted file mode 100644
index 290b6ea19..000000000
--- a/addon/serializers/active-model-serializer.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ActiveModelSerializer } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @class DeprecatedActiveModelSerializer
- @hide
- */
-export default class DeprecatedActiveModelSerializer extends ActiveModelSerializer {
-  constructor(...args) {
-    deprecateNestedImport(
-      "Importing 'ActiveModelSerializer' from 'ember-cli-mirage/serializers/active-model-serializer' is deprecated. " +
-        "Add the `miragejs` package to devDependencies and use `import { ActiveModelSerializer } from 'miragejs';` instead."
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/serializers/json-api-serializer.js b/addon/serializers/json-api-serializer.js
deleted file mode 100644
index 06d6ace46..000000000
--- a/addon/serializers/json-api-serializer.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { JSONAPISerializer } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @class DeprecatedJSONAPISerializer
- @hide
- */
-export default class DeprecatedJSONAPISerializer extends JSONAPISerializer {
-  constructor(...args) {
-    deprecateNestedImport(
-      "Importing 'JSONAPISerializer' from 'ember-cli-mirage/serializers/json-api-serializer' is deprecated. " +
-        "Add the `miragejs` package to devDependencies and use `import { JSONAPISerializer } from 'miragejs';` instead."
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/serializers/rest-serializer.js b/addon/serializers/rest-serializer.js
deleted file mode 100644
index d8ed4eafd..000000000
--- a/addon/serializers/rest-serializer.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { RestSerializer } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @class DeprecatedRestSerializer
- @hide
- */
-export default class DeprecatedRestSerializer extends RestSerializer {
-  constructor(...args) {
-    deprecateNestedImport(
-      "Importing 'RestSerializer' from 'ember-cli-mirage/serializers/rest-serializer' is deprecated. " +
-        "Add the `miragejs` package to devDependencies and use `import { RestSerializer } from 'miragejs';` instead."
-    );
-
-    super(...args);
-  }
-}
diff --git a/addon/trait.js b/addon/trait.js
deleted file mode 100644
index 191a8f285..000000000
--- a/addon/trait.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { trait } from 'miragejs';
-import { deprecateNestedImport } from './deprecate-imports';
-
-/**
- @function trait
- @hide
- */
-export default function (...args) {
-  deprecateNestedImport(
-    "Importing 'trait' from 'ember-cli-mirage/trait' is deprecated. " +
-      "Add the `miragejs` package to devDependencies and use `import { trait } from 'miragejs';` instead."
-  );
-
-  return trait(...args);
-}
diff --git a/addon/utils/extend.js b/addon/utils/extend.js
deleted file mode 100644
index 1ac7f679d..000000000
--- a/addon/utils/extend.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { _utilsExtend } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @function extend
- @hide
- */
-export default function extend(...args) {
-  const message =
-    `Importing 'extend' from 'ember-cli-mirage/utils/extend' is deprecated. ` +
-    `This wasn't intended to be a public API and you should use Factory.extend, Model.extend, ` +
-    `etc. APIs described in https://miragejs.com/. If you absolute know what you are doing, ` +
-    `install the \`miragejs\` package and use \`import { _utilsExtend } from 'miragejs';\` instead.`;
-
-  deprecateNestedImport(message);
-
-  return _utilsExtend(...args);
-}
diff --git a/addon/utils/inflector.js b/addon/utils/inflector.js
deleted file mode 100644
index ae481f143..000000000
--- a/addon/utils/inflector.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import {
-  _utilsInflectorCamelize,
-  _utilsInflectorDasherize,
-  _utilsInflectorUnderscore,
-  _utilsInflectorCapitalize,
-} from 'miragejs';
-import {
-  singularize as _singularize,
-  pluralize as _pluralize,
-} from 'ember-inflector';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @function getMessage
- @hide
- */
-function getMessage(importName) {
-  return (
-    `Importing '${importName}' from 'ember-cli-mirage/utils/inflector' is deprecated. ` +
-    `Install the \`@ember/string\` package and use ` +
-    `\`import { ${importName} } from '@ember/string';\` instead.`
-  );
-}
-
-/**
- @function camelize
- @hide
- */
-export function camelize(...args) {
-  deprecateNestedImport(getMessage('camelize'));
-
-  return _utilsInflectorCamelize(...args);
-}
-
-/**
- @function dasherize
- @hide
- */
-export function dasherize(...args) {
-  deprecateNestedImport(getMessage('dasherize'));
-
-  return _utilsInflectorDasherize(...args);
-}
-
-/**
- @function underscore
- @hide
- */
-export function underscore(...args) {
-  deprecateNestedImport(getMessage('underscore'));
-
-  return _utilsInflectorUnderscore(...args);
-}
-
-/**
- @function capitalize
- @hide
- */
-export function capitalize(...args) {
-  deprecateNestedImport(getMessage('capitalize'));
-
-  return _utilsInflectorCapitalize(...args);
-}
-
-/**
- @function singularize
- @hide
- */
-export function singularize(...args) {
-  deprecateNestedImport(getMessage('singularize'));
-
-  return _singularize(...args);
-}
-
-/**
- @function pluralize
- @hide
- */
-export function pluralize(...args) {
-  deprecateNestedImport(getMessage('pluralize'));
-
-  return _pluralize(...args);
-}
diff --git a/addon/utils/is-association.js b/addon/utils/is-association.js
deleted file mode 100644
index ff5c80f32..000000000
--- a/addon/utils/is-association.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { _utilsIsAssociation } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @function isAssociation
- @hide
- */
-export default function isAssociation(...args) {
-  const message =
-    `Importing 'isAssociation' from 'ember-cli-mirage/utils/is-association' is deprecated. ` +
-    `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-    `install the \`miragejs\` package and use \`import { _utilsIsAssociation } from 'miragejs';\` instead.`;
-
-  deprecateNestedImport(message);
-
-  return _utilsIsAssociation(...args);
-}
diff --git a/addon/utils/reference-sort.js b/addon/utils/reference-sort.js
deleted file mode 100644
index a5b269709..000000000
--- a/addon/utils/reference-sort.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { _utilsReferenceSort } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @function referenceSort
- @hide
- */
-export default function referenceSort(...args) {
-  const message =
-    `Importing 'referenceSort' from 'ember-cli-mirage/utils/reference-sort' is deprecated. ` +
-    `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-    `install the \`miragejs\` package and use \`import { _utilsReferenceSort } from 'miragejs';\` instead.`;
-
-  deprecateNestedImport(message);
-
-  return _utilsReferenceSort(...args);
-}
diff --git a/addon/utils/uuid.js b/addon/utils/uuid.js
deleted file mode 100644
index 7b62bb237..000000000
--- a/addon/utils/uuid.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { _utilsUuid } from 'miragejs';
-import { deprecateNestedImport } from '../deprecate-imports';
-
-/**
- @function uuid
- @hide
- */
-export default function uuid(...args) {
-  const message =
-    `Importing 'uuid' from 'ember-cli-mirage/utils/reference-sort' is deprecated. ` +
-    `This wasn't intended to be a public API. If you absolute know what you are doing, ` +
-    `install the \`miragejs\` package and use \`import { _utilsUuid } from 'miragejs';\` instead.`;
-
-  deprecateNestedImport(message);
-
-  return _utilsUuid(...args);
-}