diff --git a/src/js/crypto/crypto.js b/src/js/crypto/crypto.js
index b8568ac..bcc5513 100644
--- a/src/js/crypto/crypto.js
+++ b/src/js/crypto/crypto.js
@@ -13,9 +13,7 @@ var aes = require('crypto-lib').aes,
  * High level crypto api that invokes native crypto (if available) and
  * gracefully degrades to JS crypto (if unavailable)
  */
-function Crypto($q) {
-    this._q = $q;
-}
+function Crypto() {}
 
 /**
  * Encrypt plaintext using AES-GCM.
@@ -25,7 +23,7 @@ function Crypto($q) {
  * @return {String} The base64 encoded ciphertext
  */
 Crypto.prototype.encrypt = function(plaintext, key, iv) {
-    return this._q(function(resolve) {
+    return new Promise(function(resolve) {
         var ct = aes.encrypt(plaintext, key, iv);
         resolve(ct);
     });
@@ -39,7 +37,7 @@ Crypto.prototype.encrypt = function(plaintext, key, iv) {
  * @return {String} The decrypted plaintext in UTF-16
  */
 Crypto.prototype.decrypt = function(ciphertext, key, iv) {
-    return this._q(function(resolve) {
+    return new Promise(function(resolve) {
         var pt = aes.decrypt(ciphertext, key, iv);
         resolve(pt);
     });
@@ -67,7 +65,7 @@ Crypto.prototype.deriveKey = function(password, salt, keySize) {
 //
 
 Crypto.prototype.startWorker = function(options) {
-    return this._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         // check for WebWorker support
         if (window.Worker) {
             // init webworker thread
diff --git a/src/js/crypto/pgp.js b/src/js/crypto/pgp.js
index 8baa892..00f30e5 100644
--- a/src/js/crypto/pgp.js
+++ b/src/js/crypto/pgp.js
@@ -10,9 +10,7 @@ var util = openpgp.util,
 /**
  * High level crypto api that handles all calls to OpenPGP.js
  */
-function PGP($q) {
-    this._q = $q;
-
+function PGP() {
     openpgp.config.prefer_hash_algorithm = openpgp.enums.hash.sha256;
     openpgp.initWorker(config.workerPath + '/openpgp.worker.min.js');
 }
@@ -22,7 +20,7 @@ function PGP($q) {
  * @return {Promise}
  */
 PGP.prototype.generateKeys = function(options) {
-    return this._q(function(resolve) {
+    return new Promise(function(resolve) {
         var userId, passphrase;
 
         if (!util.emailRegEx.test(options.emailAddress) || !options.keySize) {
@@ -156,7 +154,7 @@ PGP.prototype.extractPublicKey = function(privateKeyArmored) {
  */
 PGP.prototype.importKeys = function(options) {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         var pubKeyId, privKeyId;
 
         // check options
@@ -202,7 +200,7 @@ PGP.prototype.importKeys = function(options) {
  */
 PGP.prototype.exportKeys = function() {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         if (!self._publicKey || !self._privateKey) {
             throw new Error('Could not export keys!');
         }
@@ -220,7 +218,7 @@ PGP.prototype.exportKeys = function() {
  * @return {Promise}
  */
 PGP.prototype.changePassphrase = function(options) {
-    return this._q(function(resolve) {
+    return new Promise(function(resolve) {
         var privKey, packets, newPassphrase, newKeyArmored;
 
         // set undefined instead of empty string as passphrase
@@ -273,7 +271,7 @@ PGP.prototype.changePassphrase = function(options) {
  */
 PGP.prototype.encrypt = function(plaintext, publicKeysArmored) {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         var publicKeys;
 
         // check keys
@@ -313,7 +311,7 @@ PGP.prototype.encrypt = function(plaintext, publicKeysArmored) {
  */
 PGP.prototype.decrypt = function(ciphertext, publicKeyArmored) {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         var publicKeys, message;
 
         // check keys
@@ -359,7 +357,7 @@ PGP.prototype.decrypt = function(ciphertext, publicKeyArmored) {
  */
 PGP.prototype.verifyClearSignedMessage = function(clearSignedText, publicKeyArmored) {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         var publicKeys, message;
 
         // check keys
@@ -401,7 +399,7 @@ PGP.prototype.verifyClearSignedMessage = function(clearSignedText, publicKeyArmo
  */
 PGP.prototype.verifySignedMessage = function(message, pgpSignature, publicKeyArmored) {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         var publicKeys, signatures;
 
         // check keys
diff --git a/test/unit/crypto/crypto-test.js b/test/unit/crypto/crypto-test.js
index 0c0fb67..82c2ead 100644
--- a/test/unit/crypto/crypto-test.js
+++ b/test/unit/crypto/crypto-test.js
@@ -13,7 +13,7 @@ describe('Crypto unit tests', function() {
         ivSize = config.symIvSize;
 
     beforeEach(function() {
-        crypto = new Crypto(qMock);
+        crypto = new Crypto();
     });
 
     afterEach(function() {});
diff --git a/test/unit/crypto/pgp-test.js b/test/unit/crypto/pgp-test.js
index 2da1840..f26c75f 100644
--- a/test/unit/crypto/pgp-test.js
+++ b/test/unit/crypto/pgp-test.js
@@ -39,7 +39,7 @@ describe('PGP Crypto Api unit tests', function() {
         '-----END PGP PRIVATE KEY BLOCK-----\r\n';
 
     beforeEach(function() {
-        pgp = new PGP(qMock);
+        pgp = new PGP();
     });
 
     afterEach(function() {});