diff --git a/gulpfile.js b/gulpfile.js
index 4e2df385..1929f294 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,10 +2,8 @@ var path = require('path')
 
 var gulp = require('gulp')
 var gutil = require('gulp-util')
-var jshint = require('gulp-jshint')
 var jsonlint = require('gulp-jsonlint')
 var eslint = require('gulp-eslint')
-var standard = require('gulp-standard')
 var webpack = require('webpack')
 var webpackConfig = require('./webpack.config').webpack
 var webpackStatusConfig = require('./res/common/status/webpack.config')
@@ -18,7 +16,6 @@ var protractorConfig = './res/test/protractor.conf'
 var karma = require('karma').server
 var karmaConfig = '/res/test/karma.conf.js'
 var stream = require('stream')
-var jscs = require('gulp-jscs')
 var run = require('gulp-run')
 
 gulp.task('jshint', function () {
@@ -69,29 +66,9 @@ gulp.task('eslint', function () {
     .pipe(eslint.failAfterError());
 });
 
-gulp.task('jscs', function () {
-  return gulp.src([
-      'lib/**/*.js'
-    , 'res/app/**/*.js'
-    , 'res/auth-ldap/**/*.js'
-    , 'res/auth-mock/**/*.js'
-    , 'res/common/**/*.js'
-    , 'res/test/**/*.js'
-    , '*.js'
-    ])
-    .pipe(jscs())
-})
 
-gulp.task('standard', function () {
-  // Check res/app for now
-  return gulp.src(['res/app/**/*.js', '!**/*-spec.js'])
-    .pipe(standard())
-    .pipe(standard.reporter('default', {
-      breakOnError: true
-    }))
-})
 
-gulp.task('lint', ['jshint', 'jsonlint'])
+gulp.task('lint', ['jsonlint'])
 gulp.task('test', ['lint', 'run:checkversion'])
 gulp.task('build', ['clean', 'webpack:build'])
 
diff --git a/package.json b/package.json
index 8c3610e9..4bc6af82 100644
--- a/package.json
+++ b/package.json
@@ -89,6 +89,7 @@
     "chai": "^3.4.1",
     "css-loader": "^0.23.1",
     "del": "^2.0.1",
+    "eslint-loader": "^1.2.0",
     "event-stream": "^3.3.2",
     "exports-loader": "^0.6.2",
     "extract-text-webpack-plugin": "^1.0.1",
@@ -97,20 +98,14 @@
     "gulp-angular-gettext": "^2.1.0",
     "gulp-eslint": "^1.1.1",
     "gulp-jade": "^1.0.0",
-    "gulp-jscs": "^3.0.2",
-    "gulp-jshint": "^1.12.0",
     "gulp-jsonlint": "^1.0.2",
     "gulp-protractor": "^2.1.0",
     "gulp-run": "^1.6.12",
-    "gulp-standard": "^5.1.0",
     "gulp-util": "^3.0.7",
     "html-loader": "^0.4.0",
     "imports-loader": "^0.6.5",
     "jasmine-core": "^2.4.1",
     "jasmine-reporters": "^2.1.1",
-    "jshint": "^2.8.0",
-    "jshint-loader": "^0.8.3",
-    "jshint-stylish": "^2.1.0",
     "json-loader": "^0.5.4",
     "karma": "^0.13.19",
     "karma-chrome-launcher": "^0.2.2",
diff --git a/webpack.config.js b/webpack.config.js
index e94f3e22..42ab6551 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -67,13 +67,14 @@ module.exports = {
         { test: /uuid\.js$/, loader: 'imports?require=>undefined'},
         { test: /dialogs\.js$/, loader: 'script'}
       ],
-      preLoaders: [
-        {
-          test: /\.js$/,
-          exclude: /node_modules|bower_components/,
-          loader: 'jshint-loader'
-        }
-      ],
+      // TODO: enable when its sane
+      //preLoaders: [
+      //  {
+      //    test: /\.js$/,
+      //    exclude: /node_modules|bower_components/,
+      //    loader: 'eslint-loader'
+      //  }
+      //],
       noParse: [
         //pathutil.resource('bower_components')
       ]