diff --git a/js/embark.js b/js/embark.js
index 3b48e978..70aace07 100644
--- a/js/embark.js
+++ b/js/embark.js
@@ -1,3 +1,5 @@
+/*jshint esversion: 6 */
+
 var EmbarkJS = {};
 
 EmbarkJS.isNewWeb3 = function() {
diff --git a/lib/contracts/code_templates/web3-connector.js.ejs b/lib/contracts/code_templates/web3-connector.js.ejs
index a8e2927d..bcbf4fe1 100644
--- a/lib/contracts/code_templates/web3-connector.js.ejs
+++ b/lib/contracts/code_templates/web3-connector.js.ejs
@@ -5,11 +5,9 @@ __reduce(<%- connectionList %>,function(prev, value, next) {
   }
 
   if (value === '$WEB3' && (typeof web3 !== 'undefined' && typeof Web3 !== 'undefined')) {
-    //web3 = new Web3(web3.currentProvider);
     web3.setProvider(web3.currentProvider);
   } else if (value !== '$WEB3' && (typeof Web3 !== 'undefined' && ((typeof web3 === 'undefined') || (typeof web3 !== 'undefined' && (!web3.isConnected || (web3.isConnected && !web3.isConnected())))))) {
 
-    //web3 = new Web3(new Web3.providers.HttpProvider(value));
     web3.setProvider(new Web3.providers.HttpProvider(value));
   } else if (value === '$WEB3') {
     return next(null, '');
diff --git a/test/code_generator.js b/test/code_generator.js
index 999d4ca6..1ccfa97e 100644
--- a/test/code_generator.js
+++ b/test/code_generator.js
@@ -10,7 +10,7 @@ describe('embark.CodeGenerator', function() {
     let generator = new CodeGenerator({contractsConfig: {"dappConnection": [ "$WEB3", "http://somehost:1234" ] }, contractsManager: {}});
 
     it('should generate code to connect to a provider', function() {
-      var providerCode = "function __reduce(arr, memo, iteratee, cb) {\n  if (typeof cb !== 'function') {\n    if (typeof memo === 'function' && typeof iteratee === 'function') {\n      cb = iteratee;\n      iteratee = memo;\n      memo = [];\n    } else {\n      throw new TypeError('expected callback to be a function');\n    }\n  }\n\n  if (!Array.isArray(arr)) {\n    cb(new TypeError('expected an array'));\n    return;\n  }\n\n  if (typeof iteratee !== 'function') {\n    cb(new TypeError('expected iteratee to be a function'));\n    return;\n  }\n\n  (function next(i, acc) {\n    if (i === arr.length) {\n      cb(null, acc);\n      return;\n    }\n\n    iteratee(acc, arr[i], function(err, val) {\n      if (err) {\n        cb(err);\n        return;\n      }\n      next(i + 1, val);\n    });\n  })(0, memo);\n};\nvar __mainContext = __mainContext || this;\n__mainContext.__LoadManager = function() { this.list = []; this.done = false; }\n__mainContext.__LoadManager.prototype.execWhenReady = function(cb) { if (this.done) { cb(); } else { this.list.push(cb) } }\n__mainContext.__LoadManager.prototype.doFirst = function(todo) { var self = this; todo(function() { self.done = true; self.list.map((x) => x.apply()) }) }\n__mainContext.__loadManagerInstance = new __mainContext.__LoadManager();\nvar whenEnvIsLoaded = function(cb) {\n  if (typeof document !== 'undefined' && document !== null) {\n      document.addEventListener('DOMContentLoaded', cb);\n  } else {\n    cb();\n  }\n}\nwhenEnvIsLoaded(function(){\n  __mainContext.__loadManagerInstance.doFirst(function(done) {\n    __mainContext.web3 = undefined;\n__reduce([\"$WEB3\",\"http://somehost:1234\"],function(prev, value, next) {\n  if (prev === false) {\n    return next(null, false);\n  }\n\n  if (value === '$WEB3' && (typeof web3 !== 'undefined' && typeof Web3 !== 'undefined')) {\n    web3 = new Web3(web3.currentProvider);\n  } else if (value !== '$WEB3' && (typeof Web3 !== 'undefined' && ((typeof web3 === 'undefined') || (typeof web3 !== 'undefined' && (!web3.isConnected || (web3.isConnected && !web3.isConnected())))))) {\n\n    web3 = new Web3(new Web3.providers.HttpProvider(value));\n  } else if (value === '$WEB3') {\n    return next(null, '');\n  }\n\n  web3.eth.getAccounts(function(err, account) {\n    if (err) {\n      next(null, true)\n    } else {\n      next(null, false)\n    }\n  });\n}, function(err, _result) {\n  web3.eth.getAccounts(function(err, accounts) {\n    web3.eth.defaultAccount = accounts[0];\n    done();\n  });\n});\n\n  })\n});\n\n";
+      var providerCode = "function __reduce(arr, memo, iteratee, cb) {\n  if (typeof cb !== 'function') {\n    if (typeof memo === 'function' && typeof iteratee === 'function') {\n      cb = iteratee;\n      iteratee = memo;\n      memo = [];\n    } else {\n      throw new TypeError('expected callback to be a function');\n    }\n  }\n\n  if (!Array.isArray(arr)) {\n    cb(new TypeError('expected an array'));\n    return;\n  }\n\n  if (typeof iteratee !== 'function') {\n    cb(new TypeError('expected iteratee to be a function'));\n    return;\n  }\n\n  (function next(i, acc) {\n    if (i === arr.length) {\n      cb(null, acc);\n      return;\n    }\n\n    iteratee(acc, arr[i], function(err, val) {\n      if (err) {\n        cb(err);\n        return;\n      }\n      next(i + 1, val);\n    });\n  })(0, memo);\n};\nvar __mainContext = __mainContext || this;\n__mainContext.__LoadManager = function() { this.list = []; this.done = false; }\n__mainContext.__LoadManager.prototype.execWhenReady = function(cb) { if (this.done) { cb(); } else { this.list.push(cb) } }\n__mainContext.__LoadManager.prototype.doFirst = function(todo) { var self = this; todo(function() { self.done = true; self.list.map((x) => x.apply()) }) }\n__mainContext.__loadManagerInstance = new __mainContext.__LoadManager();\nvar whenEnvIsLoaded = function(cb) {\n  if (typeof document !== 'undefined' && document !== null) {\n      document.addEventListener('DOMContentLoaded', cb);\n  } else {\n    cb();\n  }\n}\nwhenEnvIsLoaded(function(){\n  __mainContext.__loadManagerInstance.doFirst(function(done) {\n    __mainContext.web3 = undefined;\n__reduce([\"$WEB3\",\"http://somehost:1234\"],function(prev, value, next) {\n  if (prev === false) {\n    return next(null, false);\n  }\n\n  if (value === '$WEB3' && (typeof web3 !== 'undefined' && typeof Web3 !== 'undefined')) {\n    web3.setProvider(web3.currentProvider);\n  } else if (value !== '$WEB3' && (typeof Web3 !== 'undefined' && ((typeof web3 === 'undefined') || (typeof web3 !== 'undefined' && (!web3.isConnected || (web3.isConnected && !web3.isConnected())))))) {\n\n    web3.setProvider(new Web3.providers.HttpProvider(value));\n  } else if (value === '$WEB3') {\n    return next(null, '');\n  }\n\n  web3.eth.getAccounts(function(err, account) {\n    if (err) {\n      next(null, true)\n    } else {\n      next(null, false)\n    }\n  });\n}, function(err, _result) {\n  web3.eth.getAccounts(function(err, accounts) {\n    web3.eth.defaultAccount = accounts[0];\n    done();\n  });\n});\n\n  })\n});\n\n";
 
       assert.equal(generator.generateProvider(), providerCode);
     });