diff --git a/Gruntfile.js b/Gruntfile.js
index 6861ceba4a..fb7753170f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -58,17 +58,6 @@ module.exports = function (grunt) {
     },
 
     // JS build configuration
-    lineremover: {
-      es6Import: {
-        files: {
-          '<%= concat.bootstrap.dest %>': '<%= concat.bootstrap.dest %>'
-        },
-        options: {
-          exclusionPattern: /^(import|export)/g
-        }
-      }
-    },
-
     babel: {
       dev: {
         options: {
@@ -159,6 +148,10 @@ module.exports = function (grunt) {
 
     concat: {
       options: {
+        // Custom function to remove all export and import statements
+        process: function (src) {
+          return src.replace(/^(export|import).*/gm, '');
+        },
         stripBanners: false
       },
       bootstrap: {
@@ -447,7 +440,7 @@ module.exports = function (grunt) {
   grunt.registerTask('test-js', ['eslint', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']);
 
   // JS distribution task.
-  grunt.registerTask('dist-js', ['babel:dev', 'concat', 'lineremover', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']);
+  grunt.registerTask('dist-js', ['babel:dev', 'concat', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']);
 
   grunt.registerTask('test-scss', ['scsslint:core']);
 
diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index 28de60c145..7763c777ef 100644
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -53,9 +53,9 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
     },
     "ansi-styles": {
-      "version": "2.2.0",
-      "from": "ansi-styles@>=2.1.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.0.tgz"
+      "version": "2.2.1",
+      "from": "ansi-styles@>=2.2.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
     },
     "archiver": {
       "version": "0.21.0",
@@ -164,9 +164,9 @@
       "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz"
     },
     "autoprefixer": {
-      "version": "6.3.4",
+      "version": "6.3.5",
       "from": "autoprefixer@>=6.0.3 <7.0.0",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.3.4.tgz"
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.3.5.tgz"
     },
     "aws-sign": {
       "version": "0.3.0",
@@ -366,9 +366,9 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000436",
-      "from": "caniuse-db@>=1.0.30000435 <2.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000436.tgz"
+      "version": "1.0.30000444",
+      "from": "caniuse-db@>=1.0.30000436 <2.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000444.tgz"
     },
     "caseless": {
       "version": "0.11.0",
@@ -381,9 +381,9 @@
       "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"
     },
     "chalk": {
-      "version": "1.1.1",
+      "version": "1.1.3",
       "from": "chalk@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "dependencies": {
         "supports-color": {
           "version": "2.0.0",
@@ -393,9 +393,9 @@
       }
     },
     "clean-css": {
-      "version": "3.4.10",
+      "version": "3.4.11",
       "from": "clean-css@>=3.4.2 <3.5.0",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.10.tgz",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.11.tgz",
       "dependencies": {
         "commander": {
           "version": "2.8.1",
@@ -446,11 +446,6 @@
       "from": "coffee-script@>=1.3.3 <1.4.0",
       "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz"
     },
-    "color-convert": {
-      "version": "1.0.0",
-      "from": "color-convert@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.0.0.tgz"
-    },
     "colors": {
       "version": "0.6.2",
       "from": "colors@>=0.6.2 <0.7.0",
@@ -1247,9 +1242,16 @@
       }
     },
     "grunt-contrib-compress": {
-      "version": "1.1.1",
+      "version": "1.2.0",
       "from": "grunt-contrib-compress@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-1.1.1.tgz"
+      "resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-1.2.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.7.0",
+          "from": "lodash@>=4.7.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.7.0.tgz"
+        }
+      }
     },
     "grunt-contrib-concat": {
       "version": "1.0.0",
@@ -1301,9 +1303,9 @@
       "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-1.0.1.tgz",
       "dependencies": {
         "lodash": {
-          "version": "4.6.1",
+          "version": "4.7.0",
           "from": "lodash@>=4.0.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz"
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.7.0.tgz"
         }
       }
     },
@@ -1338,6 +1340,16 @@
           "version": "1.5.2",
           "from": "async@1.5.2",
           "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
+        },
+        "chalk": {
+          "version": "1.1.1",
+          "from": "chalk@1.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "from": "supports-color@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
         }
       }
     },
@@ -1409,11 +1421,6 @@
       "from": "grunt-lib-phantomjs@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-1.0.1.tgz"
     },
-    "grunt-line-remover": {
-      "version": "0.0.2",
-      "from": "grunt-line-remover@0.0.2",
-      "resolved": "https://registry.npmjs.org/grunt-line-remover/-/grunt-line-remover-0.0.2.tgz"
-    },
     "grunt-postcss": {
       "version": "0.8.0",
       "from": "grunt-postcss@>=0.8.0 <0.9.0",
@@ -2221,9 +2228,9 @@
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
     },
     "nan": {
-      "version": "2.2.0",
+      "version": "2.2.1",
       "from": "nan@>=2.0.8 <3.0.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.2.0.tgz"
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.2.1.tgz"
     },
     "natural-compare": {
       "version": "1.2.2",
@@ -2544,9 +2551,9 @@
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
     },
     "phantomjs-prebuilt": {
-      "version": "2.1.6",
+      "version": "2.1.7",
       "from": "phantomjs-prebuilt@>=2.1.3 <3.0.0",
-      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.6.tgz",
+      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.7.tgz",
       "dependencies": {
         "which": {
           "version": "1.2.4",
@@ -2970,9 +2977,9 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
         },
         "lodash": {
-          "version": "4.6.1",
+          "version": "4.7.0",
           "from": "lodash@>=4.0.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz"
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.7.0.tgz"
         }
       }
     },
@@ -3427,9 +3434,9 @@
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
     },
     "tweetnacl": {
-      "version": "0.14.1",
+      "version": "0.14.3",
       "from": "tweetnacl@>=0.13.0 <1.0.0",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz"
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"
     },
     "type-check": {
       "version": "0.3.2",
diff --git a/package.json b/package.json
index 61d850a9d5..32c8238217 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,6 @@
     "grunt-html": "^7.0.0",
     "grunt-jekyll": "^0.4.2",
     "grunt-jscs": "^2.8.0",
-    "grunt-line-remover": "0.0.2",
     "grunt-postcss": "^0.8.0",
     "grunt-sass": "^1.0.0",
     "grunt-saucelabs": "^8.6.1",