diff --git a/ui-v2/app/components/child-selector.js b/ui-v2/app/components/child-selector.js
index bda8edf21..f915023c2 100644
--- a/ui-v2/app/components/child-selector.js
+++ b/ui-v2/app/components/child-selector.js
@@ -2,7 +2,6 @@ import Component from '@ember/component';
 import { get, set, computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
-import { Promise } from 'rsvp';
 
 import SlotsMixin from 'block-slots';
 import WithListeners from 'consul-ui/mixins/with-listeners';
diff --git a/ui-v2/app/components/feedback-dialog.js b/ui-v2/app/components/feedback-dialog.js
index bd669f5a3..22d102117 100644
--- a/ui-v2/app/components/feedback-dialog.js
+++ b/ui-v2/app/components/feedback-dialog.js
@@ -1,7 +1,6 @@
 import Component from '@ember/component';
 import { set } from '@ember/object';
 import { inject as service } from '@ember/service';
-import { Promise } from 'rsvp';
 
 import SlotsMixin from 'block-slots';
 const STATE_READY = 'ready';
diff --git a/ui-v2/app/routes/application.js b/ui-v2/app/routes/application.js
index c66cf4bf7..6637878f6 100644
--- a/ui-v2/app/routes/application.js
+++ b/ui-v2/app/routes/application.js
@@ -2,7 +2,6 @@ import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { hash } from 'rsvp';
 import { next } from '@ember/runloop';
-import { Promise } from 'rsvp';
 
 import WithBlockingActions from 'consul-ui/mixins/with-blocking-actions';
 
diff --git a/ui-v2/app/services/client/http.js b/ui-v2/app/services/client/http.js
index 57f0f5bed..93f2bb655 100644
--- a/ui-v2/app/services/client/http.js
+++ b/ui-v2/app/services/client/http.js
@@ -1,7 +1,6 @@
 /*global $*/
 import Service, { inject as service } from '@ember/service';
 import { get, set } from '@ember/object';
-import { Promise } from 'rsvp';
 
 import { env } from 'consul-ui/env';
 import getObjectPool from 'consul-ui/utils/get-object-pool';
diff --git a/ui-v2/app/services/repository/dc.js b/ui-v2/app/services/repository/dc.js
index 76d0957ab..77b7f0b00 100644
--- a/ui-v2/app/services/repository/dc.js
+++ b/ui-v2/app/services/repository/dc.js
@@ -2,7 +2,6 @@ import RepositoryService from 'consul-ui/services/repository';
 import { inject as service } from '@ember/service';
 import { get } from '@ember/object';
 import Error from '@ember/error';
-import { Promise } from 'rsvp';
 
 const modelName = 'dc';
 export default RepositoryService.extend({
diff --git a/ui-v2/app/services/repository/kv.js b/ui-v2/app/services/repository/kv.js
index 2e3664580..fccd822d1 100644
--- a/ui-v2/app/services/repository/kv.js
+++ b/ui-v2/app/services/repository/kv.js
@@ -1,5 +1,4 @@
 import RepositoryService from 'consul-ui/services/repository';
-import { Promise } from 'rsvp';
 import isFolder from 'consul-ui/utils/isFolder';
 import { get } from '@ember/object';
 import { PRIMARY_KEY } from 'consul-ui/models/kv';
diff --git a/ui-v2/app/services/repository/nspace/disabled.js b/ui-v2/app/services/repository/nspace/disabled.js
index f1233f02a..50e4af710 100644
--- a/ui-v2/app/services/repository/nspace/disabled.js
+++ b/ui-v2/app/services/repository/nspace/disabled.js
@@ -1,5 +1,4 @@
 import RepositoryService from 'consul-ui/services/repository';
-import { Promise } from 'rsvp';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/nspace';
 
 const modelName = 'nspace';
diff --git a/ui-v2/app/services/repository/policy.js b/ui-v2/app/services/repository/policy.js
index 9470c6ec0..59ed5a89a 100644
--- a/ui-v2/app/services/repository/policy.js
+++ b/ui-v2/app/services/repository/policy.js
@@ -1,6 +1,5 @@
 import RepositoryService from 'consul-ui/services/repository';
 import { get } from '@ember/object';
-import { Promise } from 'rsvp';
 import statusFactory from 'consul-ui/utils/acls-status';
 import isValidServerErrorFactory from 'consul-ui/utils/http/acl/is-valid-server-error';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/policy';
diff --git a/ui-v2/app/services/repository/role.js b/ui-v2/app/services/repository/role.js
index 265e83fb3..942b7f288 100644
--- a/ui-v2/app/services/repository/role.js
+++ b/ui-v2/app/services/repository/role.js
@@ -1,5 +1,4 @@
 import RepositoryService from 'consul-ui/services/repository';
-import { Promise } from 'rsvp';
 import statusFactory from 'consul-ui/utils/acls-status';
 import isValidServerErrorFactory from 'consul-ui/utils/http/acl/is-valid-server-error';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/role';
diff --git a/ui-v2/app/services/repository/token.js b/ui-v2/app/services/repository/token.js
index 6ec3b6803..15a59b925 100644
--- a/ui-v2/app/services/repository/token.js
+++ b/ui-v2/app/services/repository/token.js
@@ -1,6 +1,5 @@
 import RepositoryService from 'consul-ui/services/repository';
 import { get } from '@ember/object';
-import { Promise } from 'rsvp';
 import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/token';
 import statusFactory from 'consul-ui/utils/acls-status';
 import isValidServerErrorFactory from 'consul-ui/utils/http/acl/is-valid-server-error';
diff --git a/ui-v2/app/services/settings.js b/ui-v2/app/services/settings.js
index bb7eaccf6..a5b9c0332 100644
--- a/ui-v2/app/services/settings.js
+++ b/ui-v2/app/services/settings.js
@@ -1,5 +1,4 @@
 import Service from '@ember/service';
-import { Promise } from 'rsvp';
 import getStorage from 'consul-ui/utils/storage/local-storage';
 const SCHEME = 'consul';
 const storage = getStorage(SCHEME);
diff --git a/ui-v2/app/services/timeout.js b/ui-v2/app/services/timeout.js
index bb15f85f3..2cda8f7c4 100644
--- a/ui-v2/app/services/timeout.js
+++ b/ui-v2/app/services/timeout.js
@@ -1,6 +1,5 @@
 import Service from '@ember/service';
 import promisedTimeoutFactory from 'consul-ui/utils/promisedTimeout';
-import { Promise } from 'rsvp';
 import { next } from '@ember/runloop';
 
 const promisedTimeout = promisedTimeoutFactory(Promise);
diff --git a/ui-v2/app/utils/dom/event-source/blocking.js b/ui-v2/app/utils/dom/event-source/blocking.js
index 82e828803..3fff08ad9 100644
--- a/ui-v2/app/utils/dom/event-source/blocking.js
+++ b/ui-v2/app/utils/dom/event-source/blocking.js
@@ -1,5 +1,4 @@
 import { get } from '@ember/object';
-import { Promise } from 'rsvp';
 
 const pause = 2000;
 // native EventSource retry is ~3s wait
diff --git a/ui-v2/app/utils/dom/event-source/index.js b/ui-v2/app/utils/dom/event-source/index.js
index f59556d6e..f29854a56 100644
--- a/ui-v2/app/utils/dom/event-source/index.js
+++ b/ui-v2/app/utils/dom/event-source/index.js
@@ -1,6 +1,5 @@
 import ObjectProxy from '@ember/object/proxy';
 import ArrayProxy from '@ember/array/proxy';
-import { Promise } from 'rsvp';
 
 import createListeners from 'consul-ui/utils/dom/create-listeners';
 
diff --git a/ui-v2/app/utils/search/filterable.js b/ui-v2/app/utils/search/filterable.js
index a0bec4a99..01ca1d74d 100644
--- a/ui-v2/app/utils/search/filterable.js
+++ b/ui-v2/app/utils/search/filterable.js
@@ -1,4 +1,4 @@
-import RSVP, { Promise } from 'rsvp';
+import RSVP from 'rsvp';
 export default function(EventTarget = RSVP.EventTarget, P = Promise) {
   // TODO: Class-ify
   return function(filter) {
diff --git a/ui-v2/tests/helpers/yadda-annotations.js b/ui-v2/tests/helpers/yadda-annotations.js
index b981db868..9f6135561 100644
--- a/ui-v2/tests/helpers/yadda-annotations.js
+++ b/ui-v2/tests/helpers/yadda-annotations.js
@@ -1,6 +1,5 @@
 import { skip, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import { Promise } from 'rsvp';
 import Yadda from 'yadda';
 
 import { env } from '../../env';
diff --git a/ui-v2/tests/integration/utils/dom/event-source/callable-test.js b/ui-v2/tests/integration/utils/dom/event-source/callable-test.js
index 562e32e3b..71d322388 100644
--- a/ui-v2/tests/integration/utils/dom/event-source/callable-test.js
+++ b/ui-v2/tests/integration/utils/dom/event-source/callable-test.js
@@ -1,6 +1,5 @@
 import domEventSourceCallable from 'consul-ui/utils/dom/event-source/callable';
 import EventTarget from 'consul-ui/utils/dom/event-target/rsvp';
-import { Promise } from 'rsvp';
 
 import { module, skip } from 'qunit';
 import { setupTest } from 'ember-qunit';