diff --git a/client/cloudcmd.js b/client/cloudcmd.js
index 930f6f1a..b48f76c2 100644
--- a/client/cloudcmd.js
+++ b/client/cloudcmd.js
@@ -7,7 +7,7 @@ window.exec = require('execon');
 window.Emitify = require('emitify');
 
 window.CloudCmd = (config) => {
-    window.Promise = window.Promise || require('promise-polyfill');
+    window.Promise = window.Promise || require('es6-promise');
     Object.assign = Object.assign || require('object.assign');
 
     window.Util = require('../common/util');
diff --git a/package.json b/package.json
index fa68aeef..14b35199 100644
--- a/package.json
+++ b/package.json
@@ -156,6 +156,7 @@
     "babel-preset-es2015": "^6.18.0",
     "coveralls": "^2.11.6",
     "emitify": "^2.1.1",
+    "es6-promise": "^4.0.5",
     "es6-promisify": "^5.0.0",
     "eslint": "^3.1.1",
     "gunzip-maybe": "^1.3.1",
@@ -169,7 +170,6 @@
     "nyc": "^10.1.2",
     "object.assign": "^4.0.4",
     "place": "^1.1.4",
-    "promise-polyfill": "^6.0.2",
     "readjson": "^1.1.3",
     "recess": "^1.1.9",
     "redrun": "^5.0.0",
diff --git a/webpack.config.js b/webpack.config.js
index 1149d2ae..e641f2c9 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -17,7 +17,8 @@ const clean = (array) => array.filter(notEmpty);
 
 const plugins = clean([
     !isDev && new UglifyJsPlugin({
-        sourceMap: true
+        sourceMap: true,
+        comments: false,
     }),
     new webpack.optimize.CommonsChunkPlugin({
         name: 'cloudcmd',