diff --git a/spec/TestClient.js b/spec/TestClient.js
index 8aeb3c291..805e051d6 100644
--- a/spec/TestClient.js
+++ b/spec/TestClient.js
@@ -24,7 +24,6 @@ import './olm-loader';
 import sdk from '..';
 import testUtils from './test-utils';
 import MockHttpBackend from 'matrix-mock-request';
-import Promise from 'bluebird';
 import LocalStorageCryptoStore from '../lib/crypto/store/localStorage-crypto-store';
 import logger from '../src/logger';
 
diff --git a/spec/integ/matrix-client-methods.spec.js b/spec/integ/matrix-client-methods.spec.js
index d8d12e7e3..11d228ae5 100644
--- a/spec/integ/matrix-client-methods.spec.js
+++ b/spec/integ/matrix-client-methods.spec.js
@@ -181,7 +181,7 @@ describe("MatrixClient", function() {
                 event_format: "client",
             });
             store.storeFilter(filter);
-            client.getFilter(userId, filterId, true).done(function(gotFilter) {
+            client.getFilter(userId, filterId, true).then(function(gotFilter) {
                 expect(gotFilter).toEqual(filter);
                 done();
             });
diff --git a/src/autodiscovery.js b/src/autodiscovery.js
index c8dc8c661..2258eabf4 100644
--- a/src/autodiscovery.js
+++ b/src/autodiscovery.js
@@ -17,7 +17,6 @@ limitations under the License.
 
 /** @module auto-discovery */
 
-import Promise from 'bluebird';
 import logger from './logger';
 import { URL as NodeURL } from "url";
 
diff --git a/src/indexeddb-helpers.js b/src/indexeddb-helpers.js
index 68e36d9f4..01123338d 100644
--- a/src/indexeddb-helpers.js
+++ b/src/indexeddb-helpers.js
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
-
 /**
  * Check if an IndexedDB database exists. The only way to do so is to try opening it, so
  * we do that and then delete it did not exist before.
diff --git a/src/interactive-auth.js b/src/interactive-auth.js
index 756756a2e..eb9d9dbaa 100644
--- a/src/interactive-auth.js
+++ b/src/interactive-auth.js
@@ -18,7 +18,6 @@ limitations under the License.
 "use strict";
 
 /** @module interactive-auth */
-import Promise from 'bluebird';
 const url = require("url");
 
 const utils = require("./utils");
diff --git a/src/store/indexeddb-remote-backend.js b/src/store/indexeddb-remote-backend.js
index 270bef961..e17014fb2 100644
--- a/src/store/indexeddb-remote-backend.js
+++ b/src/store/indexeddb-remote-backend.js
@@ -15,7 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
 import logger from '../logger';
 import {defer} from '../utils';
 
diff --git a/src/store/indexeddb-store-worker.js b/src/store/indexeddb-store-worker.js
index c47fcc176..5896cead0 100644
--- a/src/store/indexeddb-store-worker.js
+++ b/src/store/indexeddb-store-worker.js
@@ -15,7 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Promise from 'bluebird';
 import LocalIndexedDBStoreBackend from "./indexeddb-local-backend.js";
 import logger from '../logger';
 
diff --git a/src/store/memory.js b/src/store/memory.js
index 7a666d071..feeb56501 100644
--- a/src/store/memory.js
+++ b/src/store/memory.js
@@ -22,7 +22,6 @@ limitations under the License.
  */
 const utils = require("../utils");
 const User = require("../models/user");
-import Promise from 'bluebird';
 
 /**
  * Construct a new in-memory data store for the Matrix Client.
diff --git a/src/store/stub.js b/src/store/stub.js
index f09dad6d7..2ab2256cd 100644
--- a/src/store/stub.js
+++ b/src/store/stub.js
@@ -16,7 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 "use strict";
-import Promise from 'bluebird';
 /**
  * This is an internal module.
  * @module store/stub
diff --git a/src/timeline-window.js b/src/timeline-window.js
index 9d845dd61..03e515c62 100644
--- a/src/timeline-window.js
+++ b/src/timeline-window.js
@@ -17,7 +17,6 @@ limitations under the License.
 
 /** @module timeline-window */
 
-import Promise from 'bluebird';
 const EventTimeline = require("./models/event-timeline");
 import logger from './logger';