diff --git a/js/embark.js b/js/embark.js
index 50c8ad68..12b1e5cf 100644
--- a/js/embark.js
+++ b/js/embark.js
@@ -1,5 +1,3 @@
-/*jshint esversion: 6 */
-
 var EmbarkJS = {};
 
 EmbarkJS.isNewWeb3 = function() {
diff --git a/lib/contracts/compiler.js b/lib/contracts/compiler.js
index a453a8a1..c9a7ffa4 100644
--- a/lib/contracts/compiler.js
+++ b/lib/contracts/compiler.js
@@ -1,4 +1,3 @@
-/*jshint esversion: 6, loopfunc: true */
 let async = require('../utils/async_extend.js');
 
 class Compiler {
diff --git a/lib/core/plugin.js b/lib/core/plugin.js
index 581bbaf1..bae7fafa 100644
--- a/lib/core/plugin.js
+++ b/lib/core/plugin.js
@@ -1,4 +1,3 @@
-/*jshint esversion: 6, loopfunc: true */
 var fs = require('./fs.js');
 var utils = require('../utils/utils.js');
 
diff --git a/lib/core/runCode.js b/lib/core/runCode.js
index 41477637..582238b8 100644
--- a/lib/core/runCode.js
+++ b/lib/core/runCode.js
@@ -15,7 +15,7 @@ function doEval(code, _web3) {
 
   try {
     // TODO: add trace log here
-    return eval(code); // jshint ignore:line
+    return eval(code);
   } catch(e) {
     throw new Error(e + "\n" + code);
   }
diff --git a/lib/dashboard/console.js b/lib/dashboard/console.js
index a1b6aa95..907e9844 100644
--- a/lib/dashboard/console.js
+++ b/lib/dashboard/console.js
@@ -10,7 +10,7 @@ class Console {
   }
 
   runCode(code) {
-    RunCode.doEval(code); // jshint ignore:line
+    RunCode.doEval(code);
   }
 
   processEmbarkCmd (cmd) {
diff --git a/lib/index.js b/lib/index.js
index 1ea82bb8..f15e406f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,4 +1,3 @@
-/*jshint esversion: 6 */
 let async = require('async');
 // require("./utils/debug_util.js")(__filename, async);
 
diff --git a/lib/modules/solidity/index.js b/lib/modules/solidity/index.js
index 21f18ea4..442bb400 100644
--- a/lib/modules/solidity/index.js
+++ b/lib/modules/solidity/index.js
@@ -70,7 +70,6 @@ class Solidity {
             for (let i=0; i<output.errors.length; i++) {
               if (output.errors[i].type === 'Warning') {
                 self.logger.warn(output.errors[i].formattedMessage);
-                //return callback(new Error("Solidity errors: " + output.errors).message);
               }
               if (output.errors[i].type === 'Error' || output.errors[i].severity === 'error') {
                 return callback(new Error("Solidity errors: " + output.errors).message);
diff --git a/lib/pipeline/pipeline.js b/lib/pipeline/pipeline.js
index 950ed89a..b8e7b73d 100644
--- a/lib/pipeline/pipeline.js
+++ b/lib/pipeline/pipeline.js
@@ -1,4 +1,3 @@
-/*jshint esversion: 6, loopfunc: true */
 let fs = require('../core/fs.js');
 let async = require('async');
 //var Plugins = require('../core/plugins.js');
diff --git a/lib/pipeline/watch.js b/lib/pipeline/watch.js
index 1131bfd2..c82559a7 100644
--- a/lib/pipeline/watch.js
+++ b/lib/pipeline/watch.js
@@ -1,4 +1,3 @@
-/*jshint esversion: 6 */
 let chokidar = require('chokidar');
 
 let fs = require('../core/fs.js');
diff --git a/lib/tests/test.js b/lib/tests/test.js
index 94f5edc5..52a60ec9 100644
--- a/lib/tests/test.js
+++ b/lib/tests/test.js
@@ -96,7 +96,7 @@ Test.prototype.deployAll = function(contractsConfig, cb) {
         throw new Error(err);
       }
       self.web3.eth.defaultAccount = accounts[0];
-      RunCode.doEval(result, self.web3); // jshint ignore:line
+      RunCode.doEval(result, self.web3);
       //cb();
       cb(accounts);
     });