diff --git a/.circleci/config.yml b/.circleci/config.yml
index 55c71b9fd7e..c20b34e4e78 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,7 +60,6 @@ jobs:
           name: Lint
           command: |
             meteor npm run lint
-            meteor npm run stylelint
 
       - run:
           name: Unit Test
diff --git a/.travis.yml b/.travis.yml
index fb956d945ea..b602c51213a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,6 @@ before_script:
   mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
 - meteor npm run lint
 - meteor npm run testunit
-- meteor npm run stylelint
 - travis_retry meteor build --headless /tmp/build
 - mkdir /tmp/build-test
 - tar -xf /tmp/build/Rocket.Chat.tar.gz -C /tmp/build-test/
diff --git a/package-lock.json b/package-lock.json
index ffe6d44fb35..6ea70282f26 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4954,6 +4954,7 @@
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
 			"integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+			"optional": true,
 			"requires": {
 				"prr": "1.0.1"
 			}
@@ -11025,7 +11026,8 @@
 		"natives": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz",
-			"integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg=="
+			"integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==",
+			"optional": true
 		},
 		"natural-compare": {
 			"version": "1.4.0",
@@ -12798,7 +12800,8 @@
 		"prr": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-			"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
+			"integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+			"optional": true
 		},
 		"pseudomap": {
 			"version": "1.0.2",
diff --git a/package.json b/package.json
index be57067bbd3..ce498fa8783 100644
--- a/package.json
+++ b/package.json
@@ -60,13 +60,13 @@
 		"chat"
 	],
 	"scripts": {
-		"start": "meteor npm i && meteor",
+		"start": "meteor",
 		"debug": "meteor run --inspect",
 		"debug-brk": "meteor run --inspect-brk",
-		"lint": "eslint .",
+		"lint": "meteor npm run jslint && meteor npm run stylelint",
+		"jslint": "eslint .",
 		"stylelint": "stylelint \"packages/**/*.css\"",
 		"test": "node .scripts/start.js",
-		"deploy": "npm run build && pm2 startOrRestart pm2.json",
 		"chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end",
 		"chimp-test": "chimp tests/chimp-config.js",
 		"postinstall": "cd packages/rocketchat-katex && npm i",
@@ -75,8 +75,8 @@
 		"testunit": "mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",
 		"version": "node .scripts/version.js",
 		"set-version": "node .scripts/set-version.js",
-		"release": "npm run set-version --silent",
-		"prepush": "npm run lint && npm run testunit"
+		"release": "meteor npm run set-version --silent",
+		"prepush": "meteor npm run lint && meteor npm run testunit"
 	},
 	"license": "MIT",
 	"repository": {