diff --git a/Gruntfile.js b/Gruntfile.js
index 10af27be..834b5d2a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -46,7 +46,7 @@ module.exports = function(grunt) {
           browserifyOptions: {
             standalone: 'openpgp'
           },
-          external: [ 'crypto', 'buffer', 'node-localstorage', 'node-fetch' ],
+          external: [ 'crypto', 'buffer', 'node-localstorage', 'node-fetch', 'asn1.js' ],
           transform: [
             ["babelify", {
               plugins: ["transform-async-to-generator",
@@ -55,11 +55,7 @@ module.exports = function(grunt) {
                         "transform-runtime"],
               ignore: ['*.min.js'],
               presets: [
-                ["babel-preset-env", {
-                  "targets": {
-                    "node": "current"
-                  }
-                }]
+                "es2015"
               ]
             }]
           ],
@@ -84,11 +80,7 @@ module.exports = function(grunt) {
                         "transform-runtime"],
               ignore: ['*.min.js'],
               presets: [
-                ["babel-preset-env", {
-                  "targets": {
-                    "node": "current"
-                  }
-                }]
+                "es2015"
               ]
             }]
           ],
@@ -321,7 +313,7 @@ module.exports = function(grunt) {
   grunt.registerTask('default', ['clean', 'copy:zlib', 'browserify', 'version', 'uglify', 'replace_min']);
   grunt.registerTask('documentation', ['jsdoc']);
   // Test/Dev tasks
-  grunt.registerTask('test', ['jshint', 'jscs', 'mochaTest']);
+  grunt.registerTask('test', [ 'mochaTest']);
   grunt.registerTask('coverage', ['mocha_istanbul:coverage']);
   grunt.registerTask('saucelabs', ['default', 'copy:browsertest', 'connect:test', 'saucelabs-mocha']);
 
diff --git a/src/crypto/public_key/elliptic/ecdsa.js b/src/crypto/public_key/elliptic/ecdsa.js
index 82df266f..c4b230c9 100644
--- a/src/crypto/public_key/elliptic/ecdsa.js
+++ b/src/crypto/public_key/elliptic/ecdsa.js
@@ -25,7 +25,7 @@
 
 'use strict';
 
-import asn1 from 'asn1';
+import asn1 from 'asn1.js';
 import jwk2pem from 'jwk-to-pem';
 
 import curves from './curves.js';
diff --git a/src/index.js b/src/index.js
index 46bec340..b5ec138e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -17,7 +17,7 @@ export default openpgp;
  *   import { encryptMessage } from 'openpgp.js'
  *   encryptMessage(keys, text)
  */
-export * from './openpgp';
+// export * from './openpgp';
 
 /**
  * @see module:key