diff --git a/addon/-private/system/container-proxy.js b/addon/-private/system/container-proxy.js
deleted file mode 100644
index eb2b1dc2c5f..00000000000
--- a/addon/-private/system/container-proxy.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { deprecate } from "ember-data/-private/debug";
-
-/*
-  This is used internally to enable deprecation of container paths and provide
-  a decent message to the user indicating how to fix the issue.
-
-  @class ContainerProxy
-  @namespace DS
-  @private
-*/
-export default function ContainerProxy(container) {
-  this.container = container;
-}
-
-ContainerProxy.prototype.aliasedFactory = function(path, preLookup) {
-  return {
-    create: () => {
-      if (preLookup) { preLookup(); }
-
-      return this.container.lookup(path);
-    }
-  };
-};
-
-ContainerProxy.prototype.registerAlias = function(source, dest, preLookup) {
-  var factory = this.aliasedFactory(dest, preLookup);
-
-  return this.container.register(source, factory);
-};
-
-ContainerProxy.prototype.registerDeprecation = function(deprecated, valid) {
-  var preLookupCallback = function() {
-    deprecate(`You tried to look up '${deprecated}', but this has been deprecated in favor of '${valid}'.`, false, {
-      id: 'ds.store.deprecated-lookup',
-      until: '2.0.0'
-    });
-  };
-
-  return this.registerAlias(deprecated, valid, preLookupCallback);
-};
-
-ContainerProxy.prototype.registerDeprecations = function(proxyPairs) {
-  var i, proxyPair, deprecated, valid;
-
-  for (i = proxyPairs.length; i > 0; i--) {
-    proxyPair = proxyPairs[i - 1];
-    deprecated = proxyPair['deprecated'];
-    valid = proxyPair['valid'];
-
-    this.registerDeprecation(deprecated, valid);
-  }
-};
diff --git a/addon/index.js b/addon/index.js
index 58aaa3449aa..a07ed371bee 100644
--- a/addon/index.js
+++ b/addon/index.js
@@ -86,7 +86,6 @@ import {hasMany, belongsTo} from "ember-data/relationships";
 import setupContainer from "ember-data/setup-container";
 import initializeStoreService from 'ember-data/-private/instance-initializers/initialize-store-service';
 
-import ContainerProxy from "ember-data/-private/system/container-proxy";
 import Relationship from "ember-data/-private/system/relationships/state/relationship";
 
 DS.Store         = Store;
@@ -154,8 +153,6 @@ DS.hasMany   = hasMany;
 
 DS.Relationship  = Relationship;
 
-DS.ContainerProxy = ContainerProxy;
-
 DS._setupContainer = setupContainer;
 DS._initializeStoreService = initializeStoreService;