diff --git a/.eslintignore b/.eslintignore
index 2482278de75cc..94357790433f7 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,9 @@
+/optimize
+/src/fixtures/vislib/mock_data
+/src/ui/public/angular-bootstrap
+/test/fixtures/scenarios
+/src/core_plugins/console/public/webpackShims
+/src/core_plugins/console/public/tests/webpackShims
 /src/core_plugins/timelion/bower_components
 /src/core_plugins/timelion/vendor_components
-test/fixtures/scenarios
-optimize
-test/fixtures/scenarios
+/src/ui/public/utils/decode_geo_hash.js
diff --git a/.eslintrc b/.eslintrc
index 7a623df06a6ca..62b30dd6c68e7 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,2 +1,5 @@
 ---
 extends: '@elastic/kibana'
+rules:
+  object-curly-spacing: [error, always]
+  no-global-assign: [error]
diff --git a/Gruntfile.js b/Gruntfile.js
index d4246608d8d21..0b015febc9515 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,4 +1,3 @@
-const camelCase = require('lodash').camelCase;
 require('babel/register')(require('./src/optimize/babel_options').node);
 
 module.exports = function (grunt) {
@@ -39,17 +38,6 @@ module.exports = function (grunt) {
         ' Licensed <%= package.license %> */\n'
     },
 
-    lintThese: [
-      'Gruntfile.js',
-      '<%= root %>/tasks/**/*.js',
-      '<%= root %>/test/**/*.js',
-      '<%= src %>/**/*.js',
-      '!<%= src %>/ui/public/angular-bootstrap/**/*.js',
-      '!<%= src %>/core_plugins/timelion/bower_components/**/*.js',
-      '!<%= src %>/core_plugins/timelion/vendor_components/**/*.js',
-      '!<%= src %>/fixtures/**/*.js',
-      '!<%= root %>/test/fixtures/scenarios/**/*.js'
-    ],
     deepModules: {
       'caniuse-db': '1.0.30000265',
       'chalk': '1.1.0',
diff --git a/package.json b/package.json
index b5425331a79c5..7dac431a9e428 100644
--- a/package.json
+++ b/package.json
@@ -163,16 +163,16 @@
     "wreck": "6.2.0"
   },
   "devDependencies": {
-    "@elastic/eslint-config-kibana": "0.0.3",
+    "@elastic/eslint-config-kibana": "0.2.0",
     "angular-mocks": "1.4.7",
     "auto-release-sinon": "1.0.3",
-    "babel-eslint": "4.1.8",
     "chai": "3.5.0",
+    "babel-eslint": "6.1.2",
     "chokidar": "1.6.0",
     "chromedriver": "2.24.1",
     "elasticdump": "2.1.1",
-    "eslint": "1.10.3",
-    "eslint-plugin-mocha": "1.1.0",
+    "eslint": "3.3.1",
+    "eslint-plugin-mocha": "4.4.0",
     "event-stream": "3.3.2",
     "expect.js": "0.3.1",
     "faker": "1.1.0",
@@ -186,7 +186,7 @@
     "grunt-karma": "2.0.0",
     "grunt-run": "0.6.0",
     "grunt-simple-mocha": "0.4.0",
-    "gruntify-eslint": "1.0.1",
+    "gruntify-eslint": "3.0.0",
     "gulp-sourcemaps": "1.7.3",
     "handlebars": "4.0.5",
     "husky": "0.8.1",
diff --git a/src/cli/cli.js b/src/cli/cli.js
index f25608dec1cf7..b53dc922b67b0 100644
--- a/src/cli/cli.js
+++ b/src/cli/cli.js
@@ -27,7 +27,7 @@ program
 
 program
 .command('*', null, { noHelp: true })
-.action(function (cmd, options) {
+.action(function (cmd) {
   program.error(`unknown command ${cmd}`);
 });
 
diff --git a/src/cli/cluster/__tests__/_mock_cluster_fork.js b/src/cli/cluster/__tests__/_mock_cluster_fork.js
index 2671ca08bdb9a..0915d172a4cd6 100644
--- a/src/cli/cluster/__tests__/_mock_cluster_fork.js
+++ b/src/cli/cluster/__tests__/_mock_cluster_fork.js
@@ -24,7 +24,7 @@ export default class MockClusterFork extends EventEmitter {
             dead = true;
             this.emit('exit');
             cluster.emit('exit', this, this.exitCode || 0);
-          }());
+          })();
         }),
       },
       isDead: sinon.spy(() => dead),
@@ -39,6 +39,6 @@ export default class MockClusterFork extends EventEmitter {
       await wait();
       dead = false;
       this.emit('online');
-    }());
+    })();
   }
 }
diff --git a/src/cli/cluster/__tests__/cluster_manager.js b/src/cli/cluster/__tests__/cluster_manager.js
index ae9ef7080981a..13184056c2b28 100644
--- a/src/cli/cluster/__tests__/cluster_manager.js
+++ b/src/cli/cluster/__tests__/cluster_manager.js
@@ -1,8 +1,7 @@
 import expect from 'expect.js';
 import sinon from 'auto-release-sinon';
 import cluster from 'cluster';
-import { ChildProcess } from 'child_process';
-import { sample, difference } from 'lodash';
+import { sample } from 'lodash';
 
 import ClusterManager from '../cluster_manager';
 import Worker from '../worker';
diff --git a/src/cli/cluster/__tests__/worker.js b/src/cli/cluster/__tests__/worker.js
index 4d8f4f53af148..b84b92d76e460 100644
--- a/src/cli/cluster/__tests__/worker.js
+++ b/src/cli/cluster/__tests__/worker.js
@@ -1,9 +1,7 @@
 import expect from 'expect.js';
 import sinon from 'auto-release-sinon';
 import cluster from 'cluster';
-import { ChildProcess } from 'child_process';
-import { difference, findIndex, sample } from 'lodash';
-import { fromNode as fn } from 'bluebird';
+import { findIndex } from 'lodash';
 
 import MockClusterFork from './_mock_cluster_fork';
 import Worker from '../worker';
@@ -96,7 +94,7 @@ describe('CLI cluster manager', function () {
 
   describe('#parseIncomingMessage()', function () {
     context('on a started worker', function () {
-      it(`is bound to fork's message event`, async function () {
+      it('is bound to fork\'s message event', async function () {
         const worker = setup();
         await worker.start();
         sinon.assert.calledWith(worker.fork.on, 'message');
@@ -135,7 +133,6 @@ describe('CLI cluster manager', function () {
     context('when sent WORKER_LISTENING message', function () {
       it('sets the listening flag and emits the listening event', function () {
         const worker = setup();
-        const data = {};
         const stub = sinon.stub(worker, 'emit');
         expect(worker).to.have.property('listening', false);
         worker.onMessage('WORKER_LISTENING');
diff --git a/src/cli/cluster/base_path_proxy.js b/src/cli/cluster/base_path_proxy.js
index 4f8a3916166c9..b457a877efbe7 100644
--- a/src/cli/cluster/base_path_proxy.js
+++ b/src/cli/cluster/base_path_proxy.js
@@ -1,6 +1,6 @@
 import { Server } from 'hapi';
 import { notFound } from 'boom';
-import { merge, sample } from 'lodash';
+import { sample } from 'lodash';
 import { format as formatUrl } from 'url';
 import { map, fromNode } from 'bluebird';
 import { Agent as HttpsAgent } from 'https';
@@ -106,9 +106,9 @@ export default class BasePathProxy {
 
     server.route({
       method: '*',
-      path: `/{oldBasePath}/{kbnPath*}`,
+      path: '/{oldBasePath}/{kbnPath*}',
       handler(req, reply) {
-        const {oldBasePath, kbnPath = ''} = req.params;
+        const { oldBasePath, kbnPath = '' } = req.params;
 
         const isGet = req.method === 'get';
         const isBasePath = oldBasePath.length === 3;
diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js
index 80b183cd663a6..f496bc9351ed6 100644
--- a/src/cli/cluster/cluster_manager.js
+++ b/src/cli/cluster/cluster_manager.js
@@ -1,12 +1,10 @@
-import cluster from 'cluster';
-const { join, resolve } = require('path');
-const { format: formatUrl } = require('url');
-import Hapi from 'hapi';
-const { debounce, compact, get, invoke, bindAll, once, sample, uniq } = require('lodash');
+import { resolve } from 'path';
+import { debounce, invoke, bindAll, once, uniq } from 'lodash';
 
 import Log from '../log';
 import Worker from './worker';
 import BasePathProxy from './base_path_proxy';
+import fromRoot from '../../utils/from_root';
 
 process.env.kbnWorkerType = 'managr';
 
@@ -84,21 +82,17 @@ module.exports = class ClusterManager {
 
   setupWatching(extraPaths) {
     const chokidar = require('chokidar');
-    const fromRoot = require('../../utils/from_root');
-
-    const watchPaths = uniq(
-      [
-        fromRoot('src/core_plugins'),
-        fromRoot('src/server'),
-        fromRoot('src/ui'),
-        fromRoot('src/utils'),
-        fromRoot('config'),
-        ...extraPaths
-      ]
-      .map(path => resolve(path))
-    );
-
-    this.watcher = chokidar.watch(watchPaths, {
+
+    const watchPaths = [
+      fromRoot('src/core_plugins'),
+      fromRoot('src/server'),
+      fromRoot('src/ui'),
+      fromRoot('src/utils'),
+      fromRoot('config'),
+      ...extraPaths
+    ].map(path => resolve(path));
+
+    this.watcher = chokidar.watch(uniq(watchPaths), {
       cwd: fromRoot('.'),
       ignored: /[\\\/](\..*|node_modules|bower_components|public|__tests__)[\\\/]/
     });
@@ -127,7 +121,7 @@ module.exports = class ClusterManager {
     rl.setPrompt('');
     rl.prompt();
 
-    rl.on('line', line => {
+    rl.on('line', () => {
       nls = nls + 1;
 
       if (nls >= 2) {
diff --git a/src/cli/cluster/worker.js b/src/cli/cluster/worker.js
index 4108627edea65..2c16ecf411154 100644
--- a/src/cli/cluster/worker.js
+++ b/src/cli/cluster/worker.js
@@ -1,20 +1,19 @@
 import _ from 'lodash';
 import cluster from 'cluster';
-import { resolve } from 'path';
 import { EventEmitter } from 'events';
 
 import { BinderFor, fromRoot } from '../../utils';
 
-let cliPath = fromRoot('src/cli');
-let baseArgs = _.difference(process.argv.slice(2), ['--no-watch']);
-let baseArgv = [process.execPath, cliPath].concat(baseArgs);
+const cliPath = fromRoot('src/cli');
+const baseArgs = _.difference(process.argv.slice(2), ['--no-watch']);
+const baseArgv = [process.execPath, cliPath].concat(baseArgs);
 
 cluster.setupMaster({
   exec: cliPath,
   silent: false
 });
 
-let dead = fork => {
+const dead = fork => {
   return fork.isDead() || fork.killed;
 };
 
@@ -40,7 +39,7 @@ module.exports = class Worker extends EventEmitter {
     this.clusterBinder = new BinderFor(cluster);
     this.processBinder = new BinderFor(process);
 
-    let argv = _.union(baseArgv, opts.argv || []);
+    const argv = _.union(baseArgv, opts.argv || []);
     this.env = {
       kbnWorkerType: this.type,
       kbnWorkerArgv: JSON.stringify(argv)
@@ -124,8 +123,8 @@ module.exports = class Worker extends EventEmitter {
   }
 
   flushChangeBuffer() {
-    let files = _.unique(this.changes.splice(0));
-    let prefix = files.length > 1 ? '\n - ' : '';
+    const files = _.unique(this.changes.splice(0));
+    const prefix = files.length > 1 ? '\n - ' : '';
     return files.reduce(function (list, file) {
       return `${list || ''}${prefix}"${file}"`;
     }, '');
diff --git a/src/cli/command.js b/src/cli/command.js
index 135d03e32b6c1..27e65a4e832d0 100644
--- a/src/cli/command.js
+++ b/src/cli/command.js
@@ -3,7 +3,6 @@ import _ from 'lodash';
 import help from './help';
 import { Command } from 'commander';
 import { red } from './color';
-import { yellow } from './color';
 
 Command.prototype.error = function (err) {
   if (err && err.message) err = err.message;
@@ -40,15 +39,15 @@ Command.prototype.unknownArgv = function (argv) {
  * @return {[type]} [description]
  */
 Command.prototype.collectUnknownOptions = function () {
-  let title = `Extra ${this._name} options`;
+  const title = `Extra ${this._name} options`;
 
   this.allowUnknownOption();
   this.getUnknownOptions = function () {
-    let opts = {};
-    let unknowns = this.unknownArgv();
+    const opts = {};
+    const unknowns = this.unknownArgv();
 
     while (unknowns.length) {
-      let opt = unknowns.shift().split('=');
+      const opt = unknowns.shift().split('=');
       if (opt[0].slice(0, 2) !== '--') {
         this.error(`${title} "${opt[0]}" must start with "--"`);
       }
@@ -75,14 +74,14 @@ Command.prototype.collectUnknownOptions = function () {
 };
 
 Command.prototype.parseOptions = _.wrap(Command.prototype.parseOptions, function (parse, argv) {
-  let opts = parse.call(this, argv);
+  const opts = parse.call(this, argv);
   this.unknownArgv(opts.unknown);
   return opts;
 });
 
 Command.prototype.action = _.wrap(Command.prototype.action, function (action, fn) {
   return action.call(this, function (...args) {
-    let ret = fn.apply(this, args);
+    const ret = fn.apply(this, args);
     if (ret && typeof ret.then === 'function') {
       ret.then(null, function (e) {
         console.log('FATAL CLI ERROR', e.stack);
diff --git a/src/cli/help.js b/src/cli/help.js
index 89bc90a24cbd6..b5078aad458fe 100644
--- a/src/cli/help.js
+++ b/src/cli/help.js
@@ -5,12 +5,12 @@ module.exports = function (command, spaces) {
     return command.outputHelp();
   }
 
-  let defCmd = _.find(command.commands, function (cmd) {
+  const defCmd = _.find(command.commands, function (cmd) {
     return cmd._name === 'serve';
   });
 
-  let desc = !command.description() ? '' : command.description();
-  let cmdDef = !defCmd ? '' : `=${defCmd._name}`;
+  const desc = !command.description() ? '' : command.description();
+  const cmdDef = !defCmd ? '' : `=${defCmd._name}`;
 
   return (
 `
@@ -31,11 +31,11 @@ function indent(str, n) {
 }
 
 function commandsSummary(program) {
-  let cmds = _.compact(program.commands.map(function (cmd) {
-    let name = cmd._name;
+  const cmds = _.compact(program.commands.map(function (cmd) {
+    const name = cmd._name;
     if (name === '*') return;
-    let opts = cmd.options.length ? ' [options]' : '';
-    let args = cmd._args.map(function (arg) {
+    const opts = cmd.options.length ? ' [options]' : '';
+    const args = cmd._args.map(function (arg) {
       return humanReadableArgName(arg);
     }).join(' ');
 
@@ -45,7 +45,7 @@ function commandsSummary(program) {
     ];
   }));
 
-  let cmdLColWidth = cmds.reduce(function (width, cmd) {
+  const cmdLColWidth = cmds.reduce(function (width, cmd) {
     return Math.max(width, cmd[0].length);
   }, 0);
 
@@ -69,6 +69,6 @@ ${indent(cmd.optionHelp(), 2)}
 }
 
 function humanReadableArgName(arg) {
-  let nameOutput = arg.name + (arg.variadic === true ? '...' : '');
+  const nameOutput = arg.name + (arg.variadic === true ? '...' : '');
   return arg.required ? '<' + nameOutput + '>' : '[' + nameOutput + ']';
 }
diff --git a/src/cli/log.js b/src/cli/log.js
index bbbe3f2f21e89..584c27d5f9857 100644
--- a/src/cli/log.js
+++ b/src/cli/log.js
@@ -1,7 +1,6 @@
 import _ from 'lodash';
-import ansicolors from 'ansicolors';
 
-let log = _.restParam(function (color, label, rest1) {
+const log = _.restParam(function (color, label, rest1) {
   console.log.apply(console, [color(` ${_.trim(label)} `)].concat(rest1));
 });
 
diff --git a/src/cli/serve/__tests__/read_yaml_config.js b/src/cli/serve/__tests__/read_yaml_config.js
index 29b620b27dbb0..e5743445f7f87 100644
--- a/src/cli/serve/__tests__/read_yaml_config.js
+++ b/src/cli/serve/__tests__/read_yaml_config.js
@@ -9,7 +9,7 @@ function fixture(name) {
 
 describe('cli/serve/read_yaml_config', function () {
   it('reads a single config file', function () {
-    const config = readYamlConfig(fixture('one.yml'));
+    readYamlConfig(fixture('one.yml'));
 
     expect(readYamlConfig(fixture('one.yml'))).to.eql({
       foo: 1,
diff --git a/src/cli/serve/__tests__/reload_logging_config.js b/src/cli/serve/__tests__/reload_logging_config.js
index 721ebad27b84b..d0c7a032c889a 100644
--- a/src/cli/serve/__tests__/reload_logging_config.js
+++ b/src/cli/serve/__tests__/reload_logging_config.js
@@ -1,13 +1,13 @@
 import { spawn } from 'child_process';
-import { writeFileSync, readFile } from 'fs';
+import { writeFileSync } from 'fs';
 import { relative, resolve } from 'path';
 import { safeDump } from 'js-yaml';
 import es from 'event-stream';
 import readYamlConfig from '../read_yaml_config';
 import expect from 'expect.js';
 
-const testConfigFile = follow(`fixtures/reload_logging_config/kibana.test.yml`);
-const cli = follow(`../../../../bin/kibana`);
+const testConfigFile = follow('fixtures/reload_logging_config/kibana.test.yml');
+const cli = follow('../../../../bin/kibana');
 
 function follow(file) {
   return relative(process.cwd(), resolve(__dirname, file));
@@ -22,19 +22,19 @@ function setLoggingJson(enabled) {
   return conf;
 }
 
-describe(`Server logging configuration`, function () {
+describe('Server logging configuration', function () {
 
   const isWindows = /^win/.test(process.platform);
   if (isWindows) {
     it('SIGHUP is not a feature of Windows.');
   } else {
-    it(`should be reloadable via SIGHUP process signaling`, function (done) {
+    it('should be reloadable via SIGHUP process signaling', function (done) {
       this.timeout(60000);
 
       let asserted = false;
       let json = Infinity;
-      const conf = setLoggingJson(true);
-      const child = spawn(cli, [`--config`, testConfigFile]);
+      setLoggingJson(true);
+      const child = spawn(cli, ['--config', testConfigFile]);
 
       child.on('error', err => {
         done(new Error(`error in child process while attempting to reload config. ${err.stack || err.message || err}`));
@@ -62,7 +62,7 @@ describe(`Server logging configuration`, function () {
       function parseJsonLogLine(line) {
         try {
           const data = JSON.parse(line);
-          const listening = data.tags.indexOf(`listening`) !== -1;
+          const listening = data.tags.indexOf('listening') !== -1;
           if (listening) {
             switchToPlainTextLog();
           }
@@ -74,13 +74,13 @@ describe(`Server logging configuration`, function () {
       function switchToPlainTextLog() {
         json = 3; // ignore both "reloading" messages + ui settings status message
         setLoggingJson(false);
-        child.kill(`SIGHUP`); // reload logging config
+        child.kill('SIGHUP'); // reload logging config
       }
 
       function expectPlainTextLogLine(line) {
         // assert
-        const tags = `[\u001b[32minfo\u001b[39m][\u001b[36mconfig\u001b[39m]`;
-        const status = `Reloaded logging configuration due to SIGHUP.`;
+        const tags = '[\u001b[32minfo\u001b[39m][\u001b[36mconfig\u001b[39m]';
+        const status = 'Reloaded logging configuration due to SIGHUP.';
         const expected = `${tags} ${status}`;
         const actual = line.slice(-expected.length);
         expect(actual).to.eql(expected);
diff --git a/src/cli/serve/deprecated_config.js b/src/cli/serve/deprecated_config.js
index d0ec271a8cee8..d5203ada10c78 100644
--- a/src/cli/serve/deprecated_config.js
+++ b/src/cli/serve/deprecated_config.js
@@ -1,4 +1,4 @@
-import { forOwn, has, noop } from 'lodash';
+import { has, noop } from 'lodash';
 
 // deprecated settings are still allowed, but will be removed at a later time. They
 // are checked for after the config object is prepared and known, so legacySettings
diff --git a/src/cli/serve/read_yaml_config.js b/src/cli/serve/read_yaml_config.js
index 18e3a4520e875..4cf1f2c2a3d9b 100644
--- a/src/cli/serve/read_yaml_config.js
+++ b/src/cli/serve/read_yaml_config.js
@@ -1,9 +1,8 @@
-import { chain, isArray, isPlainObject, forOwn, memoize, set, transform } from 'lodash';
+import { isArray, isPlainObject, forOwn, memoize, set, transform } from 'lodash';
 import { readFileSync as read } from 'fs';
 import { safeLoad } from 'js-yaml';
 import { red } from 'ansicolors';
 
-import { fromRoot } from '../../utils';
 import { rewriteLegacyConfig } from './legacy_config';
 import { checkForDeprecatedConfig } from './deprecated_config';
 
diff --git a/src/cli_plugin/cli.js b/src/cli_plugin/cli.js
index 5a09416a9cb1a..5d3dd2f702267 100644
--- a/src/cli_plugin/cli.js
+++ b/src/cli_plugin/cli.js
@@ -5,8 +5,8 @@ import listCommand from './list';
 import installCommand from './install';
 import removeCommand from './remove';
 
-let argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
-let program = new Command('bin/kibana-plugin');
+const argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
+const program = new Command('bin/kibana-plugin');
 
 program
 .version(pkg.version)
@@ -23,19 +23,19 @@ program
 .command('help <command>')
 .description('get the help for a specific command')
 .action(function (cmdName) {
-  let cmd = _.find(program.commands, { _name: cmdName });
+  const cmd = _.find(program.commands, { _name: cmdName });
   if (!cmd) return program.error(`unknown command ${cmdName}`);
   cmd.help();
 });
 
 program
 .command('*', null, { noHelp: true })
-.action(function (cmd, options) {
+.action(function (cmd) {
   program.error(`unknown command ${cmd}`);
 });
 
 // check for no command name
-let subCommand = argv[2] && !String(argv[2][0]).match(/^-|^\.|\//);
+const subCommand = argv[2] && !String(argv[2][0]).match(/^-|^\.|\//);
 if (!subCommand) {
   program.defaultHelp();
 }
diff --git a/src/cli_plugin/install/__tests__/cleanup.js b/src/cli_plugin/install/__tests__/cleanup.js
index c8812c8dedf8f..27ebda2363883 100644
--- a/src/cli_plugin/install/__tests__/cleanup.js
+++ b/src/cli_plugin/install/__tests__/cleanup.js
@@ -16,21 +16,14 @@ describe('kibana cli', function () {
       };
 
       describe('cleanPrevious', function () {
-        let cleaner;
         let errorStub;
         let logger;
-        let progress;
-        let request;
 
         beforeEach(function () {
           errorStub = sinon.stub();
           logger = new Logger(settings);
           sinon.stub(logger, 'log');
           sinon.stub(logger, 'error');
-          request = {
-            abort: sinon.stub(),
-            emit: sinon.stub()
-          };
         });
 
         afterEach(function () {
@@ -50,7 +43,7 @@ describe('kibana cli', function () {
 
           return cleanPrevious(settings, logger)
           .catch(errorStub)
-          .then(function (data) {
+          .then(function () {
             expect(errorStub.called).to.be(false);
           });
         });
@@ -76,7 +69,7 @@ describe('kibana cli', function () {
 
           return cleanPrevious(settings, logger)
           .catch(errorStub)
-          .then(function (data) {
+          .then(function () {
             expect(logger.log.calledWith('Found previous install attempt. Deleting...')).to.be(true);
           });
         });
@@ -101,19 +94,14 @@ describe('kibana cli', function () {
 
           return cleanPrevious(settings, logger)
           .catch(errorStub)
-          .then(function (data) {
+          .then(function () {
             expect(errorStub.called).to.be(false);
           });
         });
-
       });
 
       describe('cleanArtifacts', function () {
-        let logger;
-
-        beforeEach(function () {
-          logger = new Logger(settings);
-        });
+        beforeEach(function () {});
 
         afterEach(function () {
           rimraf.sync.restore();
@@ -133,7 +121,6 @@ describe('kibana cli', function () {
 
           expect(cleanArtifacts).withArgs(settings).to.not.throwError();
         });
-
       });
 
     });
diff --git a/src/cli_plugin/install/__tests__/download.js b/src/cli_plugin/install/__tests__/download.js
index d38728fe25578..eb2b52de1325e 100644
--- a/src/cli_plugin/install/__tests__/download.js
+++ b/src/cli_plugin/install/__tests__/download.js
@@ -62,7 +62,7 @@ describe('kibana cli', function () {
       describe('http downloader', function () {
 
         it('should throw an ENOTFOUND error for a http ulr that returns 404', function () {
-          const couchdb = nock('http://example.com')
+          nock('http://example.com')
             .get('/plugin.tar.gz')
             .reply(404);
 
@@ -88,7 +88,7 @@ describe('kibana cli', function () {
         it('should download a file from a valid http url', function () {
           const filePath = join(__dirname, 'replies/banana.jpg');
 
-          const couchdb = nock('http://example.com')
+          nock('http://example.com')
             .defaultReplyHeaders({
               'content-length': '341965',
               'content-type': 'application/zip'
@@ -143,7 +143,7 @@ describe('kibana cli', function () {
           'http://example.com/goodfile.tar.gz'
         ];
 
-        const couchdb = nock('http://example.com')
+        nock('http://example.com')
         .defaultReplyHeaders({
           'content-length': '10'
         })
@@ -173,7 +173,7 @@ describe('kibana cli', function () {
           'http://example.com/badfile3.tar.gz'
         ];
 
-        const couchdb = nock('http://example.com')
+        nock('http://example.com')
         .defaultReplyHeaders({
           'content-length': '10'
         })
@@ -202,7 +202,7 @@ describe('kibana cli', function () {
           'http://example.com/badfile3.tar.gz'
         ];
 
-        const couchdb = nock('http://example.com')
+        nock('http://example.com')
         .defaultReplyHeaders({
           'content-length': '10'
         })
diff --git a/src/cli_plugin/install/__tests__/index.js b/src/cli_plugin/install/__tests__/index.js
index 470d9452a1c12..701247a49492e 100644
--- a/src/cli_plugin/install/__tests__/index.js
+++ b/src/cli_plugin/install/__tests__/index.js
@@ -8,7 +8,7 @@ describe('kibana cli', function () {
 
     describe('commander options', function () {
 
-      let program = {
+      const program = {
         command: function () { return program; },
         description: function () { return program; },
         option: function () { return program; },
diff --git a/src/cli_plugin/install/__tests__/pack.js b/src/cli_plugin/install/__tests__/pack.js
index 39a61e58a93d6..0bd194b3212db 100644
--- a/src/cli_plugin/install/__tests__/pack.js
+++ b/src/cli_plugin/install/__tests__/pack.js
@@ -173,7 +173,7 @@ describe('kibana cli', function () {
 
       it('throw an error if there is no kibana plugin', function () {
         return copyReplyFile('test_plugin_no_kibana.zip')
-        .then((data) => {
+        .then(() => {
           return getPackData(settings, logger);
         })
         .then(shouldReject, (err) => {
@@ -183,7 +183,7 @@ describe('kibana cli', function () {
 
       it('throw an error with a corrupt zip', function () {
         return copyReplyFile('corrupt.zip')
-        .then((data) => {
+        .then(() => {
           return getPackData(settings, logger);
         })
         .then(shouldReject, (err) => {
@@ -193,7 +193,7 @@ describe('kibana cli', function () {
 
       it('throw an error if there an invalid plugin name', function () {
         return copyReplyFile('invalid_name.zip')
-        .then((data) => {
+        .then(() => {
           return getPackData(settings, logger);
         })
         .then(shouldReject, (err) => {
diff --git a/src/cli_plugin/install/__tests__/progress.js b/src/cli_plugin/install/__tests__/progress.js
index 15f4fd9a1bc18..40f0c60b6f88a 100644
--- a/src/cli_plugin/install/__tests__/progress.js
+++ b/src/cli_plugin/install/__tests__/progress.js
@@ -10,7 +10,6 @@ describe('kibana cli', function () {
     describe('progressReporter', function () {
       let logger;
       let progress;
-      let request;
 
       beforeEach(function () {
         logger = new Logger({ silent: false, quiet: false });
@@ -87,7 +86,6 @@ describe('kibana cli', function () {
         });
 
       });
-
     });
 
   });
diff --git a/src/cli_plugin/install/__tests__/settings.js b/src/cli_plugin/install/__tests__/settings.js
index 8186e585788b2..080984c43fef6 100644
--- a/src/cli_plugin/install/__tests__/settings.js
+++ b/src/cli_plugin/install/__tests__/settings.js
@@ -1,8 +1,7 @@
-import path from 'path';
 import expect from 'expect.js';
 import { fromRoot } from '../../../utils';
 import { resolve } from 'path';
-import { parseMilliseconds, parse, getPlatform } from '../settings';
+import { parseMilliseconds, parse } from '../settings';
 
 describe('kibana cli', function () {
 
diff --git a/src/cli_plugin/install/__tests__/zip.js b/src/cli_plugin/install/__tests__/zip.js
index f6e61d320f6aa..8bb3345e0c531 100644
--- a/src/cli_plugin/install/__tests__/zip.js
+++ b/src/cli_plugin/install/__tests__/zip.js
@@ -20,7 +20,7 @@ describe('kibana cli', function () {
       workingPath: testWorkingPath,
       tempArchiveFile: tempArchiveFilePath,
       plugin: 'test-plugin',
-      setPlugin: function (plugin) {}
+      setPlugin: function () {}
     };
 
     function shouldReject() {
diff --git a/src/cli_plugin/install/cleanup.js b/src/cli_plugin/install/cleanup.js
index 5e8f6fec58b30..e6b6a899126de 100644
--- a/src/cli_plugin/install/cleanup.js
+++ b/src/cli_plugin/install/cleanup.js
@@ -19,7 +19,7 @@ export function cleanPrevious(settings, logger) {
       resolve();
     }
   });
-};
+}
 
 export function cleanArtifacts(settings) {
   // delete the working directory.
@@ -29,4 +29,4 @@ export function cleanArtifacts(settings) {
     rimraf.sync(settings.plugins[0].path);
   }
   catch (e) {} // eslint-disable-line no-empty
-};
+}
diff --git a/src/cli_plugin/install/download.js b/src/cli_plugin/install/download.js
index 871b170628fe8..9083d38a338ea 100644
--- a/src/cli_plugin/install/download.js
+++ b/src/cli_plugin/install/download.js
@@ -42,4 +42,4 @@ export function download(settings, logger) {
   }
 
   return tryNext();
-};
+}
diff --git a/src/cli_plugin/install/downloaders/file.js b/src/cli_plugin/install/downloaders/file.js
index 505a103755e66..6a89f4c60338d 100644
--- a/src/cli_plugin/install/downloaders/file.js
+++ b/src/cli_plugin/install/downloaders/file.js
@@ -1,9 +1,9 @@
 import Progress from '../progress';
-import { createWriteStream, createReadStream, unlinkSync, statSync } from 'fs';
+import { createWriteStream, createReadStream, statSync } from 'fs';
 
 function openSourceFile({ sourcePath }) {
   try {
-    let fileInfo = statSync(sourcePath);
+    const fileInfo = statSync(sourcePath);
 
     const readStream = createReadStream(sourcePath);
 
diff --git a/src/cli_plugin/install/downloaders/http.js b/src/cli_plugin/install/downloaders/http.js
index 40069c4cd063e..f8c28d65b7733 100644
--- a/src/cli_plugin/install/downloaders/http.js
+++ b/src/cli_plugin/install/downloaders/http.js
@@ -1,7 +1,7 @@
 import Wreck from 'wreck';
 import Progress from '../progress';
 import { fromNode as fn } from 'bluebird';
-import { createWriteStream, unlinkSync } from 'fs';
+import { createWriteStream } from 'fs';
 
 function sendRequest({ sourceUrl, timeout }) {
   const maxRedirects = 11; //Because this one goes to 11.
@@ -53,7 +53,7 @@ export default async function downloadUrl(logger, sourceUrl, targetPath, timeout
     const { req, resp } = await sendRequest({ sourceUrl, timeout });
 
     try {
-      let totalSize = parseFloat(resp.headers['content-length']) || 0;
+      const totalSize = parseFloat(resp.headers['content-length']) || 0;
       const progress = new Progress(logger);
       progress.init(totalSize);
 
diff --git a/src/cli_plugin/install/index.js b/src/cli_plugin/install/index.js
index c42b3ad687884..d34160ff82c2f 100644
--- a/src/cli_plugin/install/index.js
+++ b/src/cli_plugin/install/index.js
@@ -1,11 +1,9 @@
 import { fromRoot } from '../../utils';
-import fs from 'fs';
 import install from './install';
 import Logger from '../lib/logger';
 import pkg from '../../utils/package_json';
 import { getConfig } from '../../server/path';
 import { parse, parseMilliseconds } from './settings';
-import { find } from 'lodash';
 import logWarnings from '../lib/log_warnings';
 
 function processCommand(command, options) {
@@ -49,4 +47,4 @@ export default function pluginInstall(program) {
   install file:///Path/to/my/x-pack.zip
   install https://path.to/my/x-pack.zip`)
   .action(processCommand);
-};
+}
diff --git a/src/cli_plugin/install/kibana.js b/src/cli_plugin/install/kibana.js
index 11738a53277b3..07db2cf6dea77 100644
--- a/src/cli_plugin/install/kibana.js
+++ b/src/cli_plugin/install/kibana.js
@@ -50,7 +50,7 @@ export async function rebuildCache(settings, logger) {
 
 export function assertVersion(settings) {
   if (!settings.plugins[0].kibanaVersion) {
-    throw new Error (`Plugin package.json is missing both a version property (required) and a kibana.version property (optional).`);
+    throw new Error ('Plugin package.json is missing both a version property (required) and a kibana.version property (optional).');
   }
 
   const actual = cleanVersion(settings.plugins[0].kibanaVersion);
diff --git a/src/cli_plugin/install/pack.js b/src/cli_plugin/install/pack.js
index 76056523a3121..669c4c64bd88f 100644
--- a/src/cli_plugin/install/pack.js
+++ b/src/cli_plugin/install/pack.js
@@ -17,7 +17,7 @@ async function listPackages(settings) {
     .map(file => file.replace(/\\/g, '/'))
     .map(file => file.match(regExp))
     .compact()
-    .map(([ file, _, folder ]) => ({ file, folder }))
+    .map(([ file, , folder ]) => ({ file, folder }))
     .uniq()
     .value();
 }
@@ -140,4 +140,4 @@ export async function extract(settings, logger) {
     logger.error(err);
     throw new Error('Error extracting plugin archive');
   }
-};
+}
diff --git a/src/cli_plugin/install/progress.js b/src/cli_plugin/install/progress.js
index dca7f9a2b88fc..f0e8424852b5e 100644
--- a/src/cli_plugin/install/progress.js
+++ b/src/cli_plugin/install/progress.js
@@ -32,7 +32,7 @@ export default class Progress {
   }
 
   complete() {
-    this.logger.log(`Transfer complete`, false);
+    this.logger.log('Transfer complete', false);
   }
 
 }
diff --git a/src/cli_plugin/install/settings.js b/src/cli_plugin/install/settings.js
index 6c09aff47d721..628ae5b72203d 100644
--- a/src/cli_plugin/install/settings.js
+++ b/src/cli_plugin/install/settings.js
@@ -1,7 +1,5 @@
 import expiry from 'expiry-js';
-import { intersection } from 'lodash';
 import { resolve } from 'path';
-import { arch, platform } from 'os';
 
 function generateUrls({ version, plugin }) {
   return [
@@ -21,7 +19,7 @@ export function parseMilliseconds(val) {
   }
 
   return result;
-};
+}
 
 export function parse(command, options, kbnPackage) {
   const settings = {
@@ -44,4 +42,4 @@ export function parse(command, options, kbnPackage) {
   };
 
   return settings;
-};
+}
diff --git a/src/cli_plugin/lib/errors.js b/src/cli_plugin/lib/errors.js
index 9bcdac145ca55..3a06950c5af8a 100644
--- a/src/cli_plugin/lib/errors.js
+++ b/src/cli_plugin/lib/errors.js
@@ -1 +1 @@
-export class UnsupportedProtocolError extends Error {};
+export class UnsupportedProtocolError extends Error {}
diff --git a/src/cli_plugin/lib/logger.js b/src/cli_plugin/lib/logger.js
index 16bc15f33e026..13adcd2201cec 100644
--- a/src/cli_plugin/lib/logger.js
+++ b/src/cli_plugin/lib/logger.js
@@ -41,6 +41,6 @@ export default class Logger {
     }
     process.stderr.write(`${data}\n`);
     this.previousLineEnded = true;
-  };
+  }
 
 }
diff --git a/src/cli_plugin/list/__tests__/settings.js b/src/cli_plugin/list/__tests__/settings.js
index ebfb245dc8c29..433037c12114b 100644
--- a/src/cli_plugin/list/__tests__/settings.js
+++ b/src/cli_plugin/list/__tests__/settings.js
@@ -1,8 +1,6 @@
-import path from 'path';
 import expect from 'expect.js';
 import fromRoot from '../../../utils/from_root';
-import { resolve } from 'path';
-import { parseMilliseconds, parse } from '../settings';
+import { parse } from '../settings';
 
 describe('kibana cli', function () {
 
diff --git a/src/cli_plugin/list/index.js b/src/cli_plugin/list/index.js
index 1efe265902472..72e0ddc5ae2b9 100644
--- a/src/cli_plugin/list/index.js
+++ b/src/cli_plugin/list/index.js
@@ -29,4 +29,4 @@ export default function pluginList(program) {
     )
     .description('list installed plugins')
     .action(processCommand);
-};
+}
diff --git a/src/cli_plugin/list/settings.js b/src/cli_plugin/list/settings.js
index f372bfc0d35eb..b4f59581c08f0 100644
--- a/src/cli_plugin/list/settings.js
+++ b/src/cli_plugin/list/settings.js
@@ -1,9 +1,7 @@
-import { resolve } from 'path';
-
-export function parse(command, options) {
+export function parse(command) {
   const settings = {
     pluginDir: command.pluginDir || ''
   };
 
   return settings;
-};
+}
diff --git a/src/cli_plugin/remove/__tests__/settings.js b/src/cli_plugin/remove/__tests__/settings.js
index f29aa9d6e33c6..0d031f820829f 100644
--- a/src/cli_plugin/remove/__tests__/settings.js
+++ b/src/cli_plugin/remove/__tests__/settings.js
@@ -1,8 +1,6 @@
-import path from 'path';
 import expect from 'expect.js';
 import fromRoot from '../../../utils/from_root';
-import { resolve } from 'path';
-import { parseMilliseconds, parse } from '../settings';
+import { parse } from '../settings';
 
 describe('kibana cli', function () {
 
diff --git a/src/cli_plugin/remove/index.js b/src/cli_plugin/remove/index.js
index 425112a35045e..f8133c99201ed 100644
--- a/src/cli_plugin/remove/index.js
+++ b/src/cli_plugin/remove/index.js
@@ -39,4 +39,4 @@ export default function pluginRemove(program) {
 `common examples:
   remove x-pack`)
   .action(processCommand);
-};
+}
diff --git a/src/cli_plugin/remove/settings.js b/src/cli_plugin/remove/settings.js
index 7e7ed37d2e5a9..105902687b355 100644
--- a/src/cli_plugin/remove/settings.js
+++ b/src/cli_plugin/remove/settings.js
@@ -12,4 +12,4 @@ export function parse(command, options) {
   settings.pluginPath = resolve(settings.pluginDir, settings.plugin);
 
   return settings;
-};
+}
diff --git a/src/core_plugins/console/.eslintrc b/src/core_plugins/console/.eslintrc
index c5fcfc4ff6fda..f539f6cd5878f 100644
--- a/src/core_plugins/console/.eslintrc
+++ b/src/core_plugins/console/.eslintrc
@@ -1,34 +1,36 @@
 ---
 
 root: true
-extends: '@elastic/kibana'
+extends: '../../../.eslintrc'
 
 rules:
-  block-scoped-var: [0]
-  camelcase: [0]
-  curly: [0]
-  dot-location: [0]
-  dot-notation: [0]
-  eqeqeq: [0]
-  guard-for-in: [0]
-  indent: [0]
-  max-len: [0]
-  new-cap: [0]
-  no-caller: [0]
-  no-empty: [0]
-  no-extend-native: [0]
-  no-loop-func: [0]
-  no-multi-str: [0]
-  no-nested-ternary: [0]
-  no-proto: [0]
-  no-sequences: [0]
-  no-undef: [0]
-  no-use-before-define: [0]
-  one-var: [0]
-  quotes: [0]
-  space-before-blocks: [0]
-  space-in-parens: [0]
-  space-infix-ops: [0]
-  semi: [0]
-  strict: [0]
-  wrap-iife: [0]
+  block-scoped-var: off
+  camelcase: off
+  curly: off
+  dot-location: off
+  dot-notation: off
+  eqeqeq: off
+  guard-for-in: off
+  indent: off
+  max-len: off
+  new-cap: off
+  no-caller: off
+  no-empty: off
+  no-extend-native: off
+  no-loop-func: off
+  no-multi-str: off
+  no-nested-ternary: off
+  no-proto: off
+  no-sequences: off
+  no-undef: off
+  no-use-before-define: off
+  one-var: off
+  quotes: off
+  space-before-blocks: off
+  space-in-parens: off
+  space-infix-ops: off
+  semi: off
+  strict: off
+  wrap-iife: off
+  no-var: off
+  prefer-const: off
diff --git a/src/core_plugins/console/api_server/api.js b/src/core_plugins/console/api_server/api.js
index 7b1f4f2acd36e..f52525a92f46f 100644
--- a/src/core_plugins/console/api_server/api.js
+++ b/src/core_plugins/console/api_server/api.js
@@ -1,4 +1,4 @@
-const _ = require("lodash");
+import _ from "lodash";
 
 'use strict';
 
diff --git a/src/core_plugins/console/api_server/es_5_0.js b/src/core_plugins/console/api_server/es_5_0.js
index 99c9b1c25b6f8..d91f986fba8a0 100644
--- a/src/core_plugins/console/api_server/es_5_0.js
+++ b/src/core_plugins/console/api_server/es_5_0.js
@@ -28,7 +28,7 @@ function ES_5_0() {
   }, this);
 }
 
-ES_5_0.prototype = _.create(Api.prototype, {'constructor': ES_5_0});
+ES_5_0.prototype = _.create(Api.prototype, { 'constructor': ES_5_0 });
 
 (function (cls) {
   cls.addEndpointDescription = function (endpoint, description) {
diff --git a/src/core_plugins/console/api_server/es_5_0/aggregations.js b/src/core_plugins/console/api_server/es_5_0/aggregations.js
index 5dbd0ee21b8ac..aa653f1beec75 100644
--- a/src/core_plugins/console/api_server/es_5_0/aggregations.js
+++ b/src/core_plugins/console/api_server/es_5_0/aggregations.js
@@ -1,12 +1,12 @@
 var simple_metric = {
-  __template: {field: ""},
+  __template: { field: "" },
   field: "{field}",
   missing: 0,
   script: {
     // populated by a global rule
   }
 }, field_metric = {
-  __template: {field: ""},
+  __template: { field: "" },
   field: "{field}"
 }, gap_policy = {
   __one_of: ["skip", "insert_zeros"]
@@ -51,9 +51,9 @@ var rules = {
         }
       },
       "filters": {
-        "*": {__scope_link: "GLOBAL.filter"}
+        "*": { __scope_link: "GLOBAL.filter" }
       },
-      "other_bucket": {__one_of: [true, false]},
+      "other_bucket": { __one_of: [true, false] },
       "other_bucket_key": ""
     },
     "missing": field_metric,
@@ -81,9 +81,9 @@ var rules = {
         __template: {
           "_term": "asc"
         },
-        "_term": {__one_of: ["asc", "desc"]},
-        "_count": {__one_of: ["asc", "desc"]},
-        "*": {__one_of: ["asc", "desc"]}
+        "_term": { __one_of: ["asc", "desc"] },
+        "_count": { __one_of: ["asc", "desc"] },
+        "*": { __one_of: ["asc", "desc"] }
       },
       "min_doc_count": 10,
       "script": {
@@ -91,9 +91,9 @@ var rules = {
       },
       "include": ".*",
       "exclude": ".*",
-      "execution_hint": {__one_of: ["map", "global_ordinals", "global_ordinals_hash", "global_ordinals_low_cardinality"]},
-      "show_term_doc_count_error": {__one_of: [true, false]},
-      "collect_mode": {__one_of: ["depth_first", "breadth_first"]},
+      "execution_hint": { __one_of: ["map", "global_ordinals", "global_ordinals_hash", "global_ordinals_low_cardinality"] },
+      "show_term_doc_count_error": { __one_of: [true, false] },
+      "collect_mode": { __one_of: ["depth_first", "breadth_first"] },
       "missing": ""
     },
     "significant_terms": {
@@ -105,22 +105,22 @@ var rules = {
       "shard_size": 10,
       "shard_min_doc_count": 10,
       "min_doc_count": 10,
-      "include": {__one_of: ["*", {pattern: "", flags: ""}]},
-      "exclude": {__one_of: ["*", {pattern: "", flags: ""}]},
-      "execution_hint": {__one_of: ["map", "global_ordinals", "global_ordinals_hash"]},
+      "include": { __one_of: ["*", { pattern: "", flags: "" }] },
+      "exclude": { __one_of: ["*", { pattern: "", flags: "" }] },
+      "execution_hint": { __one_of: ["map", "global_ordinals", "global_ordinals_hash"] },
       "background_filter": {
         __scope_link: "GLOBAL.filter"
       },
       "mutual_information": {
-        "include_negatives": {__one_of: [true, false]}
+        "include_negatives": { __one_of: [true, false] }
       },
       "chi_square": {
-        "include_negatives": {__one_of: [true, false]},
-        "background_is_superset": {__one_of: [true, false]}
+        "include_negatives": { __one_of: [true, false] },
+        "background_is_superset": { __one_of: [true, false] }
       },
       "percentage": {},
       "gnd": {
-        "background_is_superset": {__one_of: [true, false]}
+        "background_is_superset": { __one_of: [true, false] }
       },
       "script_heuristic": {
         __template: {
@@ -135,14 +135,14 @@ var rules = {
       __template: {
         "field": "",
         "ranges": [
-          {"from": 50, "to": 100},
+          { "from": 50, "to": 100 },
         ]
       },
       "field": "{field}",
       "ranges": [
-        {"to": 50, "from": 100, "key": ""}
+        { "to": 50, "from": 100, "key": "" }
       ],
-      "keyed": {__one_of: [true, false]},
+      "keyed": { __one_of: [true, false] },
       "script": {
         // populated by a global rule
       }
@@ -151,15 +151,15 @@ var rules = {
       __template: {
         "field": "",
         "ranges": [
-          {"from": "now-10d/d", "to": "now"},
+          { "from": "now-10d/d", "to": "now" },
         ]
       },
       "field": "{field}",
       "format": "MM-yyy",
       "ranges": [
-        {"to": "", "from": "", "key": ""}
+        { "to": "", "from": "", "key": "" }
       ],
-      "keyed": {__one_of: [true, false]},
+      "keyed": { __one_of: [true, false] },
       "script": {
         // populated by a global rule
       }
@@ -168,15 +168,15 @@ var rules = {
       __template: {
         "field": "",
         "ranges": [
-          {"from": "10.0.0.5", "to": "10.0.0.10"},
+          { "from": "10.0.0.5", "to": "10.0.0.10" },
         ]
       },
       "field": "{field}",
       "format": "MM-yyy",
       "ranges": [
-        {"to": "", "from": "", "key": "", "mask": "10.0.0.127/25"}
+        { "to": "", "from": "", "key": "", "mask": "10.0.0.127/25" }
       ],
-      "keyed": {__one_of: [true, false]},
+      "keyed": { __one_of: [true, false] },
       "script": {
         // populated by a global rule
       }
@@ -193,11 +193,11 @@ var rules = {
         __template: {
           "_key": "asc"
         },
-        "_key": {__one_of: ["asc", "desc"]},
-        "_count": {__one_of: ["asc", "desc"]},
-        "*": {__one_of: ["asc", "desc"]}
+        "_key": { __one_of: ["asc", "desc"] },
+        "_count": { __one_of: ["asc", "desc"] },
+        "*": { __one_of: ["asc", "desc"] }
       },
-      "keyed": {__one_of: [true, false]},
+      "keyed": { __one_of: [true, false] },
       "missing": 0
     },
     "date_histogram": {
@@ -206,20 +206,20 @@ var rules = {
         "interval": "month"
       },
       "field": "{field}",
-      "interval": {__one_of: ["year", "quarter", "week", "day", "hour", "minute", "second"]},
+      "interval": { __one_of: ["year", "quarter", "week", "day", "hour", "minute", "second"] },
       "min_doc_count": 0,
       "order": {
         __template: {
           "_key": "asc"
         },
-        "_key": {__one_of: ["asc", "desc"]},
-        "_count": {__one_of: ["asc", "desc"]},
-        "*": {__one_of: ["asc", "desc"]}
+        "_key": { __one_of: ["asc", "desc"] },
+        "_count": { __one_of: ["asc", "desc"] },
+        "*": { __one_of: ["asc", "desc"] }
       },
-      "keyed": {__one_of: [true, false]},
+      "keyed": { __one_of: [true, false] },
       "pre_zone": "-01:00",
       "post_zone": "-01:00",
-      "pre_zone_adjust_large_interval": {__one_of: [true, false]},
+      "pre_zone_adjust_large_interval": { __one_of: [true, false] },
       "factor": 1000,
       "pre_offset": "1d",
       "post_offset": "1d",
@@ -230,18 +230,18 @@ var rules = {
     "geo_distance": {
       __template: {
         "field": "location",
-        "origin": {"lat": 52.3760, "lon": 4.894},
+        "origin": { "lat": 52.3760, "lon": 4.894 },
         "ranges": [
-          {"from": 100, "to": 300},
+          { "from": 100, "to": 300 },
         ]
       },
       "field": "{field}",
-      "origin": {"lat": 0.0, "lon": 0.0},
-      "unit": {__one_of: ["mi", "km", "in", "yd", "m", "cm", "mm"]},
+      "origin": { "lat": 0.0, "lon": 0.0 },
+      "unit": { __one_of: ["mi", "km", "in", "yd", "m", "cm", "mm"] },
       "ranges": [
-        {"from": 50, "to": 100}
+        { "from": 50, "to": 100 }
       ],
-      "distance_type": {__one_of: ["arc", "sloppy_arc", "plane"]}
+      "distance_type": { __one_of: ["arc", "sloppy_arc", "plane"] }
 
     },
     "geohash_grid": {
@@ -250,7 +250,7 @@ var rules = {
         "precision": 3
       },
       "field": "{field}",
-      "precision": {__one_of: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]},
+      "precision": { __one_of: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] },
       "size": 10,
       "shard_size": 10
     },
@@ -269,7 +269,7 @@ var rules = {
         // populated by a global rule
       },
       "compression": 100,
-      "method": {__one_of: ["hdr", "tdigest"]},
+      "method": { __one_of: ["hdr", "tdigest"] },
       missing: 0
     },
     "cardinality": {
@@ -311,7 +311,7 @@ var rules = {
         field: ""
       },
       field: "{field}",
-      wrap_longitude: {__one_of: [true, false]}
+      wrap_longitude: { __one_of: [true, false] }
     },
     "top_hits": {
       __template: {
@@ -324,7 +324,7 @@ var rules = {
         __scope_link: "_search.sort"
       },
       highlight: {},
-      explain: {__one_of: [true, false]},
+      explain: { __one_of: [true, false] },
       _source: {
         __template: "",
         __scope_link: "_search._source"
@@ -333,7 +333,7 @@ var rules = {
         __scope_link: "_search.script_fields"
       },
       docvalue_fields: ["{field}"],
-      version: {__one_of: [true, false]}
+      version: { __one_of: [true, false] }
     },
     "percentile_ranks": {
       __template: {
@@ -346,7 +346,7 @@ var rules = {
         // populated by a global rule
       },
       "compression": 100,
-      "method": {__one_of: ["hdr", "tdigest"]},
+      "method": { __one_of: ["hdr", "tdigest"] },
       missing: 0
     },
     "sampler": {
@@ -357,7 +357,7 @@ var rules = {
       },
       "shard_size": 100,
       "max_docs_per_value": 3,
-      "execution_hint": {__one_of: ["map", "global_ordinals", "bytes_hash"]}
+      "execution_hint": { __one_of: ["map", "global_ordinals", "bytes_hash"] }
     },
     "children": {
       __template: {
@@ -378,9 +378,9 @@ var rules = {
       format: "",
       gap_policy: gap_policy,
       "window": 5,
-      model: {__one_of: ["simple", "linear", "ewma", "holt", "holt_winters"]},
+      model: { __one_of: ["simple", "linear", "ewma", "holt", "holt_winters"] },
       settings: {
-        type: {__one_of: ["add", "mult"]},
+        type: { __one_of: ["add", "mult"] },
         alpha: 0.5,
         beta: 0.5,
         gamma: 0.5,
diff --git a/src/core_plugins/console/api_server/es_5_0/aliases.js b/src/core_plugins/console/api_server/es_5_0/aliases.js
index 832a1ed8a3ae0..c17dee4aa0bd7 100644
--- a/src/core_plugins/console/api_server/es_5_0/aliases.js
+++ b/src/core_plugins/console/api_server/es_5_0/aliases.js
@@ -7,7 +7,7 @@ module.exports = function (api) {
     data_autocomplete_rules: {
       'actions': {
         __template: [
-          {'add': {'index': 'test1', 'alias': 'alias1'}}
+          { 'add': { 'index': 'test1', 'alias': 'alias1' } }
         ],
         __any_of: [
           {
diff --git a/src/core_plugins/console/api_server/es_5_0/cat.js b/src/core_plugins/console/api_server/es_5_0/cat.js
index af8a496d63e4e..0da08cd066e0c 100644
--- a/src/core_plugins/console/api_server/es_5_0/cat.js
+++ b/src/core_plugins/console/api_server/es_5_0/cat.js
@@ -1,7 +1,7 @@
 let _ = require("lodash");
 
 function addSimpleCat(endpoint, api, params, patterns) {
-  var url_params = {"help": "__flag__", "v": "__flag__", "bytes": ["b"]};
+  var url_params = { "help": "__flag__", "v": "__flag__", "bytes": ["b"] };
   _.each(params || [], function (p) {
     if (_.isString(p)) {
       url_params[p] = "__flag__";
@@ -37,10 +37,10 @@ module.exports = function (api) {
   addSimpleCat('_cat/allocation', api, null, ['_cat/allocation', '_cat/allocation/{nodes}']);
   addSimpleCat('_cat/count', api);
   addSimpleCat('_cat/health', api, [
-    {"ts": ["false", "true"]}
+    { "ts": ["false", "true"] }
   ]);
   addSimpleCat('_cat/indices', api, [
-      {h: []},
+      { h: [] },
       "pri",
     ],
     ['_cat/indices', '_cat/indices/{indices}']);
diff --git a/src/core_plugins/console/api_server/es_5_0/cluster.js b/src/core_plugins/console/api_server/es_5_0/cluster.js
index a6519e81ed6e4..a29e45c6e1db2 100644
--- a/src/core_plugins/console/api_server/es_5_0/cluster.js
+++ b/src/core_plugins/console/api_server/es_5_0/cluster.js
@@ -38,11 +38,11 @@ module.exports = function (api) {
       persistent: {
         cluster: {
           routing: {
-            'allocation.enable': {__one_of: ["all", "primaries", "new_primaries", "none"]},
-            'allocation.disk.threshold_enabled': {__one_of: [false, true]},
+            'allocation.enable': { __one_of: ["all", "primaries", "new_primaries", "none"] },
+            'allocation.disk.threshold_enabled': { __one_of: [false, true] },
             'allocation.disk.watermark.low': '85%',
             'allocation.disk.watermark.high': '90%',
-            'allocation.disk.include_relocations': {__one_of: [true, false]},
+            'allocation.disk.include_relocations': { __one_of: [true, false] },
             'allocation.disk.reroute_interval': '60s',
             'allocation.exclude': {
               '_ip': "",
@@ -68,11 +68,11 @@ module.exports = function (api) {
                 'values': []
               }
             },
-            'allocation.allow_rebalance': {__one_of: ['always', 'indices_primaries_active', 'indices_all_active']},
+            'allocation.allow_rebalance': { __one_of: ['always', 'indices_primaries_active', 'indices_all_active'] },
             'allocation.cluster_concurrent_rebalance': 2,
             'allocation.node_initial_primaries_recoveries': 4,
             'allocation.node_concurrent_recoveries': 2,
-            'allocation.same_shard.host': {__one_of: [false, true]}
+            'allocation.same_shard.host': { __one_of: [false, true] }
           }
         },
         indices: {
@@ -121,7 +121,7 @@ module.exports = function (api) {
             index: "{index}",
             shard: 0,
             node: "{node}",
-            allow_primary: {__one_of: [true, false]}
+            allow_primary: { __one_of: [true, false] }
           },
           allocate: {
             __template: {
@@ -132,11 +132,11 @@ module.exports = function (api) {
             index: "{index}",
             shard: 0,
             node: "{node}",
-            allow_primary: {__one_of: [true, false]}
+            allow_primary: { __one_of: [true, false] }
           }
         }
       ],
-      dry_run: {__one_of: [true, false]}
+      dry_run: { __one_of: [true, false] }
     }
   });
 };
diff --git a/src/core_plugins/console/api_server/es_5_0/document.js b/src/core_plugins/console/api_server/es_5_0/document.js
index caf36cb33a5ac..47762ef5b757e 100644
--- a/src/core_plugins/console/api_server/es_5_0/document.js
+++ b/src/core_plugins/console/api_server/es_5_0/document.js
@@ -114,7 +114,7 @@ module.exports = function (api) {
       },
       "doc": {},
       "upsert": {},
-      "scripted_upsert": {__one_of: [true, false]}
+      "scripted_upsert": { __one_of: [true, false] }
     }
 
   });
@@ -159,13 +159,13 @@ module.exports = function (api) {
       fields: [
         "{field}"
       ],
-      offsets: {__one_of: [false, true]},
-      payloads: {__one_of: [false, true]},
-      positions: {__one_of: [false, true]},
-      term_statistics: {__one_of: [true, false]},
-      field_statistics: {__one_of: [false, true]},
+      offsets: { __one_of: [false, true] },
+      payloads: { __one_of: [false, true] },
+      positions: { __one_of: [false, true] },
+      term_statistics: { __one_of: [true, false] },
+      field_statistics: { __one_of: [false, true] },
       per_field_analyzer: {
-        __template: {"FIELD": ""},
+        __template: { "FIELD": "" },
         "{field}": ""
       },
       routing: "",
@@ -206,14 +206,14 @@ module.exports = function (api) {
       fields: [
         "{field}"
       ],
-      offsets: {__one_of: [false, true]},
-      payloads: {__one_of: [false, true]},
-      positions: {__one_of: [false, true]},
-      term_statistics: {__one_of: [true, false]},
-      field_statistics: {__one_of: [false, true]},
-      dfs: {__one_of: [true, false]},
+      offsets: { __one_of: [false, true] },
+      payloads: { __one_of: [false, true] },
+      positions: { __one_of: [false, true] },
+      term_statistics: { __one_of: [true, false] },
+      field_statistics: { __one_of: [false, true] },
+      dfs: { __one_of: [true, false] },
       per_field_analyzer: {
-        __template: {"FIELD": ""},
+        __template: { "FIELD": "" },
         "{field}": ""
       },
       routing: "",
diff --git a/src/core_plugins/console/api_server/es_5_0/filter.js b/src/core_plugins/console/api_server/es_5_0/filter.js
index 877c0495fc40a..bcaae01055144 100644
--- a/src/core_plugins/console/api_server/es_5_0/filter.js
+++ b/src/core_plugins/console/api_server/es_5_0/filter.js
@@ -260,7 +260,7 @@ filters.range = {
     lt: 20,
     time_zone: "+1:00",
     "format": "dd/MM/yyyy||yyyy",
-    execution: {__one_of: ["index", "fielddata"]}
+    execution: { __one_of: ["index", "fielddata"] }
   }
 };
 
diff --git a/src/core_plugins/console/api_server/es_5_0/indices.js b/src/core_plugins/console/api_server/es_5_0/indices.js
index f65ee3d2fcc22..911ce48b950f5 100644
--- a/src/core_plugins/console/api_server/es_5_0/indices.js
+++ b/src/core_plugins/console/api_server/es_5_0/indices.js
@@ -108,7 +108,7 @@ module.exports = function (api) {
       tokenizer: "",
       char_filter: [],
       filter: [],
-      explain: {__one_of: [false, true]},
+      explain: { __one_of: [false, true] },
       attributes: []
     }
   });
diff --git a/src/core_plugins/console/api_server/es_5_0/mappings.js b/src/core_plugins/console/api_server/es_5_0/mappings.js
index 4bbfede64c5b9..93709de58657f 100644
--- a/src/core_plugins/console/api_server/es_5_0/mappings.js
+++ b/src/core_plugins/console/api_server/es_5_0/mappings.js
@@ -195,7 +195,7 @@ module.exports = function (api) {
               __scope_link: '_put_mapping.type.properties.field'
             }
           },
-          copy_to: {__one_of: ['{field}', ['{field}']]},
+          copy_to: { __one_of: ['{field}', ['{field}']] },
 
           // nested
           include_in_parent: BOOLEAN,
diff --git a/src/core_plugins/console/api_server/es_5_0/percolator.js b/src/core_plugins/console/api_server/es_5_0/percolator.js
index 7f100f34511a8..100a0889a8ada 100644
--- a/src/core_plugins/console/api_server/es_5_0/percolator.js
+++ b/src/core_plugins/console/api_server/es_5_0/percolator.js
@@ -38,7 +38,7 @@ module.exports = function (api) {
       query: {},
       filter: {},
       size: 10,
-      track_scores: {__one_of: [true, false]},
+      track_scores: { __one_of: [true, false] },
       sort: "_score",
       aggs: {},
       highlight: {}
@@ -64,7 +64,7 @@ module.exports = function (api) {
       query: {},
       filter: {},
       size: 10,
-      track_scores: {__one_of: [true, false]},
+      track_scores: { __one_of: [true, false] },
       sort: "_score",
       aggs: {},
       highlight: {}
diff --git a/src/core_plugins/console/api_server/es_5_0/query.js b/src/core_plugins/console/api_server/es_5_0/query.js
index 99e35f3a8110b..2b4d2ee48d7ba 100644
--- a/src/core_plugins/console/api_server/es_5_0/query.js
+++ b/src/core_plugins/console/api_server/es_5_0/query.js
@@ -120,7 +120,7 @@ module.exports = function (api) {
         __one_of: [true, false]
       },
       tie_breaker: 0.0,
-      type: {__one_of: ['best_fields', 'most_fields', 'cross_fields', 'phrase', 'phrase_prefix']}
+      type: { __one_of: ['best_fields', 'most_fields', 'cross_fields', 'phrase', 'phrase_prefix'] }
     },
     bool: {
       must: [
@@ -321,12 +321,12 @@ module.exports = function (api) {
       },
       query: "",
       fields: ["{field}"],
-      default_operator: {__one_of: ["OR", "AND"]},
+      default_operator: { __one_of: ["OR", "AND"] },
       analyzer: "",
       flags: "OR|AND|PREFIX",
-      lowercase_expanded_terms: {__one_of: [true, false]},
+      lowercase_expanded_terms: { __one_of: [true, false] },
       locale: "ROOT",
-      lenient: {__one_of: [true, false]}
+      lenient: { __one_of: [true, false] }
     },
     range: {
       __template: {
@@ -606,8 +606,8 @@ module.exports = function (api) {
           )
         ],
         boost: 1.0,
-        boost_mode: {__one_of: ["multiply", "replace", "sum", "avg", "max", "min"]},
-        score_mode: {__one_of: ["multiply", "sum", "first", "avg", "max", "min"]},
+        boost_mode: { __one_of: ["multiply", "replace", "sum", "avg", "max", "min"] },
+        score_mode: { __one_of: ["multiply", "sum", "first", "avg", "max", "min"] },
         max_boost: 10,
         min_score: 1.0
       },
diff --git a/src/core_plugins/console/api_server/es_5_0/search.js b/src/core_plugins/console/api_server/es_5_0/search.js
index db5efcf6b24ec..c2f1e7f72f6a2 100644
--- a/src/core_plugins/console/api_server/es_5_0/search.js
+++ b/src/core_plugins/console/api_server/es_5_0/search.js
@@ -112,9 +112,9 @@ module.exports = function (api) {
                   ""
                 ]
               },
-              distance_type: {__one_of: ["sloppy_arc", "arc", "plane"]},
-              sort_mode: {__one_of: ["min", "max", "avg"]},
-              order: {__one_of: ["asc", "desc"]},
+              distance_type: { __one_of: ["sloppy_arc", "arc", "plane"] },
+              sort_mode: { __one_of: ["min", "max", "avg"] },
+              order: { __one_of: ["asc", "desc"] },
               unit: "km"
             }
           }
@@ -173,7 +173,7 @@ module.exports = function (api) {
       },
       stats: [''],
       timeout: "1s",
-      version: {__one_of: [true, false]}
+      version: { __one_of: [true, false] }
     }
   });
 
@@ -187,8 +187,8 @@ module.exports = function (api) {
     data_autocomplete_rules: {
       "template": {
         __one_of: [
-          {__scope_link: "_search"},
-          {__scope_link: "GLOBAL.script"}
+          { __scope_link: "_search" },
+          { __scope_link: "GLOBAL.script" }
         ]
       },
       "params": {}
@@ -202,8 +202,8 @@ module.exports = function (api) {
     ],
     data_autocomplete_rules: {
       __one_of: [
-        {"inline": {__scope_link: "_search"}},
-        {__scope_link: "GLOBAL.script"}
+        { "inline": { __scope_link: "_search" } },
+        { __scope_link: "GLOBAL.script" }
       ],
       "params": {}
     }
diff --git a/src/core_plugins/console/api_server/es_5_0/snapshot_restore.js b/src/core_plugins/console/api_server/es_5_0/snapshot_restore.js
index 4e681ea23cbd6..48dd04088e09c 100644
--- a/src/core_plugins/console/api_server/es_5_0/snapshot_restore.js
+++ b/src/core_plugins/console/api_server/es_5_0/snapshot_restore.js
@@ -9,7 +9,7 @@ module.exports = function (api) {
     },
     data_autocomplete_rules: {
       indices: "*",
-      ignore_unavailable: {__one_of: [true, false]},
+      ignore_unavailable: { __one_of: [true, false] },
       include_global_state: false,
       rename_pattern: "index_(.+)",
       rename_replacement: "restored_index_$1"
@@ -41,9 +41,9 @@ module.exports = function (api) {
     },
     data_autocomplete_rules: {
       indices: "*",
-      ignore_unavailable: {__one_of: [true, false]},
-      include_global_state: {__one_of: [true, false]},
-      partial: {__one_of: [true, false]}
+      ignore_unavailable: { __one_of: [true, false] },
+      include_global_state: { __one_of: [true, false] },
+      partial: { __one_of: [true, false] }
     }
   });
 
@@ -57,36 +57,13 @@ module.exports = function (api) {
   });
 
 
-  function getRepositoryType(context, editor) {
-    var iter = editor.iterForCurrentLoc();
-    // for now just iterate back to the first "type" key
-    var t = iter.getCurrentToken();
-    var type;
-    while (t && t.type.indexOf("url") < 0) {
-      if (t.type === 'variable' && t.value === '"type"') {
-        t = editor.parser.nextNonEmptyToken(iter);
-        if (!t || t.type !== "punctuation.colon") {
-          // weird place to be in, but safe choice..
-          break;
-        }
-        t = editor.parser.nextNonEmptyToken(iter);
-        if (t && t.type === "string") {
-          type = t.value.replace(/"/g, '');
-        }
-        break;
-      }
-      t = editor.parser.prevNonEmptyToken(iter);
-    }
-    return type;
-  }
-
   api.addEndpointDescription('put_repository', {
     methods: ['PUT'],
     patterns: [
       '_snapshot/{id}'
     ],
     data_autocomplete_rules: {
-      __template: {"type": ""},
+      __template: { "type": "" },
 
       "type": {
         __one_of: ["fs", "url", "s3", "hdfs"]
@@ -101,7 +78,7 @@ module.exports = function (api) {
             location: "path"
           },
           location: "path",
-          compress: {__one_of: [true, false]},
+          compress: { __one_of: [true, false] },
           concurrent_streams: 5,
           chunk_size: "10m",
           max_restore_bytes_per_sec: "20mb",
@@ -129,7 +106,7 @@ module.exports = function (api) {
             base_path: "",
             concurrent_streams: 5,
             chunk_size: "10m",
-            compress: {__one_of: [true, false]}
+            compress: { __one_of: [true, false] }
           },
           {// hdfs
             __condition: {
@@ -140,10 +117,10 @@ module.exports = function (api) {
             },
             uri: "",
             path: "some/path",
-            load_defaults: {__one_of: [true, false]},
+            load_defaults: { __one_of: [true, false] },
             conf_location: "cfg.xml",
             concurrent_streams: 5,
-            compress: {__one_of: [true, false]},
+            compress: { __one_of: [true, false] },
             chunk_size: "10m"
           }
         ]
diff --git a/src/core_plugins/console/api_server/es_5_0/templates.js b/src/core_plugins/console/api_server/es_5_0/templates.js
index 635256c3f6985..5646be3e4e252 100644
--- a/src/core_plugins/console/api_server/es_5_0/templates.js
+++ b/src/core_plugins/console/api_server/es_5_0/templates.js
@@ -19,9 +19,9 @@ module.exports = function (api) {
     ],
     data_autocomplete_rules: {
       template: 'index*',
-      warmers: {__scope_link: '_warmer'},
-      mappings: {__scope_link: '_put_mapping'},
-      settings: {__scope_link: '_put_settings'}
+      warmers: { __scope_link: '_warmer' },
+      mappings: { __scope_link: '_put_mapping' },
+      settings: { __scope_link: '_put_settings' }
     }
   });
 };
diff --git a/src/core_plugins/console/index.js b/src/core_plugins/console/index.js
index 3f1438ee915f5..9fa9cff9d7174 100644
--- a/src/core_plugins/console/index.js
+++ b/src/core_plugins/console/index.js
@@ -7,7 +7,6 @@ module.exports = function (kibana) {
   let modules = resolve(__dirname, 'public/webpackShims/');
   let src = resolve(__dirname, 'public/src/');
   let { existsSync } = require('fs');
-  const { startsWith, endsWith } = require('lodash');
 
   const apps = [];
 
@@ -112,7 +111,7 @@ module.exports = function (kibana) {
               done(null, uri, filterHeaders(request.headers, requestHeadersWhitelist))
             },
             xforward: true,
-            onResponse(err, res, request, reply, settings, ttl) {
+            onResponse(err, res, request, reply) {
               if (err != null) {
                 reply("Error connecting to '" + uri + "':\n\n" + err.message).type("text/plain").statusCode = 502;
               } else {
@@ -151,7 +150,7 @@ module.exports = function (kibana) {
         method: ['GET', 'POST'],
         handler: function (req, reply) {
           let server = require('./api_server/server');
-          let {sense_version, apis} = req.query;
+          let { sense_version, apis } = req.query;
           if (!apis) {
             reply(Boom.badRequest('"apis" is a required param.'));
             return;
diff --git a/src/core_plugins/console/public/src/app.js b/src/core_plugins/console/public/src/app.js
index aa3f098663279..4558fe41a83c4 100644
--- a/src/core_plugins/console/public/src/app.js
+++ b/src/core_plugins/console/public/src/app.js
@@ -1,10 +1,7 @@
 var $ = require('jquery');
 
-let curl = require('./curl');
 let history = require('./history');
 let mappings = require('./mappings');
-let es = require('./es');
-let _ = require('lodash');
 
 export default function init(input, output, sourceLocation = 'stored') {
   $(document.body).removeClass('fouc');
@@ -30,9 +27,9 @@ export default function init(input, output, sourceLocation = 'stored') {
       }
     }
     else if (/^https?:\/\//.test(sourceLocation)) {
-      var loadFrom = {url: sourceLocation, dataType: "text", kbnXsrfToken: false};
+      var loadFrom = { url: sourceLocation, dataType: "text", kbnXsrfToken: false };
       if (/https?:\/\/api.github.com/.test(sourceLocation)) {
-        loadFrom.headers = {Accept: "application/vnd.github.v3.raw"};
+        loadFrom.headers = { Accept: "application/vnd.github.v3.raw" };
       }
       $.ajax(loadFrom).done(function (data) {
         resetToValues(data);
@@ -51,7 +48,7 @@ export default function init(input, output, sourceLocation = 'stored') {
     var timer;
     var saveDelay = 500;
 
-    input.getSession().on("change", function onChange(e) {
+    input.getSession().on("change", function onChange() {
       if (timer) {
         timer = clearTimeout(timer);
       }
@@ -110,4 +107,4 @@ export default function init(input, output, sourceLocation = 'stored') {
   loadSavedState();
   setupAutosave();
   mappings.retrieveAutocompleteInfoFromServer();
-};
+}
diff --git a/src/core_plugins/console/public/src/autocomplete.js b/src/core_plugins/console/public/src/autocomplete.js
index 9eb83f4ad6574..d52087cb5d8b6 100644
--- a/src/core_plugins/console/public/src/autocomplete.js
+++ b/src/core_plugins/console/public/src/autocomplete.js
@@ -1,12 +1,9 @@
-let history = require('./history');
 let kb = require('./kb');
-let mappings = require('./mappings');
 let ace = require('ace');
 let utils = require('./utils');
 let autocomplete_engine = require('./autocomplete/engine');
 let url_pattern_matcher = require('./autocomplete/url_pattern_matcher');
 let _ = require('lodash');
-let ext_lang_tools = require('ace/ext-language_tools');
 
 
 var AceRange = ace.require('ace/range').Range;
@@ -76,23 +73,12 @@ module.exports = function (editor) {
   function addMetaToTermsList(list, meta, template) {
     return _.map(list, function (t) {
       if (typeof t !== "object") {
-        t = {name: t};
+        t = { name: t };
       }
-      return _.defaults(t, {meta: meta, template: template});
+      return _.defaults(t, { meta: meta, template: template });
     });
   }
 
-  function termToFilterRegex(term, prefix, suffix) {
-    if (!prefix) {
-      prefix = "";
-    }
-    if (!suffix) {
-      suffix = "";
-    }
-
-    return new RegExp(prefix + term.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') + suffix, 'i');
-  }
-
   function applyTerm(term) {
     var session = editor.getSession();
 
@@ -165,13 +151,13 @@ module.exports = function (editor) {
       var nonEmptyToken = editor.parser.nextNonEmptyToken(tokenIter);
       switch (nonEmptyToken ? nonEmptyToken.type : "NOTOKEN") {
         case "paren.rparen":
-          newPos = {row: tokenIter.getCurrentTokenRow(), column: tokenIter.getCurrentTokenColumn()};
+          newPos = { row: tokenIter.getCurrentTokenRow(), column: tokenIter.getCurrentTokenColumn() };
           break;
         case "punctuation.colon":
           nonEmptyToken = editor.parser.nextNonEmptyToken(tokenIter);
           if ((nonEmptyToken || {}).type == "paren.lparen") {
             nonEmptyToken = editor.parser.nextNonEmptyToken(tokenIter);
-            newPos = {row: tokenIter.getCurrentTokenRow(), column: tokenIter.getCurrentTokenColumn()};
+            newPos = { row: tokenIter.getCurrentTokenRow(), column: tokenIter.getCurrentTokenColumn() };
             if (nonEmptyToken && nonEmptyToken.value.indexOf('"') === 0) {
               newPos.column++;
             } // don't stand on "
@@ -180,7 +166,7 @@ module.exports = function (editor) {
         case "paren.lparen":
         case "punctuation.comma":
           tokenIter.stepForward();
-          newPos = {row: tokenIter.getCurrentTokenRow(), column: tokenIter.getCurrentTokenColumn()};
+          newPos = { row: tokenIter.getCurrentTokenRow(), column: tokenIter.getCurrentTokenColumn() };
           break;
       }
       editor.moveCursorToPosition(newPos);
@@ -320,11 +306,10 @@ module.exports = function (editor) {
     //   - Nice token, broken before: {, "bla"
 
     var session = editor.getSession();
-    var insertingRelativeToToken;
 
     context.updatedForToken = _.clone(session.getTokenAt(pos.row, pos.column));
     if (!context.updatedForToken) {
-      context.updatedForToken = {value: "", start: pos.column};
+      context.updatedForToken = { value: "", start: pos.column };
     } // empty line
 
     var anchorToken = context.createdWithToken;
@@ -373,7 +358,7 @@ module.exports = function (editor) {
         break;
     }
 
-    context.textBoxPosition = {row: context.rangeToReplace.start.row, column: context.rangeToReplace.start.column};
+    context.textBoxPosition = { row: context.rangeToReplace.start.row, column: context.rangeToReplace.start.column };
 
     switch (context.autoCompleteType) {
       case "path":
@@ -511,9 +496,9 @@ module.exports = function (editor) {
     context.suffixToAdd = "";
   }
 
-  function addMethodAutoCompleteSetToContext(context, pos) {
+  function addMethodAutoCompleteSetToContext(context) {
     context.autoCompleteSet = _.map(["GET", "PUT", "POST", "DELETE", "HEAD"], function (m, i) {
-      return {name: m, score: -i, meta: "method"}
+      return { name: m, score: -i, meta: "method" }
     })
   }
 
@@ -601,7 +586,7 @@ module.exports = function (editor) {
   function getCurrentMethodAndTokenPaths(pos) {
     var tokenIter = editor.iterForPosition(pos.row, pos.column);
     var startPos = pos;
-    var bodyTokenPath = [], last_var = "", first_scope = true, ret = {};
+    var bodyTokenPath = [], ret = {};
 
     var STATES = {
       looking_for_key: 0, // looking for a key but without jumping over anything but white space and colon.
@@ -824,7 +809,7 @@ module.exports = function (editor) {
         LAST_EVALUATED_TOKEN = null;
         return;
       }
-      currentToken = {start: 0, value: ""}; // empty row
+      currentToken = { start: 0, value: "" }; // empty row
     }
 
     currentToken.row = pos.row; // extend token with row. Ace doesn't supply it by default
@@ -870,7 +855,7 @@ module.exports = function (editor) {
     editor.execCommand("startAutocomplete");
   }, 100);
 
-  function editorChangeListener(e) {
+  function editorChangeListener() {
     var cursor = editor.selection.lead;
     if (editor.__ace.completer && editor.__ace.completer.activated) {
       return;
@@ -955,8 +940,7 @@ module.exports = function (editor) {
   // Hook into Ace
 
   // disable standard context based autocompletion.
-  ace.define('ace/autocomplete/text_completer', ['require', 'exports', 'module'], function (require, exports,
-                                                                                            module) {
+  ace.define('ace/autocomplete/text_completer', ['require', 'exports', 'module'], function (require, exports) {
     exports.getCompletions = function (editor, session, pos, prefix, callback) {
       callback(null, []);
     }
diff --git a/src/core_plugins/console/public/src/autocomplete/body_completer.js b/src/core_plugins/console/public/src/autocomplete/body_completer.js
index a3891d320d787..82f3f233c16d3 100644
--- a/src/core_plugins/console/public/src/autocomplete/body_completer.js
+++ b/src/core_plugins/console/public/src/autocomplete/body_completer.js
@@ -1,5 +1,5 @@
-const _ = require('lodash');
-const engine = require('./engine');
+import _ from 'lodash';
+import engine from './engine';
 
 function CompilingContext(endpoint_id, parametrizedComponentFactories) {
   this.parametrizedComponentFactories = parametrizedComponentFactories;
@@ -97,7 +97,7 @@ function compileParametrizedValue(value, compilingContext, template) {
   }
   component = component(value, null, template);
   if (!_.isUndefined(template)) {
-    component = engine.wrapComponentWithDefaults(component, {template: template});
+    component = engine.wrapComponentWithDefaults(component, { template: template });
   }
   return component;
 
@@ -145,7 +145,7 @@ function compileList(listRule, compilingContext) {
 }
 
 /** takes a compiled object and wraps in a {@link ConditionalProxy }*/
-function compileCondition(description, compiledObject, compilingContext) {
+function compileCondition(description, compiledObject) {
   if (description.lines_regex) {
     return new ConditionalProxy(function (context, editor) {
       let lines = editor.getSession().getLines(context.requestStartRow, editor.getCursorPosition().row).join("\n");
@@ -169,7 +169,7 @@ function ObjectComponent(name, constants, patternsAndWildCards) {
 
 ObjectComponent.prototype = _.create(
   engine.AutocompleteComponent.prototype,
-  {'constructor': ObjectComponent});
+  { 'constructor': ObjectComponent });
 
 
 (function (cls) {
@@ -244,7 +244,7 @@ function ScopeResolver(link, compilingContext) {
 
 ScopeResolver.prototype = _.create(
   engine.SharedComponent.prototype,
-  {'constructor': ScopeResolver});
+  { 'constructor': ScopeResolver });
 
 
 (function (cls) {
@@ -316,7 +316,7 @@ function ConditionalProxy(predicate, delegate) {
 
 ConditionalProxy.prototype = _.create(
   engine.SharedComponent.prototype,
-  {'constructor': ConditionalProxy});
+  { 'constructor': ConditionalProxy });
 
 
 (function (cls) {
@@ -345,16 +345,16 @@ function GlobalOnlyComponent(name) {
 
 GlobalOnlyComponent.prototype = _.create(
   engine.AutocompleteComponent.prototype,
-  {'constructor': ObjectComponent});
+  { 'constructor': ObjectComponent });
 
 
 (function (cls) {
 
-  cls.getTerms = function (context, editor) {
+  cls.getTerms = function () {
     return null;
   };
 
-  cls.match = function (token, context, editor) {
+  cls.match = function (token, context) {
     var result = {
       next: []
     };
diff --git a/src/core_plugins/console/public/src/autocomplete/engine.js b/src/core_plugins/console/public/src/autocomplete/engine.js
index 31115d49cc0a0..dc88f6113d0e5 100644
--- a/src/core_plugins/console/public/src/autocomplete/engine.js
+++ b/src/core_plugins/console/public/src/autocomplete/engine.js
@@ -7,7 +7,7 @@ module.exports.AutocompleteComponent = function (name) {
 /** called to get the possible suggestions for tokens, when this object is at the end of
  * the resolving chain (and thus can suggest possible continuation paths)
  */
-module.exports.AutocompleteComponent.prototype.getTerms = function (context, editor) {
+module.exports.AutocompleteComponent.prototype.getTerms = function () {
   return [];
 };
 
@@ -21,7 +21,7 @@ module.exports.AutocompleteComponent.prototype.getTerms = function (context, edi
  priority: optional priority to solve collisions between multiple paths. Min value is used across entire chain
  }
  */
-module.exports.AutocompleteComponent.prototype.match = function (token, context, editor) {
+module.exports.AutocompleteComponent.prototype.match = function () {
   return {
     next: this.next
   };
@@ -39,7 +39,7 @@ function SharedComponent(name, parent) {
 
 SharedComponent.prototype = _.create(
   module.exports.AutocompleteComponent.prototype,
-  {'constructor': SharedComponent});
+  { 'constructor': SharedComponent });
 
 module.exports.SharedComponent = SharedComponent;
 
@@ -68,7 +68,7 @@ function ListComponent(name, list, parent, multi_valued, allow_non_valid_values)
   this.allow_non_valid_values = _.isUndefined(allow_non_valid_values) ? false : allow_non_valid_values;
 }
 
-ListComponent.prototype = _.create(SharedComponent.prototype, {"constructor": ListComponent});
+ListComponent.prototype = _.create(SharedComponent.prototype, { "constructor": ListComponent });
 module.exports.ListComponent = ListComponent;
 
 
@@ -88,16 +88,16 @@ module.exports.ListComponent = ListComponent;
       var meta = this.getDefaultTermMeta();
       ret = _.map(ret, function (term) {
         if (_.isString(term)) {
-          term = {"name": term};
+          term = { "name": term };
         }
-        return _.defaults(term, {meta: meta});
+        return _.defaults(term, { meta: meta });
       });
     }
 
     return ret;
   };
 
-  cls.validateTokens = function (tokens, context, editor) {
+  cls.validateTokens = function (tokens) {
     if (!this.multi_valued && tokens.length > 1) {
       return false;
     }
@@ -114,11 +114,11 @@ module.exports.ListComponent = ListComponent;
     return true;
   };
 
-  cls.getContextKey = function (context, editor) {
+  cls.getContextKey = function () {
     return this.name;
   };
 
-  cls.getDefaultTermMeta = function (context, editor) {
+  cls.getDefaultTermMeta = function () {
     return this.name;
   };
 
@@ -141,7 +141,7 @@ function SimpleParamComponent(name, parent) {
   SharedComponent.call(this, name, parent);
 }
 
-SimpleParamComponent.prototype = _.create(SharedComponent.prototype, {"constructor": SimpleParamComponent});
+SimpleParamComponent.prototype = _.create(SharedComponent.prototype, { "constructor": SimpleParamComponent });
 module.exports.SimpleParamComponent = SimpleParamComponent;
 
 (function (cls) {
@@ -162,7 +162,7 @@ function ConstantComponent(name, parent, options) {
   this.options = options || [name];
 }
 
-ConstantComponent.prototype = _.create(SharedComponent.prototype, {"constructor": ConstantComponent});
+ConstantComponent.prototype = _.create(SharedComponent.prototype, { "constructor": ConstantComponent });
 module.exports.ConstantComponent = ConstantComponent;
 
 (function (cls) {
@@ -207,7 +207,7 @@ module.exports.wrapComponentWithDefaults = function (component, defaults) {
     }
     result = _.map(result, function (term) {
       if (!_.isObject(term)) {
-        term = {name: term};
+        term = { name: term };
       }
       return _.defaults(term, defaults);
     }, this);
@@ -320,7 +320,7 @@ module.exports.populateContext = function (tokenPath, context, editor, includeAu
       _.each(ws.components, function (component) {
         _.each(component.getTerms(contextForState, editor), function (term) {
           if (!_.isObject(term)) {
-            term = {name: term};
+            term = { name: term };
           }
           autoCompleteSet.push(term);
         });
diff --git a/src/core_plugins/console/public/src/autocomplete/url_params.js b/src/core_plugins/console/public/src/autocomplete/url_params.js
index 7a0b77151b60b..7e414c3c04b12 100644
--- a/src/core_plugins/console/public/src/autocomplete/url_params.js
+++ b/src/core_plugins/console/public/src/autocomplete/url_params.js
@@ -6,12 +6,12 @@ function ParamComponent(name, parent, description) {
   this.description = description;
 }
 
-ParamComponent.prototype = _.create(engine.ConstantComponent.prototype, {"constructor": ParamComponent});
+ParamComponent.prototype = _.create(engine.ConstantComponent.prototype, { "constructor": ParamComponent });
 module.exports.ParamComponent = ParamComponent;
 
 (function (cls) {
   cls.getTerms = function () {
-    var t = {name: this.name};
+    var t = { name: this.name };
     if (this.description === "__flag__") {
       t.meta = "flag"
     }
@@ -37,7 +37,7 @@ function UrlParams(description, defaults) {
   description = _.clone(description || {});
   _.defaults(description, defaults);
   _.each(description, function (p_description, param) {
-    var values, component;
+    var component;
     component = new ParamComponent(param, this.rootComponent, p_description);
     if (_.isArray(p_description)) {
       values = new engine.ListComponent(param, p_description, component);
diff --git a/src/core_plugins/console/public/src/autocomplete/url_pattern_matcher.js b/src/core_plugins/console/public/src/autocomplete/url_pattern_matcher.js
index 1ff1e136b13da..7a20b49d6d443 100644
--- a/src/core_plugins/console/public/src/autocomplete/url_pattern_matcher.js
+++ b/src/core_plugins/console/public/src/autocomplete/url_pattern_matcher.js
@@ -9,7 +9,7 @@ function AcceptEndpointComponent(endpoint, parent) {
   this.endpoint = endpoint
 }
 
-AcceptEndpointComponent.prototype = _.create(engine.SharedComponent.prototype, {"constructor": AcceptEndpointComponent});
+AcceptEndpointComponent.prototype = _.create(engine.SharedComponent.prototype, { "constructor": AcceptEndpointComponent });
 
 (function (cls) {
 
diff --git a/src/core_plugins/console/public/src/curl.js b/src/core_plugins/console/public/src/curl.js
index 7cfa4d282a6c2..881039fd869ef 100644
--- a/src/core_plugins/console/public/src/curl.js
+++ b/src/core_plugins/console/public/src/curl.js
@@ -1,217 +1,214 @@
-define(function () {
-  'use strict';
+'use strict';
 
-  function detectCURLinLine(line) {
-    // returns true if text matches a curl request
-    return line.match(/^\s*?curl\s+(-X[A-Z]+)?\s*['"]?.*?['"]?(\s*$|\s+?-d\s*?['"])/);
+function detectCURLinLine(line) {
+  // returns true if text matches a curl request
+  return line.match(/^\s*?curl\s+(-X[A-Z]+)?\s*['"]?.*?['"]?(\s*$|\s+?-d\s*?['"])/);
 
-  }
+}
 
-  function detectCURL(text) {
-    // returns true if text matches a curl request
-    if (!text) return false;
-    for (var line of text.split("\n")) {
-      if (detectCURLinLine(line)) {
-        return true;
-      }
+function detectCURL(text) {
+  // returns true if text matches a curl request
+  if (!text) return false;
+  for (var line of text.split("\n")) {
+    if (detectCURLinLine(line)) {
+      return true;
     }
-    return false;
+  }
+  return false;
+}
+
+function parseCURL(text) {
+  var state = 'NONE';
+  var out = [];
+  var body = [];
+  var line = '';
+  var lines = text.trim().split("\n");
+  var matches;
+
+  var EmptyLine = /^\s*$/;
+  var Comment = /^\s*(?:#|\/{2,})(.*)\n?$/;
+  var ExecutionComment = /^\s*#!/;
+  var ClosingSingleQuote = /^([^']*)'/;
+  var ClosingDoubleQuote = /^((?:[^\\"]|\\.)*)"/;
+  var EscapedQuotes = /^((?:[^\\"']|\\.)+)/;
+
+  var LooksLikeCurl = /^\s*curl\s+/;
+  var CurlVerb = /-X ?(GET|HEAD|POST|PUT|DELETE)/;
+
+  var HasProtocol = /[\s"']https?:\/\//;
+  var CurlRequestWithProto = /[\s"']https?:\/\/[^\/ ]+\/+([^\s"']+)/;
+  var CurlRequestWithoutProto = /[\s"'][^\/ ]+\/+([^\s"']+)/;
+  var CurlData = /^.+\s(--data|-d)\s*/;
+  var SenseLine = /^\s*(GET|HEAD|POST|PUT|DELETE)\s+\/?(.+)/;
+
+  if (lines.length > 0 && ExecutionComment.test(lines[0])) {
+    lines.shift();
   }
 
-  function parseCURL(text) {
-    var state = 'NONE';
-    var out = [];
-    var body = [];
-    var line = '';
-    var lines = text.trim().split("\n");
-    var matches;
-
-    var EmptyLine = /^\s*$/;
-    var Comment = /^\s*(?:#|\/{2,})(.*)\n?$/;
-    var ExecutionComment = /^\s*#!/;
-    var ClosingSingleQuote = /^([^']*)'/;
-    var ClosingDoubleQuote = /^((?:[^\\"]|\\.)*)"/;
-    var EscapedQuotes = /^((?:[^\\"']|\\.)+)/;
-
-    var LooksLikeCurl = /^\s*curl\s+/;
-    var CurlVerb = /-X ?(GET|HEAD|POST|PUT|DELETE)/;
+  function nextLine() {
+    if (line.length > 0) {
+      return true;
+    }
+    if (lines.length == 0) {
+      return false;
+    }
+    line = lines.shift().replace(/[\r\n]+/g, "\n") + "\n";
+    return true;
+  }
 
-    var HasProtocol = /[\s"']https?:\/\//;
-    var CurlRequestWithProto = /[\s"']https?:\/\/[^\/ ]+\/+([^\s"']+)/;
-    var CurlRequestWithoutProto = /[\s"'][^\/ ]+\/+([^\s"']+)/;
-    var CurlData = /^.+\s(--data|-d)\s*/;
-    var SenseLine = /^\s*(GET|HEAD|POST|PUT|DELETE)\s+\/?(.+)/;
+  function unescapeLastBodyEl() {
+    var str = body.pop().replace(/\\([\\"'])/g, "$1");
+    body.push(str);
+  }
 
-    if (lines.length > 0 && ExecutionComment.test(lines[0])) {
-      lines.shift();
+  // Is the next char a single or double quote?
+  // If so remove it
+  function detectQuote() {
+    if (line.substr(0, 1) == "'") {
+      line = line.substr(1);
+      state = 'SINGLE_QUOTE';
     }
-
-    function nextLine() {
-      if (line.length > 0) {
-        return true;
-      }
-      if (lines.length == 0) {
-        return false;
-      }
-      line = lines.shift().replace(/[\r\n]+/g, "\n") + "\n";
-      return true;
+    else if (line.substr(0, 1) == '"') {
+      line = line.substr(1);
+      state = 'DOUBLE_QUOTE';
     }
-
-    function unescapeLastBodyEl() {
-      var str = body.pop().replace(/\\([\\"'])/g, "$1");
-      body.push(str);
+    else {
+      state = 'UNQUOTED';
     }
+  }
 
-    // Is the next char a single or double quote?
-    // If so remove it
-    function detectQuote() {
-      if (line.substr(0, 1) == "'") {
-        line = line.substr(1);
-        state = 'SINGLE_QUOTE';
-      }
-      else if (line.substr(0, 1) == '"') {
-        line = line.substr(1);
-        state = 'DOUBLE_QUOTE';
-      }
-      else {
-        state = 'UNQUOTED';
-      }
+  // Body is finished - append to output with final LF
+  function addBodyToOut() {
+    if (body.length > 0) {
+      out.push(body.join(""));
+      body = [];
     }
+    state = 'LF';
+    out.push("\n");
+  }
 
-    // Body is finished - append to output with final LF
-    function addBodyToOut() {
-      if (body.length > 0) {
-        out.push(body.join(""));
-        body = [];
-      }
-      state = 'LF';
-      out.push("\n");
-    }
-
-    // If the pattern matches, then the state is about to change,
-    // so add the capture to the body and detect the next state
-    // Otherwise add the whole line
-    function consumeMatching(pattern) {
-      var matches = line.match(pattern);
-      if (matches) {
-        body.push(matches[1]);
-        line = line.substr(matches[0].length);
-        detectQuote();
-      }
-      else {
-        body.push(line);
-        line = '';
-      }
+  // If the pattern matches, then the state is about to change,
+  // so add the capture to the body and detect the next state
+  // Otherwise add the whole line
+  function consumeMatching(pattern) {
+    var matches = line.match(pattern);
+    if (matches) {
+      body.push(matches[1]);
+      line = line.substr(matches[0].length);
+      detectQuote();
+    }
+    else {
+      body.push(line);
+      line = '';
     }
+  }
 
-    function parseCurlLine() {
-      var verb = 'GET';
-      var request = '';
-      var matches;
-      if (matches = line.match(CurlVerb)) {
-        verb = matches[1];
-      }
+  function parseCurlLine() {
+    var verb = 'GET';
+    var request = '';
+    var matches;
+    if (matches = line.match(CurlVerb)) {
+      verb = matches[1];
+    }
 
-      // JS regexen don't support possesive quantifiers, so
-      // we need two distinct patterns
-      var pattern = HasProtocol.test(line)
-        ? CurlRequestWithProto
-        : CurlRequestWithoutProto;
+    // JS regexen don't support possesive quantifiers, so
+    // we need two distinct patterns
+    var pattern = HasProtocol.test(line)
+      ? CurlRequestWithProto
+      : CurlRequestWithoutProto;
 
-      if (matches = line.match(pattern)) {
-        request = matches[1];
-      }
+    if (matches = line.match(pattern)) {
+      request = matches[1];
+    }
 
-      out.push(verb + ' /' + request + "\n");
+    out.push(verb + ' /' + request + "\n");
 
-      if (matches = line.match(CurlData)) {
-        line = line.substr(matches[0].length);
-        detectQuote();
-        if (EmptyLine.test(line)) {
-          line = '';
-        }
-      }
-      else {
-        state = 'NONE';
+    if (matches = line.match(CurlData)) {
+      line = line.substr(matches[0].length);
+      detectQuote();
+      if (EmptyLine.test(line)) {
         line = '';
-        out.push('');
       }
     }
+    else {
+      state = 'NONE';
+      line = '';
+      out.push('');
+    }
+  }
 
-    while (nextLine()) {
+  while (nextLine()) {
 
-      if (state == 'SINGLE_QUOTE') {
-        consumeMatching(ClosingSingleQuote);
-      }
+    if (state == 'SINGLE_QUOTE') {
+      consumeMatching(ClosingSingleQuote);
+    }
 
-      else if (state == 'DOUBLE_QUOTE') {
-        consumeMatching(ClosingDoubleQuote);
+    else if (state == 'DOUBLE_QUOTE') {
+      consumeMatching(ClosingDoubleQuote);
+      unescapeLastBodyEl();
+    }
+
+    else if (state == 'UNQUOTED') {
+      consumeMatching(EscapedQuotes);
+      if (body.length) {
         unescapeLastBodyEl();
       }
-
-      else if (state == 'UNQUOTED') {
-        consumeMatching(EscapedQuotes);
-        if (body.length) {
-          unescapeLastBodyEl();
-        }
-        if (state == 'UNQUOTED') {
-          addBodyToOut();
-          line = ''
-        }
+      if (state == 'UNQUOTED') {
+        addBodyToOut();
+        line = ''
       }
+    }
 
-      // the BODY state (used to match the body of a Sense request)
-      // can be terminated early if it encounters
-      // a comment or an empty line
-      else if (state == 'BODY') {
-        if (Comment.test(line) || EmptyLine.test(line)) {
-          addBodyToOut();
-        }
-        else {
-          body.push(line);
-          line = '';
-        }
+    // the BODY state (used to match the body of a Sense request)
+    // can be terminated early if it encounters
+    // a comment or an empty line
+    else if (state == 'BODY') {
+      if (Comment.test(line) || EmptyLine.test(line)) {
+        addBodyToOut();
       }
-
-      else if (EmptyLine.test(line)) {
-        if (state != 'LF') {
-          out.push("\n");
-          state = 'LF';
-        }
+      else {
+        body.push(line);
         line = '';
       }
+    }
 
-      else if (matches = line.match(Comment)) {
-        out.push("#" + matches[1] + "\n");
-        state = 'NONE';
-        line = '';
+    else if (EmptyLine.test(line)) {
+      if (state != 'LF') {
+        out.push("\n");
+        state = 'LF';
       }
+      line = '';
+    }
 
-      else if (LooksLikeCurl.test(line)) {
-        parseCurlLine();
-      }
+    else if (matches = line.match(Comment)) {
+      out.push("#" + matches[1] + "\n");
+      state = 'NONE';
+      line = '';
+    }
 
-      else if (matches = line.match(SenseLine)) {
-        out.push(matches[1] + ' /' + matches[2] + "\n");
-        line = '';
-        state = 'BODY';
-      }
+    else if (LooksLikeCurl.test(line)) {
+      parseCurlLine();
+    }
 
-      // Nothing else matches, so output with a prefix of !!! for debugging purposes
-      else {
-        out.push('### ' + line);
-        line = '';
-      }
+    else if (matches = line.match(SenseLine)) {
+      out.push(matches[1] + ' /' + matches[2] + "\n");
+      line = '';
+      state = 'BODY';
     }
 
-    addBodyToOut();
-    return out.join('').trim();
+    // Nothing else matches, so output with a prefix of !!! for debugging purposes
+    else {
+      out.push('### ' + line);
+      line = '';
+    }
   }
 
+  addBodyToOut();
+  return out.join('').trim();
+}
 
-  return {
-    parseCURL: parseCURL,
-    detectCURL: detectCURL
-  };
 
-});
+export default {
+  parseCURL: parseCURL,
+  detectCURL: detectCURL
+};
diff --git a/src/core_plugins/console/public/src/directives/sense_help_example.js b/src/core_plugins/console/public/src/directives/sense_help_example.js
index 42bb30fcfecd7..a9bc22e81a79d 100644
--- a/src/core_plugins/console/public/src/directives/sense_help_example.js
+++ b/src/core_plugins/console/public/src/directives/sense_help_example.js
@@ -1,4 +1,4 @@
-const SenseEditor = require('../sense_editor/editor');
+import SenseEditor from '../sense_editor/editor';
 const exampleText = require('raw!./helpExample.txt').trim();
 import { useResizeCheckerProvider } from '../sense_editor_resize';
 
diff --git a/src/core_plugins/console/public/src/directives/sense_history.js b/src/core_plugins/console/public/src/directives/sense_history.js
index 12c1063e3f2e2..d2796bf65333b 100644
--- a/src/core_plugins/console/public/src/directives/sense_history.js
+++ b/src/core_plugins/console/public/src/directives/sense_history.js
@@ -1,4 +1,6 @@
-var { assign, memoize } = require('lodash');
+var {
+  memoize
+} = require('lodash');
 let moment = require('moment');
 
 var history = require('../history');
diff --git a/src/core_plugins/console/public/src/directives/sense_history_viewer.js b/src/core_plugins/console/public/src/directives/sense_history_viewer.js
index 327b264ac6635..1d63b5c833fd6 100644
--- a/src/core_plugins/console/public/src/directives/sense_history_viewer.js
+++ b/src/core_plugins/console/public/src/directives/sense_history_viewer.js
@@ -1,4 +1,3 @@
-const history = require('../history');
 let SenseEditor = require('../sense_editor/editor');
 import { useResizeCheckerProvider } from '../sense_editor_resize';
 
diff --git a/src/core_plugins/console/public/src/directives/sense_settings.js b/src/core_plugins/console/public/src/directives/sense_settings.js
index 72507467f8112..476dc0a013cd6 100644
--- a/src/core_plugins/console/public/src/directives/sense_settings.js
+++ b/src/core_plugins/console/public/src/directives/sense_settings.js
@@ -1,3 +1,4 @@
+import settings from '../settings';
 require('ui/directives/input_focus');
 
 require('ui/modules')
@@ -8,8 +9,6 @@ require('ui/modules')
     template: require('./settings.html'),
     controllerAs: 'settings',
     controller: function ($scope, $element) {
-      const settings = require('../settings');
-
       this.vals = settings.getCurrentSettings();
       this.apply = () => {
         this.vals = settings.updateSettings(this.vals);
diff --git a/src/core_plugins/console/public/src/directives/sense_welcome.js b/src/core_plugins/console/public/src/directives/sense_welcome.js
index 28db076e6d760..24ef382f78436 100644
--- a/src/core_plugins/console/public/src/directives/sense_welcome.js
+++ b/src/core_plugins/console/public/src/directives/sense_welcome.js
@@ -1,6 +1,6 @@
 require('./sense_help_example');
 
-const storage = require('../storage');
+import storage from '../storage';
 
 require('ui/modules')
 .get('app/sense')
diff --git a/src/core_plugins/console/public/src/es.js b/src/core_plugins/console/public/src/es.js
index be9fb725e4643..e49cee8434a5a 100644
--- a/src/core_plugins/console/public/src/es.js
+++ b/src/core_plugins/console/public/src/es.js
@@ -1,4 +1,3 @@
-let _ = require('lodash');
 let $ = require('jquery');
 
 let esVersion = [];
@@ -7,7 +6,7 @@ module.exports.getVersion = function () {
   return esVersion;
 };
 
-module.exports.send = function (method, path, data, server, disable_auth_alert) {
+module.exports.send = function (method, path, data) {
   var wrappedDfd = $.Deferred();
 
   console.log("Calling " + path);
@@ -15,9 +14,6 @@ module.exports.send = function (method, path, data, server, disable_auth_alert)
     method = "POST";
   }
 
-  // delayed loading for circular references
-  var settings = require("./settings");
-
   let contentType;
   if (data) {
     try {
diff --git a/src/core_plugins/console/public/src/history.js b/src/core_plugins/console/public/src/history.js
index d0787f784a84f..205b0ab50377b 100644
--- a/src/core_plugins/console/public/src/history.js
+++ b/src/core_plugins/console/public/src/history.js
@@ -1,6 +1,5 @@
-const $ = require('jquery');
-const { uniq } = require('lodash');
-const storage = require('./storage');
+import $ from 'jquery';
+import storage from './storage';
 
 const history = module.exports = {
   restoreFromHistory() {
@@ -55,7 +54,7 @@ const history = module.exports = {
     return { time, content };
   },
 
-  clearHistory($el) {
+  clearHistory() {
     history
       .getHistoryKeys()
       .forEach(key => storage.delete(key));
diff --git a/src/core_plugins/console/public/src/input.js b/src/core_plugins/console/public/src/input.js
index efd8a22c2c906..4e4a9f6a790e3 100644
--- a/src/core_plugins/console/public/src/input.js
+++ b/src/core_plugins/console/public/src/input.js
@@ -1,13 +1,9 @@
-let ace = require('ace');
 let $ = require('jquery');
 let ZeroClipboard = require('zeroclip');
-let ext_searchbox = require('ace/ext-searchbox');
 let Autocomplete = require('./autocomplete');
-let mappings = require('./mappings');
 let SenseEditor = require('./sense_editor/editor');
 let settings = require('./settings');
 let storage = require('./storage');
-let utils = require('./utils');
 let es = require('./es');
 let history = require('./history');
 import uiModules from 'ui/modules';
@@ -24,37 +20,28 @@ export function initializeInput($el, $actionsEl, $copyAsCurlEl, output) {
 
   input.commands.addCommand({
     name: 'auto indent request',
-    bindKey: {win: 'Ctrl-I', mac: 'Command-I'},
+    bindKey: { win: 'Ctrl-I', mac: 'Command-I' },
     exec: function () {
       input.autoIndent();
     }
   });
   input.commands.addCommand({
     name: 'move to previous request start or end',
-    bindKey: {win: 'Ctrl-Up', mac: 'Command-Up'},
+    bindKey: { win: 'Ctrl-Up', mac: 'Command-Up' },
     exec: function () {
       input.moveToPreviousRequestEdge()
     }
   });
   input.commands.addCommand({
     name: 'move to next request start or end',
-    bindKey: {win: 'Ctrl-Down', mac: 'Command-Down'},
+    bindKey: { win: 'Ctrl-Down', mac: 'Command-Down' },
     exec: function () {
       input.moveToNextRequestEdge()
     }
   });
 
 
-  /**
-   * COPY AS CURL
-   *
-   * Since the copy functionality is powered by a flash movie (via ZeroClipboard)
-   * the only way to trigger the copy is with a litteral mouseclick from the user.
-   *
-   * The original shortcut will now just open the menu and highlight the
-   *
-   */
-  var zc = (function setupZeroClipboard() {
+  (function setupZeroClipboard() {
     var zc = new ZeroClipboard($copyAsCurlEl); // the ZeroClipboard instance
 
     zc.on('wrongflash noflash', function () {
@@ -89,7 +76,7 @@ export function initializeInput($el, $actionsEl, $copyAsCurlEl, output) {
     });
 
     return zc;
-  }());
+  })();
 
   /**
    * Setup the "send" shortcut
@@ -224,7 +211,7 @@ export function initializeInput($el, $actionsEl, $copyAsCurlEl, output) {
 
   input.commands.addCommand({
     name: 'send to elasticsearch',
-    bindKey: {win: 'Ctrl-Enter', mac: 'Command-Enter'},
+    bindKey: { win: 'Ctrl-Enter', mac: 'Command-Enter' },
     exec: sendCurrentRequestToES
   });
 
@@ -242,8 +229,8 @@ export function initializeInput($el, $actionsEl, $copyAsCurlEl, output) {
   require('./input_resize')(input, output);
 
   return input;
-};
+}
 
 export default function getInput() {
   return input;
-};
+}
diff --git a/src/core_plugins/console/public/src/input_resize.js b/src/core_plugins/console/public/src/input_resize.js
index 83688cb4f9cf1..237ff81039e76 100644
--- a/src/core_plugins/console/public/src/input_resize.js
+++ b/src/core_plugins/console/public/src/input_resize.js
@@ -1,5 +1,5 @@
-const $ = require('jquery');
-const storage = require('./storage');
+import $ from 'jquery';
+import storage from './storage';
 
 module.exports = function (input, output) {
 
diff --git a/src/core_plugins/console/public/src/kb.js b/src/core_plugins/console/public/src/kb.js
index b005d25f8f4da..190735c7c9a53 100644
--- a/src/core_plugins/console/public/src/kb.js
+++ b/src/core_plugins/console/public/src/kb.js
@@ -1,7 +1,6 @@
 let $ = require('jquery');
 let _ = require('lodash');
 let mappings = require('./mappings');
-let es = require('./es');
 let Api = require('./kb/api');
 let autocomplete_engine = require('./autocomplete/engine');
 
@@ -17,7 +16,7 @@ function IndexAutocompleteComponent(name, parent, multi_valued) {
 
 IndexAutocompleteComponent.prototype = _.create(
   autocomplete_engine.ListComponent.prototype,
-  {'constructor': IndexAutocompleteComponent});
+  { 'constructor': IndexAutocompleteComponent });
 
 (function (cls) {
   cls.validateTokens = function (tokens) {
@@ -47,7 +46,7 @@ function TypeAutocompleteComponent(name, parent, multi_valued) {
 
 TypeAutocompleteComponent.prototype = _.create(
   autocomplete_engine.ListComponent.prototype,
-  {'constructor': TypeAutocompleteComponent});
+  { 'constructor': TypeAutocompleteComponent });
 
 (function (cls) {
   cls.validateTokens = function (tokens) {
@@ -69,7 +68,7 @@ TypeAutocompleteComponent.prototype = _.create(
 
 function FieldGenerator(context) {
   return _.map(mappings.getFields(context.indices, context.types), function (field) {
-    return {name: field.name, meta: field.type};
+    return { name: field.name, meta: field.type };
   });
 }
 
@@ -79,7 +78,7 @@ function FieldAutocompleteComponent(name, parent, multi_valued) {
 
 FieldAutocompleteComponent.prototype = _.create(
   autocomplete_engine.ListComponent.prototype,
-  {'constructor': FieldAutocompleteComponent});
+  { 'constructor': FieldAutocompleteComponent });
 
 (function (cls) {
   cls.validateTokens = function (tokens) {
@@ -109,7 +108,7 @@ function IdAutocompleteComponent(name, parent, multi) {
 
 IdAutocompleteComponent.prototype = _.create(
   autocomplete_engine.SharedComponent.prototype,
-  {'constructor': IdAutocompleteComponent});
+  { 'constructor': IdAutocompleteComponent });
 
 (function (cls) {
   cls.match = function (token, context, editor) {
@@ -134,47 +133,40 @@ IdAutocompleteComponent.prototype = _.create(
 
 var parametrizedComponentFactories = {
 
-  'index': function (name, parent, endpoint) {
+  'index': function (name, parent) {
     return new IndexAutocompleteComponent(name, parent, false);
   },
-  'indices': function (name, parent, endpoint) {
+  'indices': function (name, parent) {
     return new IndexAutocompleteComponent(name, parent, true);
   },
-  'type': function (name, parent, endpoint) {
+  'type': function (name, parent) {
     return new TypeAutocompleteComponent(name, parent, false);
   },
-  'types': function (name, parent, endpoint) {
+  'types': function (name, parent) {
     return new TypeAutocompleteComponent(name, parent, true);
   },
-  'id': function (name, parent, endpoint) {
+  'id': function (name, parent) {
     return new IdAutocompleteComponent(name, parent);
   },
-  'ids': function (name, parent, endpoint) {
+  'ids': function (name, parent) {
     return new IdAutocompleteComponent(name, parent, true);
   },
-  'fields': function (name, parent, endpoint) {
+  'fields': function (name, parent) {
     return new FieldAutocompleteComponent(name, parent, true);
   },
-  'field': function (name, parent, endpoint) {
+  'field': function (name, parent) {
     return new FieldAutocompleteComponent(name, parent, false);
   },
-  'nodes': function (name, parent, endpoint) {
+  'nodes': function (name, parent) {
     return new autocomplete_engine.ListComponent(name, ["_local", "_master", "data:true", "data:false",
       "master:true", "master:false"], parent)
   },
-  'node': function (name, parent, endpoint) {
+  'node': function (name, parent) {
     return new autocomplete_engine.ListComponent(name, [], parent, false)
   }
 };
 
 
-function expandAliases(indices) {
-  if (indices && indices.length > 0) {
-    indices = mappings.expandAliases(indices);
-  }
-  return indices;
-}
-
 function getUnmatchedEndpointComponents() {
   return ACTIVE_API.getUnmatchedEndpointComponents();
 }
@@ -224,7 +216,7 @@ function setActiveApi(api) {
         dataType: "json", // disable automatic guessing
       }
     ).then(
-      function (data, textStatus, jqXHR) {
+      function (data) {
         setActiveApi(loadApisFromJson(data));
       },
       function (jqXHR) {
diff --git a/src/core_plugins/console/public/src/mappings.js b/src/core_plugins/console/public/src/mappings.js
index 82906c8f4fae8..020909c59fa61 100644
--- a/src/core_plugins/console/public/src/mappings.js
+++ b/src/core_plugins/console/public/src/mappings.js
@@ -1,6 +1,5 @@
 let $ = require('jquery');
 let _ = require('lodash');
-let utils = require('./utils');
 let es = require('./es');
 let settings = require('./settings');
 
@@ -89,7 +88,7 @@ function getTypes(indices) {
     }
 
     // filter what we need
-    $.each(type_dict, function (type, fields) {
+    $.each(type_dict, function (type) {
       ret.push(type);
     });
 
@@ -155,7 +154,7 @@ function getFieldNamesFromFieldMapping(field_name, field_mapping) {
     return applyPathSettings(nested_fields);
   }
 
-  var ret = {name: field_name, type: field_type};
+  var ret = { name: field_name, type: field_type };
 
   if (field_mapping["index_name"]) {
     ret.name = field_mapping["index_name"];
@@ -272,13 +271,6 @@ function retrieveAutocompleteInfoFromServer() {
   ;
 }
 
-function autocomplete_retriever() {
-  retrieveAutocompleteInfoFromServer();
-  setTimeout(function () {
-    autocomplete_retriever();
-  }, 60000);
-}
-
 module.exports = _.assign(mappingObj, {
   getFields: getFields,
   getIndices: getIndices,
diff --git a/src/core_plugins/console/public/src/output.js b/src/core_plugins/console/public/src/output.js
index 21b9f498bc52a..34edee57d9856 100644
--- a/src/core_plugins/console/public/src/output.js
+++ b/src/core_plugins/console/public/src/output.js
@@ -1,8 +1,7 @@
 let ace = require('ace');
-let $ = require('jquery');
 let settings = require('./settings');
 let OutputMode = require('./sense_editor/mode/output');
-const smartResize = require('./smart_resize');
+import smartResize from './smart_resize';
 
 let output;
 export function initializeOutput($el) {
@@ -41,7 +40,7 @@ export function initializeOutput($el) {
       session.toggleFold(false);
 
     }
-    session.insert({row: lastLine, column: 0}, "\n" + val);
+    session.insert({ row: lastLine, column: 0 }, "\n" + val);
     output.moveCursorTo(lastLine + 1, 0);
     if (typeof cb === 'function') {
       setTimeout(cb);
@@ -65,8 +64,8 @@ export function initializeOutput($el) {
   }
 
   return output;
-};
+}
 
 export default function getOutput() {
   return output;
-};
+}
diff --git a/src/core_plugins/console/public/src/sense_editor/editor.js b/src/core_plugins/console/public/src/sense_editor/editor.js
index 184427fe335dc..934323dcab05e 100644
--- a/src/core_plugins/console/public/src/sense_editor/editor.js
+++ b/src/core_plugins/console/public/src/sense_editor/editor.js
@@ -8,11 +8,7 @@ let utils = require('../utils');
 let es = require('../es');
 import chrome from 'ui/chrome';
 
-const smartResize = require('../smart_resize');
-
-function isInt(x) {
-  return !isNaN(parseInt(x, 10));
-}
+import smartResize from '../smart_resize';
 
 function createInstance($el) {
   var aceEditor = ace.edit($el[0]);
@@ -560,11 +556,11 @@ function SenseEditor($el) {
     });
   };
 
-  editor.getSession().on('tokenizerUpdate', function (e) {
+  editor.getSession().on('tokenizerUpdate', function () {
     editor.highlightCurrentRequestsAndUpdateActionBar();
   });
 
-  editor.getSession().selection.on('changeCursor', function (e) {
+  editor.getSession().selection.on('changeCursor', function () {
     editor.highlightCurrentRequestsAndUpdateActionBar();
   });
 
diff --git a/src/core_plugins/console/public/src/sense_editor/mode/input.js b/src/core_plugins/console/public/src/sense_editor/mode/input.js
index 9b197b96740c2..02285f0ae2582 100644
--- a/src/core_plugins/console/public/src/sense_editor/mode/input.js
+++ b/src/core_plugins/console/public/src/sense_editor/mode/input.js
@@ -1,6 +1,4 @@
-let ace = require('ace');
 let acequire = require('acequire');
-let mode_json = require('ace/mode-json');
 
 var oop = acequire("ace/lib/oop");
 var TextMode = acequire("ace/mode/text").Mode;
@@ -24,7 +22,7 @@ var Mode = function () {
 oop.inherits(Mode, TextMode);
 
 (function () {
-  this.getCompletions = function (editor, session, pos, prefix) {
+  this.getCompletions = function () {
     // autocomplete is done by the autocomplete module.
     return [];
   };
diff --git a/src/core_plugins/console/public/src/sense_editor/mode/input_highlight_rules.js b/src/core_plugins/console/public/src/sense_editor/mode/input_highlight_rules.js
index da256594bfb45..cc4e229d07a39 100644
--- a/src/core_plugins/console/public/src/sense_editor/mode/input_highlight_rules.js
+++ b/src/core_plugins/console/public/src/sense_editor/mode/input_highlight_rules.js
@@ -14,8 +14,8 @@ var InputHighlightRules = function () {
       reg = reg.source;
     }
     return [
-      {token: tokens.concat(["whitespace"]), regex: reg + "(\\s*)$", next: nextIfEOL},
-      {token: tokens, regex: reg, next: normalNext}
+      { token: tokens.concat(["whitespace"]), regex: reg + "(\\s*)$", next: nextIfEOL },
+      { token: tokens, regex: reg, next: normalNext }
     ];
   }
 
@@ -24,8 +24,8 @@ var InputHighlightRules = function () {
   /*jshint -W015 */
   this.$rules = {
     "start": mergeTokens([
-        {token: "comment", regex: /^#.*$/},
-        {token: "paren.lparen", regex: "{", next: "json", push: true}
+        { token: "comment", regex: /^#.*$/ },
+        { token: "paren.lparen", regex: "{", next: "json", push: true }
       ],
       addEOL(["method"], /([a-zA-Z]+)/, "start", "method_sep")
       ,
diff --git a/src/core_plugins/console/public/src/sense_editor/mode/output.js b/src/core_plugins/console/public/src/sense_editor/mode/output.js
index d4edebc17745d..23186cf65f345 100644
--- a/src/core_plugins/console/public/src/sense_editor/mode/output.js
+++ b/src/core_plugins/console/public/src/sense_editor/mode/output.js
@@ -1,7 +1,4 @@
 let ace = require('ace');
-let acequire = require('acequire');
-let mode_json = require('ace/mode-json');
-let output_highlighting_rules = require('./output_highlight_rules');
 
 
 var oop = ace.require("ace/lib/oop");
@@ -10,7 +7,7 @@ var HighlightRules = require("./output_highlight_rules").OutputJsonHighlightRule
 var MatchingBraceOutdent = ace.require("ace/mode/matching_brace_outdent").MatchingBraceOutdent;
 var CstyleBehaviour = ace.require("ace/mode/behaviour/cstyle").CstyleBehaviour;
 var CStyleFoldMode = ace.require("ace/mode/folding/cstyle").FoldMode;
-var WorkerClient = ace.require("ace/worker/worker_client").WorkerClient;
+ace.require("ace/worker/worker_client").WorkerClient;
 var AceTokenizer = ace.require("ace/tokenizer").Tokenizer;
 
 var Mode = function () {
@@ -22,7 +19,7 @@ var Mode = function () {
 oop.inherits(Mode, JSONMode);
 
 (function () {
-  this.createWorker = function (session) {
+  this.createWorker = function () {
     return null;
   };
 
diff --git a/src/core_plugins/console/public/src/sense_editor/mode/output_highlight_rules.js b/src/core_plugins/console/public/src/sense_editor/mode/output_highlight_rules.js
index 97b76cf71aaf9..b821774f772d1 100644
--- a/src/core_plugins/console/public/src/sense_editor/mode/output_highlight_rules.js
+++ b/src/core_plugins/console/public/src/sense_editor/mode/output_highlight_rules.js
@@ -1,5 +1,4 @@
 let ace = require('ace');
-let ace_mode_json = require('ace/mode-json');
 
 var oop = ace.require("ace/lib/oop");
 var JsonHighlightRules = ace.require("ace/mode/json_highlight_rules").JsonHighlightRules;
diff --git a/src/core_plugins/console/public/src/sense_editor/mode/worker.js b/src/core_plugins/console/public/src/sense_editor/mode/worker.js
index 4371f7ff14b8d..a2669a96d33b1 100644
--- a/src/core_plugins/console/public/src/sense_editor/mode/worker.js
+++ b/src/core_plugins/console/public/src/sense_editor/mode/worker.js
@@ -7,7 +7,7 @@
 
   window.console = function () {
     var msgs = Array.prototype.slice.call(arguments, 0);
-    window.postMessage({type: "log", data: msgs});
+    window.postMessage({ type: "log", data: msgs });
   };
   window.console.error =
     window.console.warn =
@@ -181,7 +181,7 @@
   };
 })(this);// https://github.com/kriskowal/es5-shim
 
-define('ace/lib/oop', ['require', 'exports', 'module' ], function (require, exports, module) {
+define('ace/lib/oop', ['require', 'exports', 'module' ], function (require, exports) {
   "use strict";
 
   exports.inherits = function (ctor, superCtor) {
@@ -208,7 +208,7 @@ define('ace/lib/oop', ['require', 'exports', 'module' ], function (require, expo
   };
 
 });
-define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function (require, exports, module) {
+define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function (require, exports) {
   "use strict";
 
   var Document = require("../document").Document;
@@ -258,7 +258,7 @@ define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'a
 });
 
 define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter',
-  'ace/range', 'ace/anchor'], function (require, exports, module) {
+  'ace/range', 'ace/anchor'], function (require, exports) {
   "use strict";
 
   var oop = require("./lib/oop");
@@ -273,7 +273,7 @@ define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib
     } else if (Array.isArray(text)) {
       this._insertLines(0, text);
     } else {
-      this.insert({row: 0, column: 0}, text);
+      this.insert({ row: 0, column: 0 }, text);
     }
   };
 
@@ -283,7 +283,7 @@ define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib
     this.setValue = function (text) {
       var len = this.getLength();
       this.remove(new Range(0, 0, len, this.getLine(len - 1).length));
-      this.insert({row: 0, column: 0}, text);
+      this.insert({ row: 0, column: 0 }, text);
     };
     this.getValue = function () {
       return this.getAllLines().join(this.getNewLineCharacter());
@@ -386,12 +386,12 @@ define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib
     };
     this.insertLines = function (row, lines) {
       if (row >= this.getLength())
-        return this.insert({row: row, column: 0}, "\n" + lines.join("\n"));
+        return this.insert({ row: row, column: 0 }, "\n" + lines.join("\n"));
       return this._insertLines(Math.max(row, 0), lines);
     };
     this._insertLines = function (row, lines) {
       if (lines.length == 0)
-        return {row: row, column: 0};
+        return { row: row, column: 0 };
       var end;
       if (lines.length > 0xFFFF) {
         end = this._insertLines(row, lines.slice(0xFFFF));
@@ -596,9 +596,9 @@ define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib
       for (var i = startRow || 0, l = lines.length; i < l; i++) {
         index -= lines[i].length + newlineLength;
         if (index < 0)
-          return {row: i, column: index + lines[i].length + newlineLength};
+          return { row: i, column: index + lines[i].length + newlineLength };
       }
-      return {row: l - 1, column: lines[l - 1].length};
+      return { row: l - 1, column: lines[l - 1].length };
     };
     this.positionToIndex = function (pos, startRow) {
       var lines = this.$lines || this.getAllLines();
@@ -616,7 +616,7 @@ define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib
   exports.Document = Document;
 });
 
-define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function (require, exports, module) {
+define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function (require, exports) {
   "use strict";
 
   var EventEmitter = {};
@@ -680,7 +680,7 @@ define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function (req
   EventEmitter.setDefaultHandler = function (eventName, callback) {
     var handlers = this._defaultHandlers
     if (!handlers)
-      handlers = this._defaultHandlers = {_disabled_: {}};
+      handlers = this._defaultHandlers = { _disabled_: {} };
 
     if (handlers[eventName]) {
       var old = handlers[eventName];
@@ -701,7 +701,6 @@ define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function (req
     var disabled = handlers._disabled_[eventName];
 
     if (handlers[eventName] == callback) {
-      var old = handlers[eventName];
       if (disabled)
         this.setDefaultHandler(eventName, disabled.pop());
     } else if (disabled) {
@@ -746,7 +745,7 @@ define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function (req
 
 });
 
-define('ace/range', ['require', 'exports', 'module' ], function (require, exports, module) {
+define('ace/range', ['require', 'exports', 'module' ], function (require, exports) {
   "use strict";
 
   var comparePoints = function (p1, p2) {
@@ -918,14 +917,14 @@ define('ace/range', ['require', 'exports', 'module' ], function (require, export
     this.clipRows = function (firstRow, lastRow) {
       var start, end;
       if (this.end.row > lastRow)
-        end = {row: lastRow + 1, column: 0};
+        end = { row: lastRow + 1, column: 0 };
       else if (this.end.row < firstRow)
-        end = {row: firstRow, column: 0};
+        end = { row: firstRow, column: 0 };
 
       if (this.start.row > lastRow)
-        start = {row: lastRow + 1, column: 0};
+        start = { row: lastRow + 1, column: 0 };
       else if (this.start.row < firstRow)
-        start = {row: firstRow, column: 0};
+        start = { row: firstRow, column: 0 };
 
       return Range.fromPoints(start || this.start, end || this.end);
     };
@@ -935,9 +934,9 @@ define('ace/range', ['require', 'exports', 'module' ], function (require, export
       if (cmp == 0)
         return this;
       else if (cmp == -1)
-        start = {row: row, column: column};
+        start = { row: row, column: column };
       else
-        end = {row: row, column: column};
+        end = { row: row, column: column };
 
       return Range.fromPoints(start || this.start, end || this.end);
     };
@@ -987,7 +986,7 @@ define('ace/range', ['require', 'exports', 'module' ], function (require, export
   exports.Range = Range;
 });
 
-define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function (require, exports, module) {
+define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function (require, exports) {
   "use strict";
 
   var oop = require("./lib/oop");
@@ -1134,7 +1133,7 @@ define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/e
 
 });
 
-define('ace/lib/lang', ['require', 'exports', 'module' ], function (require, exports, module) {
+define('ace/lib/lang', ['require', 'exports', 'module' ], function (require, exports) {
   "use strict";
 
   exports.stringReverse = function (string) {
@@ -1318,7 +1317,7 @@ define('ace/lib/lang', ['require', 'exports', 'module' ], function (require, exp
 });
 
 
-define("sense_editor/mode/worker_parser", ['require', 'exports', 'module' ], function (require, exports, module) {
+define("sense_editor/mode/worker_parser", ['require', 'exports', 'module' ], function () {
   "use strict";
 
   var at,     // The index of the current character
@@ -1337,7 +1336,7 @@ define("sense_editor/mode/worker_parser", ['require', 'exports', 'module' ], fun
     text,
 
     annotate = function (type, text) {
-      annos.push({type: type, text: text, at: at});
+      annos.push({ type: type, text: text, at: at });
     },
 
     error = function (m) {
@@ -1621,7 +1620,7 @@ define("sense_editor/mode/worker_parser", ['require', 'exports', 'module' ], fun
 
     request = function () {
       white();
-      var meth = method();
+      method();
       strictWhite();
       url();
       strictWhite(); // advance to one new line
@@ -1641,7 +1640,6 @@ define("sense_editor/mode/worker_parser", ['require', 'exports', 'module' ], fun
         newLine();
         strictWhite();
       }
-
     },
 
     comment = function () {
@@ -1711,13 +1709,13 @@ define("sense_editor/mode/worker_parser", ['require', 'exports', 'module' ], fun
         }
       }
       return reviver.call(holder, key, value);
-    })({'': result}, '') : result;
+    })({ '': result }, '') : result;
   };
 });
 
 
 define("sense_editor/mode/worker", ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/worker/mirror',
-  'sense_editor/mode/worker_parser'], function (require, exports, module) {
+  'sense_editor/mode/worker_parser'], function (require, exports) {
   "use strict";
 
 
@@ -1764,7 +1762,7 @@ define("sense_editor/mode/worker", ['require', 'exports', 'module' , 'ace/lib/oo
       var nl = this.doc.getNewLineCharacter().length;
 
       if (!len) {
-        return { row: 0, column: 0};
+        return { row: 0, column: 0 };
       }
 
       var lineStart = 0, line;
diff --git a/src/core_plugins/console/public/src/sense_editor/theme-sense-dark.js b/src/core_plugins/console/public/src/sense_editor/theme-sense-dark.js
index bf25de1cceee9..ac43d964f54c1 100644
--- a/src/core_plugins/console/public/src/sense_editor/theme-sense-dark.js
+++ b/src/core_plugins/console/public/src/sense_editor/theme-sense-dark.js
@@ -1,7 +1,7 @@
 let ace = require('ace');
 
 ace.define("ace/theme/sense-dark", ['require', 'exports', 'module'],
-  function (require, exports, module) {
+  function (require, exports) {
     exports.isDark = true;
     exports.cssClass = "ace-sense-dark";
     exports.cssText = ".ace-sense-dark .ace_gutter {\
diff --git a/src/core_plugins/console/public/src/settings.js b/src/core_plugins/console/public/src/settings.js
index 85f6713185f4f..7e5c2064e5d36 100644
--- a/src/core_plugins/console/public/src/settings.js
+++ b/src/core_plugins/console/public/src/settings.js
@@ -1,6 +1,4 @@
-let $ = require('jquery');
-let es = require('./es');
-const storage = require('./storage');
+import storage from './storage';
 
 import getInput from './input'
 import getOutput from './output'
@@ -25,12 +23,6 @@ function setWrapMode(mode) {
   return true;
 }
 
-function setBasicAuth(mode) {
-  storage.set('basic_auth', mode);
-  applyCurrentSettings();
-  return true;
-}
-
 export function getAutocomplete() {
   return storage.get('autocomplete_settings', { fields: true, indices: true });
 }
@@ -59,7 +51,7 @@ export function getCurrentSettings() {
   };
 }
 
-export function updateSettings({ fontSize, wrapMode, autocomplete}) {
+export function updateSettings({ fontSize, wrapMode, autocomplete }) {
   setFontSize(fontSize);
   setWrapMode(wrapMode);
   setAutocomplete(autocomplete);
diff --git a/src/core_plugins/console/public/src/storage.js b/src/core_plugins/console/public/src/storage.js
index c23a11f1d9f90..ede67a5eaeae1 100644
--- a/src/core_plugins/console/public/src/storage.js
+++ b/src/core_plugins/console/public/src/storage.js
@@ -1,4 +1,4 @@
-const { transform, keys, startsWith } = require('lodash');
+import { transform, keys, startsWith } from 'lodash';
 
 class Storage {
   constructor(engine, prefix) {
diff --git a/src/core_plugins/console/public/tests/src/curl_parsing_tests.js b/src/core_plugins/console/public/tests/src/curl_parsing_tests.js
index 6eb35df9b1c98..bed751d6a7cbe 100644
--- a/src/core_plugins/console/public/tests/src/curl_parsing_tests.js
+++ b/src/core_plugins/console/public/tests/src/curl_parsing_tests.js
@@ -2,7 +2,12 @@ let _ = require('lodash');
 let curl = require('../../src/curl');
 let curlTests = require('raw!./curl_parsing_tests.txt');
 
-var {test, module, ok, fail, asyncTest, deepEqual, equal, start} = QUnit;
+var {
+  test,
+  module,
+  ok,
+  equal
+} = QUnit;
 
 module("CURL");
 
diff --git a/src/core_plugins/console/public/tests/src/editor_tests.js b/src/core_plugins/console/public/tests/src/editor_tests.js
index f73d1e5038c14..aa897d14fc0dc 100644
--- a/src/core_plugins/console/public/tests/src/editor_tests.js
+++ b/src/core_plugins/console/public/tests/src/editor_tests.js
@@ -1,10 +1,15 @@
 let ace = require('ace');
-let es = require('../../src/es');
 let input = require('../../src/input');
 let editor_input1 = require('raw!./editor_input1.txt');
 
 var aceRange = ace.require("ace/range");
-var {test, module, ok, fail, asyncTest, deepEqual, equal, start} = QUnit;
+var {
+  module,
+  asyncTest,
+  deepEqual,
+  equal,
+  start
+} = QUnit;
 
 
 module("Editor", {
@@ -272,7 +277,7 @@ function multi_req_test(name, editor_input, range, expected) {
 }
 
 multi_req_test("mid body to mid body", editor_input1,
-  {start: {row: 12}, end: {row: 17}}, [{
+  { start: { row: 12 }, end: { row: 17 } }, [{
     method: "PUT",
     url: "index_1/type1/1",
     data: {
@@ -287,7 +292,7 @@ multi_req_test("mid body to mid body", editor_input1,
   }]);
 
 multi_req_test("single request start to end", editor_input1,
-  {start: {row: 10}, end: {row: 13}}, [{
+  { start: { row: 10 }, end: { row: 13 } }, [{
     method: "PUT",
     url: "index_1/type1/1",
     data: {
@@ -296,7 +301,7 @@ multi_req_test("single request start to end", editor_input1,
   }]);
 
 multi_req_test("start to end, with comment", editor_input1,
-  {start: {row: 6}, end: {row: 13}}, [{
+  { start: { row: 6 }, end: { row: 13 } }, [{
     method: "GET",
     url: "_stats?level=shards",
     data: null
@@ -310,7 +315,7 @@ multi_req_test("start to end, with comment", editor_input1,
     }]);
 
 multi_req_test("before start to after end, with comments", editor_input1,
-  {start: {row: 4}, end: {row: 14}}, [{
+  { start: { row: 4 }, end: { row: 14 } }, [{
     method: "GET",
     url: "_stats?level=shards",
     data: null
@@ -324,13 +329,13 @@ multi_req_test("before start to after end, with comments", editor_input1,
     }]);
 
 multi_req_test("between requests", editor_input1,
-  {start: {row: 21}, end: {row: 22}}, []);
+  { start: { row: 21 }, end: { row: 22 } }, []);
 
 multi_req_test("between requests - with comment", editor_input1,
-  {start: {row: 20}, end: {row: 22}}, []);
+  { start: { row: 20 }, end: { row: 22 } }, []);
 
 multi_req_test("between requests - before comment", editor_input1,
-  {start: {row: 19}, end: {row: 22}}, []);
+  { start: { row: 19 }, end: { row: 22 } }, []);
 
 
 function multi_req_copy_as_curl_test(name, editor_input, range, expected) {
@@ -344,7 +349,7 @@ function multi_req_copy_as_curl_test(name, editor_input, range, expected) {
 
 
 multi_req_copy_as_curl_test("start to end, with comment", editor_input1,
-  {start: {row: 6}, end: {row: 13}}, `
+  { start: { row: 6 }, end: { row: 13 } }, `
 curl -XGET "http://localhost:9200/_stats?level=shards"
 
 #in between comment
diff --git a/src/core_plugins/console/public/tests/src/integration_tests.js b/src/core_plugins/console/public/tests/src/integration_tests.js
index aea330f7371d3..8d23bbedf7df3 100644
--- a/src/core_plugins/console/public/tests/src/integration_tests.js
+++ b/src/core_plugins/console/public/tests/src/integration_tests.js
@@ -3,7 +3,14 @@ let kb = require('../../src/kb');
 let mappings = require('../../src/mappings');
 let $ = require('jquery');
 
-var {test, module, ok, fail, asyncTest, deepEqual, equal, start} = QUnit;
+var {
+  module,
+  ok,
+  asyncTest,
+  deepEqual,
+  equal,
+  start
+} = QUnit;
 
 module("Integration", {
   setup: function () {
@@ -96,7 +103,7 @@ function process_context_test(data, mapping, kb_schemes, request_line, test) {
             if (test["autoCompleteSet"]) {
               var expected_terms = _.map(test["autoCompleteSet"], function (t) {
                 if (typeof t !== "object") {
-                  t = {"name": t};
+                  t = { "name": t };
                 }
                 return t;
               });
@@ -173,13 +180,13 @@ var SEARCH_KB = {
         "_search"
       ],
       data_autocomplete_rules: {
-        query: {match_all: {}, term: {"{field}": {__template: {"f": 1}}}},
+        query: { match_all: {}, term: { "{field}": { __template: { "f": 1 } } } },
         size: {},
         facets: {
           __template: {
             "FIELD": {}
           },
-          "*": {terms: {field: "{field}"}}
+          "*": { terms: { field: "{field}" } }
         }
       }
     }
@@ -190,16 +197,16 @@ var MAPPING = {
   "index1": {
     "type1.1": {
       "properties": {
-        "field1.1.1": {"type": "string"},
-        "field1.1.2": {"type": "string"}
+        "field1.1.1": { "type": "string" },
+        "field1.1.2": { "type": "string" }
       }
     }
   },
   "index2": {
     "type2.1": {
       "properties": {
-        "field2.1.1": {"type": "string"},
-        "field2.1.2": {"type": "string"}
+        "field2.1.1": { "type": "string" },
+        "field2.1.2": { "type": "string" }
       }
     }
   }
@@ -213,12 +220,12 @@ context_tests(
   [
     {
       name: "Empty doc",
-      cursor: {row: 0, column: 1},
+      cursor: { row: 0, column: 1 },
       initialValue: "",
       addTemplate: true,
       prefixToAdd: "",
       suffixToAdd: "",
-      rangeToReplace: {start: {row: 0, column: 1}, end: {row: 0, column: 1}},
+      rangeToReplace: { start: { row: 0, column: 1 }, end: { row: 0, column: 1 } },
       autoCompleteSet: ["facets", "query", "size"]
     }
   ]
@@ -232,7 +239,7 @@ context_tests(
   [
     {
       name: "Missing KB",
-      cursor: {row: 0, column: 1},
+      cursor: { row: 0, column: 1 },
       no_context: true
     }
   ]
@@ -257,7 +264,7 @@ context_tests(
   [
     {
       name: "Missing KB - global auto complete",
-      cursor: {row: 2, column: 5},
+      cursor: { row: 2, column: 5 },
       autoCompleteSet: ["t1"]
     }
   ]
@@ -277,37 +284,37 @@ context_tests(
   [
     {
       name: "existing dictionary key, no template",
-      cursor: {row: 1, column: 6},
+      cursor: { row: 1, column: 6 },
       initialValue: "query",
       addTemplate: false,
       prefixToAdd: "",
       suffixToAdd: "",
-      rangeToReplace: {start: {row: 1, column: 3}, end: {row: 1, column: 10}},
+      rangeToReplace: { start: { row: 1, column: 3 }, end: { row: 1, column: 10 } },
       autoCompleteSet: ["facets", "query", "size"]
     },
     {
       name: "existing inner dictionary key",
-      cursor: {row: 2, column: 7},
+      cursor: { row: 2, column: 7 },
       initialValue: "field",
       addTemplate: false,
       prefixToAdd: "",
       suffixToAdd: "",
-      rangeToReplace: {start: {row: 2, column: 6}, end: {row: 2, column: 13}},
+      rangeToReplace: { start: { row: 2, column: 6 }, end: { row: 2, column: 13 } },
       autoCompleteSet: ["match_all", "term"]
     },
     {
       name: "existing dictionary key, yes template",
-      cursor: {row: 4, column: 7},
+      cursor: { row: 4, column: 7 },
       initialValue: "facets",
       addTemplate: true,
       prefixToAdd: "",
       suffixToAdd: "",
-      rangeToReplace: {start: {row: 4, column: 3}, end: {row: 4, column: 15}},
+      rangeToReplace: { start: { row: 4, column: 3 }, end: { row: 4, column: 15 } },
       autoCompleteSet: ["facets", "query", "size"]
     },
     {
       name: "ignoring meta keys",
-      cursor: {row: 4, column: 14},
+      cursor: { row: 4, column: 14 },
       no_context: true
     }
   ]
@@ -327,42 +334,42 @@ context_tests(
   [
     {
       name: "trailing comma, end of line",
-      cursor: {row: 4, column: 16},
+      cursor: { row: 4, column: 16 },
       initialValue: "",
       addTemplate: true,
       prefixToAdd: "",
       suffixToAdd: ", ",
-      rangeToReplace: {start: {row: 4, column: 16}, end: {row: 4, column: 16}},
+      rangeToReplace: { start: { row: 4, column: 16 }, end: { row: 4, column: 16 } },
       autoCompleteSet: ["facets", "query", "size"]
     },
     {
       name: "trailing comma, beginning of line",
-      cursor: {row: 5, column: 1},
+      cursor: { row: 5, column: 1 },
       initialValue: "",
       addTemplate: true,
       prefixToAdd: "",
       suffixToAdd: ", ",
-      rangeToReplace: {start: {row: 5, column: 1}, end: {row: 5, column: 1}},
+      rangeToReplace: { start: { row: 5, column: 1 }, end: { row: 5, column: 1 } },
       autoCompleteSet: ["facets", "query", "size"]
     },
     {
       name: "prefix comma, beginning of line",
-      cursor: {row: 6, column: 0},
+      cursor: { row: 6, column: 0 },
       initialValue: "",
       addTemplate: true,
       prefixToAdd: ", ",
       suffixToAdd: "",
-      rangeToReplace: {start: {row: 6, column: 0}, end: {row: 6, column: 0}},
+      rangeToReplace: { start: { row: 6, column: 0 }, end: { row: 6, column: 0 } },
       autoCompleteSet: ["facets", "query", "size"]
     },
     {
       name: "prefix comma, end of line",
-      cursor: {row: 5, column: 14},
+      cursor: { row: 5, column: 14 },
       initialValue: "",
       addTemplate: true,
       prefixToAdd: ", ",
       suffixToAdd: "",
-      rangeToReplace: {start: {row: 5, column: 14}, end: {row: 5, column: 14}},
+      rangeToReplace: { start: { row: 5, column: 14 }, end: { row: 5, column: 14 } },
       autoCompleteSet: ["facets", "query", "size"]
     }
 
@@ -385,11 +392,11 @@ context_tests(
           "_test"
         ],
         data_autocomplete_rules: {
-          object: {bla: 1},
+          object: { bla: 1 },
           array: [1],
-          value_one_of: {__one_of: [1, 2]},
+          value_one_of: { __one_of: [1, 2] },
           value: 3,
-          "*": {__one_of: [4, 5]}
+          "*": { __one_of: [4, 5] }
         }
       }
     }
@@ -398,31 +405,31 @@ context_tests(
   [
     {
       name: "not matching object when { is not opened",
-      cursor: {row: 1, column: 12},
+      cursor: { row: 1, column: 12 },
       initialValue: "",
       autoCompleteSet: ["{"]
     },
     {
       name: "not matching array when [ is not opened",
-      cursor: {row: 2, column: 12},
+      cursor: { row: 2, column: 12 },
       initialValue: "",
       autoCompleteSet: ["["]
     },
     {
       name: "matching value with one_of",
-      cursor: {row: 3, column: 19},
+      cursor: { row: 3, column: 19 },
       initialValue: "",
       autoCompleteSet: [1, 2]
     },
     {
       name: "matching value",
-      cursor: {row: 4, column: 12},
+      cursor: { row: 4, column: 12 },
       initialValue: "",
       autoCompleteSet: [3]
     },
     {
       name: "matching any value with one_of",
-      cursor: {row: 5, column: 21},
+      cursor: { row: 5, column: 21 },
       initialValue: "",
       autoCompleteSet: [4, 5]
     }
@@ -445,14 +452,14 @@ context_tests(
   [
     {
       name: "* matching everything",
-      cursor: {row: 5, column: 15},
+      cursor: { row: 5, column: 15 },
       initialValue: "",
       addTemplate: true,
       prefixToAdd: "",
       suffixToAdd: "",
-      rangeToReplace: {start: {row: 5, column: 15}, end: {row: 5, column: 15}},
+      rangeToReplace: { start: { row: 5, column: 15 }, end: { row: 5, column: 15 } },
       autoCompleteSet: [
-        {name: "terms", meta: "API"}
+        { name: "terms", meta: "API" }
       ]
     }
   ]
@@ -479,17 +486,17 @@ context_tests(
   [
     {
       name: "{index} matching",
-      cursor: {row: 1, column: 15},
+      cursor: { row: 1, column: 15 },
       autoCompleteSet: [
-        {name: "index1", meta: "index"},
-        {name: "index2", meta: "index"}
+        { name: "index1", meta: "index" },
+        { name: "index2", meta: "index" }
       ]
     }
   ]
 );
 
 function tt(term, template, meta) {
-  term = {name: term, template: template};
+  term = { name: term, template: template };
   if (meta) {
     term.meta = meta;
   }
@@ -514,8 +521,8 @@ context_tests(
           array: ["a", "b"],
           number: 1,
           object: {},
-          fixed: {__template: {"a": 1}},
-          oneof: {__one_of: ["o1", "o2"]}
+          fixed: { __template: { "a": 1 } },
+          oneof: { __one_of: ["o1", "o2"] }
         }
       }
     }
@@ -524,14 +531,14 @@ context_tests(
   [
     {
       name: "Templates 1",
-      cursor: {row: 1, column: 0},
+      cursor: { row: 1, column: 0 },
       autoCompleteSet: [
-        tt("array", []), tt("fixed", {a: 1}), tt("number", 1), tt("object", {}), tt("oneof", "o1")
+        tt("array", []), tt("fixed", { a: 1 }), tt("number", 1), tt("object", {}), tt("oneof", "o1")
       ]
     },
     {
       name: "Templates - one off",
-      cursor: {row: 4, column: 12},
+      cursor: { row: 4, column: 12 },
       autoCompleteSet: [tt("o1"), tt("o2")]
     }
   ]
@@ -561,7 +568,7 @@ context_tests(
                 lines_regex: "other"
               },
               "no_match": {}
-            }, {"always": {}}]
+            }, { "always": {} }]
           }
         }
       }
@@ -571,7 +578,7 @@ context_tests(
   [
     {
       name: "Conditionals",
-      cursor: {row: 2, column: 15},
+      cursor: { row: 2, column: 15 },
       autoCompleteSet: [
         tt("always", {}), tt("match", {})
       ]
@@ -605,18 +612,18 @@ context_tests(
           "_endpoint"
         ],
         data_autocomplete_rules: {
-          any_of_numbers: {__template: [1, 2], __any_of: [1, 2, 3]},
+          any_of_numbers: { __template: [1, 2], __any_of: [1, 2, 3] },
           any_of_obj: {
             __template: [
-              {c: 1}
+              { c: 1 }
             ], __any_of: [
-              {a: 1, b: 2},
-              {c: 1}
+              { a: 1, b: 2 },
+              { c: 1 }
             ]
           },
           any_of_mixed: {
             __any_of: [
-              {a: 1},
+              { a: 1 },
               3
             ]
           }
@@ -628,37 +635,37 @@ context_tests(
   [
     {
       name: "Any of - templates",
-      cursor: {row: 1, column: 0},
+      cursor: { row: 1, column: 0 },
       autoCompleteSet: [
         tt("any_of_mixed", []),
         tt("any_of_numbers", [1, 2]),
         tt("any_of_obj", [
-          {c: 1}
+          { c: 1 }
         ])
       ]
     },
     {
       name: "Any of - numbers",
-      cursor: {row: 2, column: 2},
+      cursor: { row: 2, column: 2 },
       autoCompleteSet: [1, 2, 3]
     },
     {
       name: "Any of - object",
-      cursor: {row: 6, column: 2},
+      cursor: { row: 6, column: 2 },
       autoCompleteSet: [
         tt("a", 1), tt("b", 2), tt("c", 1)
       ]
     },
     {
       name: "Any of - mixed - obj",
-      cursor: {row: 11, column: 2},
+      cursor: { row: 11, column: 2 },
       autoCompleteSet: [
         tt("a", 1)
       ]
     },
     {
       name: "Any of - mixed - both",
-      cursor: {row: 13, column: 2},
+      cursor: { row: 13, column: 2 },
       autoCompleteSet: [
         tt("{"), tt(3)
       ]
@@ -683,7 +690,7 @@ context_tests(
   [
     {
       name: "Empty string as default",
-      cursor: {row: 0, column: 1},
+      cursor: { row: 0, column: 1 },
       autoCompleteSet: [tt("query", "")]
     }
   ]
@@ -765,7 +772,7 @@ context_tests(
   [
     {
       name: "Relative scope link test",
-      cursor: {row: 2, column: 12},
+      cursor: { row: 2, column: 12 },
       autoCompleteSet: [
         tt("b", {}), tt("c", {}), tt("d", {}), tt("e", {}), tt("f", [
           {}
@@ -774,37 +781,37 @@ context_tests(
     },
     {
       name: "External scope link test",
-      cursor: {row: 3, column: 12},
+      cursor: { row: 3, column: 12 },
       autoCompleteSet: [tt("t2", 1)]
     },
     {
       name: "Global scope link test",
-      cursor: {row: 4, column: 12},
+      cursor: { row: 4, column: 12 },
       autoCompleteSet: [tt("t1", 2), tt("t1a", {})]
     },
     {
       name: "Global scope link with an internal scope link",
-      cursor: {row: 5, column: 17},
+      cursor: { row: 5, column: 17 },
       autoCompleteSet: [tt("t1", 2), tt("t1a", {})]
     },
     {
       name: "Entire endpoint scope link test",
-      cursor: {row: 7, column: 12},
+      cursor: { row: 7, column: 12 },
       autoCompleteSet: [tt("target", {})]
     },
     {
       name: "A scope link within an array",
-      cursor: {row: 9, column: 10},
+      cursor: { row: 9, column: 10 },
       autoCompleteSet: [tt("t2", 1)]
     },
     {
       name: "A function based scope link",
-      cursor: {row: 11, column: 12},
+      cursor: { row: 11, column: 12 },
       autoCompleteSet: [tt("a", 1), tt("b", 2)]
     },
     {
       name: "A global scope link with wrong link",
-      cursor: {row: 12, column: 12},
+      cursor: { row: 12, column: 12 },
       assertThrows: /broken/
 
     }
@@ -834,7 +841,7 @@ context_tests(
   [
     {
       name: "Top level scope link",
-      cursor: {row: 0, column: 1},
+      cursor: { row: 0, column: 1 },
       autoCompleteSet: [
         tt("t1", 2)
       ]
@@ -862,7 +869,7 @@ context_tests(
   [
     {
       name: "Path after empty object",
-      cursor: {row: 1, column: 10},
+      cursor: { row: 1, column: 10 },
       autoCompleteSet: ["a", "b"]
     }
   ]
@@ -878,8 +885,8 @@ context_tests(
   [
     {
       name: "Replace an empty string",
-      cursor: {row: 1, column: 4},
-      rangeToReplace: {start: {row: 1, column: 3}, end: {row: 1, column: 9}}
+      cursor: { row: 1, column: 4 },
+      rangeToReplace: { start: { row: 1, column: 3 }, end: { row: 1, column: 9 } }
     }
   ]
 );
@@ -899,7 +906,7 @@ context_tests(
         patterns: ["_endpoint"],
         data_autocomplete_rules: {
           "a": [
-            {b: 1}
+            { b: 1 }
           ]
         }
       }
@@ -909,12 +916,12 @@ context_tests(
   [
     {
       name: "List of objects - internal autocomplete",
-      cursor: {row: 3, column: 10},
+      cursor: { row: 3, column: 10 },
       autoCompleteSet: ["b"]
     },
     {
       name: "List of objects - external template",
-      cursor: {row: 0, column: 1},
+      cursor: { row: 0, column: 1 },
       autoCompleteSet: [tt("a", [
         {}
       ])]
@@ -944,15 +951,15 @@ context_tests(
   [
     {
       name: "Field completion as scope",
-      cursor: {row: 3, column: 10},
-      autoCompleteSet: [tt("field1.1.1", {"f": 1}, "string"), tt("field1.1.2", {"f": 1}, "string")]
+      cursor: { row: 3, column: 10 },
+      autoCompleteSet: [tt("field1.1.1", { "f": 1 }, "string"), tt("field1.1.2", { "f": 1 }, "string")]
     },
     {
       name: "Field completion as value",
-      cursor: {row: 9, column: 23},
+      cursor: { row: 9, column: 23 },
       autoCompleteSet: [
-        {name: "field1.1.1", meta: "string"},
-        {name: "field1.1.2", meta: "string"}
+        { name: "field1.1.1", meta: "string" },
+        { name: "field1.1.2", meta: "string" }
       ]
     }
   ]
@@ -967,7 +974,7 @@ context_tests(
   [
     {
       name: "initial doc start",
-      cursor: {row: 1, column: 0},
+      cursor: { row: 1, column: 0 },
       autoCompleteSet: ["{"],
       prefixToAdd: "",
       suffixToAdd: ""
@@ -988,14 +995,14 @@ context_tests(
   [
     {
       name: "Cursor rows after request end",
-      cursor: {row: 4, column: 0},
+      cursor: { row: 4, column: 0 },
       autoCompleteSet: ["GET", "PUT", "POST", "DELETE", "HEAD"],
       prefixToAdd: "",
       suffixToAdd: " "
     },
     {
       name: "Cursor just after request end",
-      cursor: {row: 2, column: 1},
+      cursor: { row: 2, column: 1 },
       no_context: true
     }
 
@@ -1033,7 +1040,7 @@ context_tests(
   [
     {
       name: "Endpoints with slashes - no slash",
-      cursor: {row: 0, column: 8},
+      cursor: { row: 0, column: 8 },
       autoCompleteSet: ["_cluster/nodes/stats", "_cluster/stats", "_search", "index1", "index2"],
       prefixToAdd: "",
       suffixToAdd: ""
@@ -1049,21 +1056,21 @@ context_tests(
   [
     {
       name: "Endpoints with slashes - before slash",
-      cursor: {row: 0, column: 7},
+      cursor: { row: 0, column: 7 },
       autoCompleteSet: ["_cluster/nodes/stats", "_cluster/stats", "_search", "index1", "index2"],
       prefixToAdd: "",
       suffixToAdd: ""
     },
     {
       name: "Endpoints with slashes - on slash",
-      cursor: {row: 0, column: 12},
+      cursor: { row: 0, column: 12 },
       autoCompleteSet: ["_cluster/nodes/stats", "_cluster/stats", "_search", "index1", "index2"],
       prefixToAdd: "",
       suffixToAdd: ""
     },
     {
       name: "Endpoints with slashes - after slash",
-      cursor: {row: 0, column: 13},
+      cursor: { row: 0, column: 13 },
       autoCompleteSet: ["nodes/stats", "stats"],
       prefixToAdd: "",
       suffixToAdd: ""
@@ -1079,10 +1086,10 @@ context_tests(
   [
     {
       name: "Endpoints with slashes - after slash",
-      cursor: {row: 0, column: 14},
+      cursor: { row: 0, column: 14 },
       autoCompleteSet: [
-        {name: "nodes/stats", meta: "endpoint"},
-        {name: "stats", meta: "endpoint"}
+        { name: "nodes/stats", meta: "endpoint" },
+        { name: "stats", meta: "endpoint" }
       ],
       prefixToAdd: "",
       suffixToAdd: "",
@@ -1099,7 +1106,7 @@ context_tests(
   [
     {
       name: "Endpoints with two slashes",
-      cursor: {row: 0, column: 20},
+      cursor: { row: 0, column: 20 },
       autoCompleteSet: ["stats"],
       prefixToAdd: "",
       suffixToAdd: "",
@@ -1116,13 +1123,13 @@ context_tests(
   [
     {
       name: "Immediately after space + method",
-      cursor: {row: 0, column: 4},
+      cursor: { row: 0, column: 4 },
       autoCompleteSet: [
-        {name: "_cluster/nodes/stats", meta: "endpoint"},
-        {name: "_cluster/stats", meta: "endpoint"},
-        {name: "_search", meta: "endpoint"},
-        {name: "index1", meta: "index"},
-        {name: "index2", meta: "index"}
+        { name: "_cluster/nodes/stats", meta: "endpoint" },
+        { name: "_cluster/stats", meta: "endpoint" },
+        { name: "_search", meta: "endpoint" },
+        { name: "index1", meta: "index" },
+        { name: "index2", meta: "index" }
       ],
       prefixToAdd: "",
       suffixToAdd: "",
@@ -1139,13 +1146,13 @@ context_tests(
   [
     {
       name: "Endpoints by subpart",
-      cursor: {row: 0, column: 6},
+      cursor: { row: 0, column: 6 },
       autoCompleteSet: [
-        {name: "_cluster/nodes/stats", meta: "endpoint"},
-        {name: "_cluster/stats", meta: "endpoint"},
-        {name: "_search", meta: "endpoint"},
-        {name: "index1", meta: "index"},
-        {name: "index2", meta: "index"}
+        { name: "_cluster/nodes/stats", meta: "endpoint" },
+        { name: "_cluster/stats", meta: "endpoint" },
+        { name: "_search", meta: "endpoint" },
+        { name: "index1", meta: "index" },
+        { name: "index2", meta: "index" }
       ],
       prefixToAdd: "",
       suffixToAdd: "",
@@ -1162,13 +1169,13 @@ context_tests(
   [
     {
       name: "Endpoints by subpart",
-      cursor: {row: 0, column: 7},
+      cursor: { row: 0, column: 7 },
       autoCompleteSet: [
-        {name: "_cluster/nodes/stats", meta: "endpoint"},
-        {name: "_cluster/stats", meta: "endpoint"},
-        {name: "_search", meta: "endpoint"},
-        {name: "index1", meta: "index"},
-        {name: "index2", meta: "index"}
+        { name: "_cluster/nodes/stats", meta: "endpoint" },
+        { name: "_cluster/stats", meta: "endpoint" },
+        { name: "_search", meta: "endpoint" },
+        { name: "index1", meta: "index" },
+        { name: "index2", meta: "index" }
       ],
       prefixToAdd: "",
       suffixToAdd: "",
@@ -1186,13 +1193,13 @@ context_tests(
   [
     {
       name: "Params just after ?",
-      cursor: {row: 0, column: 12},
+      cursor: { row: 0, column: 12 },
       autoCompleteSet: [
-        {name: "filter_path", meta: "param", "insert_value": "filter_path="},
-        {name: "format", meta: "param", "insert_value": "format="},
-        {name: "pretty", meta: "flag"},
-        {name: "scroll", meta: "param", "insert_value": "scroll="},
-        {name: "search_type", meta: "param", "insert_value": "search_type="},
+        { name: "filter_path", meta: "param", "insert_value": "filter_path=" },
+        { name: "format", meta: "param", "insert_value": "format=" },
+        { name: "pretty", meta: "flag" },
+        { name: "scroll", meta: "param", "insert_value": "scroll=" },
+        { name: "search_type", meta: "param", "insert_value": "search_type=" },
       ],
       prefixToAdd: "",
       suffixToAdd: ""
@@ -1208,10 +1215,10 @@ context_tests(
   [
     {
       name: "Params values",
-      cursor: {row: 0, column: 19},
+      cursor: { row: 0, column: 19 },
       autoCompleteSet: [
-        {name: "json", meta: "format"},
-        {name: "yaml", meta: "format"}
+        { name: "json", meta: "format" },
+        { name: "yaml", meta: "format" }
       ],
       prefixToAdd: "",
       suffixToAdd: ""
@@ -1227,13 +1234,13 @@ context_tests(
   [
     {
       name: "Params after amp",
-      cursor: {row: 0, column: 24},
+      cursor: { row: 0, column: 24 },
       autoCompleteSet: [
-        {name: "filter_path", meta: "param", "insert_value": "filter_path="},
-        {name: "format", meta: "param", "insert_value": "format="},
-        {name: "pretty", meta: "flag"},
-        {name: "scroll", meta: "param", "insert_value": "scroll="},
-        {name: "search_type", meta: "param", "insert_value": "search_type="},
+        { name: "filter_path", meta: "param", "insert_value": "filter_path=" },
+        { name: "format", meta: "param", "insert_value": "format=" },
+        { name: "pretty", meta: "flag" },
+        { name: "scroll", meta: "param", "insert_value": "scroll=" },
+        { name: "search_type", meta: "param", "insert_value": "search_type=" },
       ],
       prefixToAdd: "",
       suffixToAdd: ""
@@ -1249,17 +1256,17 @@ context_tests(
   [
     {
       name: "Params on existing param",
-      cursor: {row: 0, column: 26},
+      cursor: { row: 0, column: 26 },
       rangeToReplace: {
-        start: {row: 0, column: 24},
-        end: {row: 0, column: 30}
+        start: { row: 0, column: 24 },
+        end: { row: 0, column: 30 }
       },
       autoCompleteSet: [
-        {name: "filter_path", meta: "param", "insert_value": "filter_path="},
-        {name: "format", meta: "param", "insert_value": "format="},
-        {name: "pretty", meta: "flag"},
-        {name: "scroll", meta: "param", "insert_value": "scroll="},
-        {name: "search_type", meta: "param", "insert_value": "search_type="},
+        { name: "filter_path", meta: "param", "insert_value": "filter_path=" },
+        { name: "format", meta: "param", "insert_value": "format=" },
+        { name: "pretty", meta: "flag" },
+        { name: "scroll", meta: "param", "insert_value": "scroll=" },
+        { name: "search_type", meta: "param", "insert_value": "search_type=" },
       ],
       prefixToAdd: "",
       suffixToAdd: ""
@@ -1275,14 +1282,14 @@ context_tests(
   [
     {
       name: "Params on existing value",
-      cursor: {row: 0, column: 37},
+      cursor: { row: 0, column: 37 },
       rangeToReplace: {
-        start: {row: 0, column: 36},
-        end: {row: 0, column: 39}
+        start: { row: 0, column: 36 },
+        end: { row: 0, column: 39 }
       },
       autoCompleteSet: [
-        {name: "count", meta: "search_type"},
-        {name: "query_then_fetch", meta: "search_type"},
+        { name: "count", meta: "search_type" },
+        { name: "query_then_fetch", meta: "search_type" },
       ],
       prefixToAdd: "",
       suffixToAdd: ""
@@ -1297,14 +1304,14 @@ context_tests(
   [
     {
       name: "Params on just after = with existing value",
-      cursor: {row: 0, column: 36},
+      cursor: { row: 0, column: 36 },
       rangeToReplace: {
-        start: {row: 0, column: 36},
-        end: {row: 0, column: 36}
+        start: { row: 0, column: 36 },
+        end: { row: 0, column: 36 }
       },
       autoCompleteSet: [
-        {name: "count", meta: "search_type"},
-        {name: "query_then_fetch", meta: "search_type"},
+        { name: "count", meta: "search_type" },
+        { name: "query_then_fetch", meta: "search_type" },
       ],
       prefixToAdd: "",
       suffixToAdd: ""
@@ -1327,32 +1334,32 @@ context_tests(
   [
     {
       name: "fullurl - existing dictionary key, no template",
-      cursor: {row: 1, column: 6},
+      cursor: { row: 1, column: 6 },
       initialValue: "query",
       addTemplate: false,
       prefixToAdd: "",
       suffixToAdd: "",
-      rangeToReplace: {start: {row: 1, column: 3}, end: {row: 1, column: 10}},
+      rangeToReplace: { start: { row: 1, column: 3 }, end: { row: 1, column: 10 } },
       autoCompleteSet: ["facets", "query", "size"]
     },
     {
       name: "fullurl - existing inner dictionary key",
-      cursor: {row: 2, column: 7},
+      cursor: { row: 2, column: 7 },
       initialValue: "field",
       addTemplate: false,
       prefixToAdd: "",
       suffixToAdd: "",
-      rangeToReplace: {start: {row: 2, column: 6}, end: {row: 2, column: 13}},
+      rangeToReplace: { start: { row: 2, column: 6 }, end: { row: 2, column: 13 } },
       autoCompleteSet: ["match_all", "term"]
     },
     {
       name: "fullurl - existing dictionary key, yes template",
-      cursor: {row: 4, column: 7},
+      cursor: { row: 4, column: 7 },
       initialValue: "facets",
       addTemplate: true,
       prefixToAdd: "",
       suffixToAdd: "",
-      rangeToReplace: {start: {row: 4, column: 3}, end: {row: 4, column: 15}},
+      rangeToReplace: { start: { row: 4, column: 3 }, end: { row: 4, column: 15 } },
       autoCompleteSet: ["facets", "query", "size"]
     }
   ]
diff --git a/src/core_plugins/console/public/tests/src/kb_tests.js b/src/core_plugins/console/public/tests/src/kb_tests.js
index f9a51bbbb6b19..0959213896932 100644
--- a/src/core_plugins/console/public/tests/src/kb_tests.js
+++ b/src/core_plugins/console/public/tests/src/kb_tests.js
@@ -2,7 +2,11 @@ let kb = require('../../src/kb');
 let mappings = require('../../src/mappings');
 let autocomplete_engine = require('../../src/autocomplete/engine');
 
-var {test, module, ok, fail, asyncTest, deepEqual, equal, start} = QUnit;
+var {
+  test,
+  module,
+  deepEqual
+} = QUnit;
 
 module("Knowledge base", {
   setup: function () {
@@ -19,8 +23,8 @@ var MAPPING = {
   "index1": {
     "type1.1": {
       "properties": {
-        "field1.1.1": {"type": "string"},
-        "field1.1.2": {"type": "long"}
+        "field1.1.1": { "type": "string" },
+        "field1.1.2": { "type": "long" }
       }
     },
     "type1.2": {
@@ -30,8 +34,8 @@ var MAPPING = {
   "index2": {
     "type2.1": {
       "properties": {
-        "field2.1.1": {"type": "string"},
-        "field2.1.2": {"type": "string"}
+        "field2.1.1": { "type": "string" },
+        "field2.1.2": { "type": "string" }
       }
     }
   }
@@ -42,13 +46,13 @@ function testUrlContext(tokenPath, otherTokenValues, expectedContext) {
   if (expectedContext.autoCompleteSet) {
     expectedContext.autoCompleteSet = _.map(expectedContext.autoCompleteSet, function (t) {
       if (_.isString(t)) {
-        t = {name: t}
+        t = { name: t }
       }
       return t;
     })
   }
 
-  var context = {otherTokenValues: otherTokenValues};
+  var context = { otherTokenValues: otherTokenValues };
   autocomplete_engine.populateContext(tokenPath, context, null,
     expectedContext.autoCompleteSet, kb.getTopLevelUrlCompleteComponents()
   );
@@ -62,7 +66,7 @@ function testUrlContext(tokenPath, otherTokenValues, expectedContext) {
 
   function norm(t) {
     if (_.isString(t)) {
-      return {name: t};
+      return { name: t };
     }
     return t;
   }
@@ -78,11 +82,11 @@ function testUrlContext(tokenPath, otherTokenValues, expectedContext) {
 }
 
 function t(term) {
-  return {name: term, meta: "type"};
+  return { name: term, meta: "type" };
 }
 
 function i(term) {
-  return {name: term, meta: "index"};
+  return { name: term, meta: "index" };
 }
 
 function index_test(name, tokenPath, otherTokenValues, expectedContext) {
@@ -93,7 +97,7 @@ function index_test(name, tokenPath, otherTokenValues, expectedContext) {
           _multi_indices: {
             patterns: ["{indices}/_multi_indices"]
           },
-          _single_index: {patterns: ["{index}/_single_index"]},
+          _single_index: { patterns: ["{index}/_single_index"] },
           _no_index: {
             // testing default patters
             //  patterns: ["_no_index"]
@@ -110,22 +114,22 @@ function index_test(name, tokenPath, otherTokenValues, expectedContext) {
 }
 
 index_test("Index integration 1", [], [],
-  {autoCompleteSet: ["_no_index", i("index1"), i("index2")]}
+  { autoCompleteSet: ["_no_index", i("index1"), i("index2")] }
 );
 
 index_test("Index integration 2", [], ["index1"],
   // still return _no_index as index1 is not committed to yet.
-  {autoCompleteSet: ["_no_index", i("index2")]}
+  { autoCompleteSet: ["_no_index", i("index2")] }
 );
 
 index_test("Index integration 2", ["index1"], [],
-  {indices: ["index1"], autoCompleteSet: ["_multi_indices", "_single_index"]}
+  { indices: ["index1"], autoCompleteSet: ["_multi_indices", "_single_index"] }
 );
 
 index_test("Index integration 2", [
     ["index1", "index2"]
   ], [],
-  {indices: ["index1", "index2"], autoCompleteSet: ["_multi_indices"]}
+  { indices: ["index1", "index2"], autoCompleteSet: ["_multi_indices"] }
 );
 
 function type_test(name, tokenPath, otherTokenValues, expectedContext) {
@@ -133,9 +137,9 @@ function type_test(name, tokenPath, otherTokenValues, expectedContext) {
     var test_api = kb._test.loadApisFromJson({
       "type_test": {
         endpoints: {
-          _multi_types: {patterns: ["{indices}/{types}/_multi_types"]},
-          _single_type: {patterns: ["{indices}/{type}/_single_type"]},
-          _no_types: {patterns: ["{indices}/_no_types"]}
+          _multi_types: { patterns: ["{indices}/{types}/_multi_types"] },
+          _single_type: { patterns: ["{indices}/{type}/_single_type"] },
+          _no_types: { patterns: ["{indices}/_no_types"] }
         }
       }
     }, kb._test.globalUrlComponentFactories);
@@ -149,24 +153,24 @@ function type_test(name, tokenPath, otherTokenValues, expectedContext) {
 }
 
 type_test("Type integration 1", ["index1"], [],
-  {indices: ["index1"], autoCompleteSet: ["_no_types", t("type1.1"), t("type1.2")]}
+  { indices: ["index1"], autoCompleteSet: ["_no_types", t("type1.1"), t("type1.2")] }
 );
 type_test("Type integration 2", ["index1"], ["type1.2"],
   // we are not yet comitted to type1.2, so _no_types is returned
-  {indices: ["index1"], autoCompleteSet: ["_no_types", t("type1.1")]}
+  { indices: ["index1"], autoCompleteSet: ["_no_types", t("type1.1")] }
 );
 
 type_test("Type integration 3", ["index2"], [],
-  {indices: ["index2"], autoCompleteSet: ["_no_types", t("type2.1")]}
+  { indices: ["index2"], autoCompleteSet: ["_no_types", t("type2.1")] }
 );
 
 type_test("Type integration 4", ["index1", "type1.2"], [],
-  {indices: ["index1"], types: ["type1.2"], autoCompleteSet: ["_multi_types", "_single_type"]}
+  { indices: ["index1"], types: ["type1.2"], autoCompleteSet: ["_multi_types", "_single_type"] }
 );
 
 type_test("Type integration 5", [
     ["index1", "index2"],
     ["type1.2", "type1.1"]
   ], [],
-  {indices: ["index1", "index2"], types: ["type1.2", "type1.1"], autoCompleteSet: ["_multi_types"]}
+  { indices: ["index1", "index2"], types: ["type1.2", "type1.1"], autoCompleteSet: ["_multi_types"] }
 );
diff --git a/src/core_plugins/console/public/tests/src/mapping_tests.js b/src/core_plugins/console/public/tests/src/mapping_tests.js
index cd79c6f3d4c54..fa1ecbe6a82a9 100644
--- a/src/core_plugins/console/public/tests/src/mapping_tests.js
+++ b/src/core_plugins/console/public/tests/src/mapping_tests.js
@@ -1,6 +1,10 @@
 let mappings = require('../../src/mappings');
 
-var {test, module, ok, fail, asyncTest, deepEqual, equal, start} = QUnit;
+var {
+  test,
+  module,
+  deepEqual
+} = QUnit;
 
 module("Mappings", {
   setup: function () {
@@ -22,7 +26,7 @@ function fc(f1, f2) {
 }
 
 function f(name, type) {
-  return {name: name, type: type || "string"};
+  return { name: name, type: type || "string" };
 }
 
 test("Multi fields", function () {
@@ -34,16 +38,16 @@ test("Multi fields", function () {
             "type": "multi_field",
             "path": "just_name",
             "fields": {
-              "first_name": {"type": "string", "index": "analyzed"},
-              "any_name": {"type": "string", "index": "analyzed"}
+              "first_name": { "type": "string", "index": "analyzed" },
+              "any_name": { "type": "string", "index": "analyzed" }
             }
           },
           "last_name": {
             "type": "multi_field",
             "path": "just_name",
             "fields": {
-              "last_name": {"type": "string", "index": "analyzed"},
-              "any_name": {"type": "string", "index": "analyzed"}
+              "last_name": { "type": "string", "index": "analyzed" },
+              "any_name": { "type": "string", "index": "analyzed" }
             }
           }
         }
@@ -64,13 +68,13 @@ test("Multi fields 1.0 style", function () {
             "type": "string", "index": "analyzed",
             "path": "just_name",
             "fields": {
-              "any_name": {"type": "string", "index": "analyzed"}
+              "any_name": { "type": "string", "index": "analyzed" }
             }
           },
           "last_name": {
             "type": "string", "index": "no",
             "fields": {
-              "raw": {"type": "string", "index": "analyzed"}
+              "raw": { "type": "string", "index": "analyzed" }
             }
           }
         }
@@ -132,14 +136,14 @@ QUnit.test("Nested fields", function () {
             "properties": {
               "name": {
                 "properties": {
-                  "first_name": {"type": "string"},
-                  "last_name": {"type": "string"}
+                  "first_name": { "type": "string" },
+                  "last_name": { "type": "string" }
                 }
               },
-              "sid": {"type": "string", "index": "not_analyzed"}
+              "sid": { "type": "string", "index": "not_analyzed" }
             }
           },
-          "message": {"type": "string"}
+          "message": { "type": "string" }
         }
       }
     }
@@ -161,10 +165,10 @@ test("Enabled fields", function () {
                 "type": "object",
                 "enabled": false
               },
-              "sid": {"type": "string", "index": "not_analyzed"}
+              "sid": { "type": "string", "index": "not_analyzed" }
             }
           },
-          "message": {"type": "string"}
+          "message": { "type": "string" }
         }
       }
     }
@@ -184,16 +188,16 @@ test("Path tests", function () {
             "type": "object",
             "path": "just_name",
             "properties": {
-              "first1": {"type": "string"},
-              "last1": {"type": "string", "index_name": "i_last_1"}
+              "first1": { "type": "string" },
+              "last1": { "type": "string", "index_name": "i_last_1" }
             }
           },
           "name2": {
             "type": "object",
             "path": "full",
             "properties": {
-              "first2": {"type": "string"},
-              "last2": {"type": "string", "index_name": "i_last_2"}
+              "first2": { "type": "string" },
+              "last2": { "type": "string", "index_name": "i_last_2" }
             }
           }
         }
@@ -210,7 +214,7 @@ test("Use index_name tests", function () {
     "index": {
       "person": {
         "properties": {
-          "last1": {"type": "string", "index_name": "i_last_1"}
+          "last1": { "type": "string", "index_name": "i_last_1" }
         }
       }
     }
@@ -244,14 +248,14 @@ test("Aliases", function () {
     "test_index1": {
       "type1": {
         "properties": {
-          "last1": {"type": "string", "index_name": "i_last_1"}
+          "last1": { "type": "string", "index_name": "i_last_1" }
         }
       }
     },
     "test_index2": {
       "type2": {
         "properties": {
-          "last1": {"type": "string", "index_name": "i_last_1"}
+          "last1": { "type": "string", "index_name": "i_last_1" }
         }
       }
     }
diff --git a/src/core_plugins/console/public/tests/src/tokenization_tests.js b/src/core_plugins/console/public/tests/src/tokenization_tests.js
index 5162609d9dd9a..bcd6a55ca5269 100644
--- a/src/core_plugins/console/public/tests/src/tokenization_tests.js
+++ b/src/core_plugins/console/public/tests/src/tokenization_tests.js
@@ -1,9 +1,13 @@
 let ace = require('ace');
-let $ = require('jquery');
 let input = require('../../src/input');
 
 var token_iterator = ace.require("ace/token_iterator");
-var {test, module, ok, fail, asyncTest, deepEqual, equal, start} = QUnit;
+var {
+  module,
+  asyncTest,
+  deepEqual,
+  start
+} = QUnit;
 
 module("Tokenization", {
   setup: function () {
@@ -24,7 +28,7 @@ function tokensAsList() {
     t = input.parser.nextNonEmptyToken(iter);
   }
   while (t) {
-    ret.push({value: t.value, type: t.type});
+    ret.push({ value: t.value, type: t.type });
     t = input.parser.nextNonEmptyToken(iter);
   }
 
@@ -51,7 +55,7 @@ function token_test(token_list, prefix, data) {
       var tokens = tokensAsList();
       var normTokenList = [];
       for (var i = 0; i < token_list.length; i++) {
-        normTokenList.push({type: token_list[i++], value: token_list[i]});
+        normTokenList.push({ type: token_list[i++], value: token_list[i] });
       }
 
       deepEqual(tokens, normTokenList, "Doc:\n" + data);
diff --git a/src/core_plugins/console/public/tests/src/url_autocomplete_tests.js b/src/core_plugins/console/public/tests/src/url_autocomplete_tests.js
index e6f63c2a4398a..1db6035921faf 100644
--- a/src/core_plugins/console/public/tests/src/url_autocomplete_tests.js
+++ b/src/core_plugins/console/public/tests/src/url_autocomplete_tests.js
@@ -2,7 +2,11 @@ let _ = require('lodash');
 let url_pattern_matcher = require('../../src/autocomplete/url_pattern_matcher');
 let autocomplete_engine = require('../../src/autocomplete/engine');
 
-var {test, module, ok, fail, asyncTest, deepEqual, equal, start} = QUnit;
+var {
+  test,
+  module,
+  deepEqual
+} = QUnit;
 
 module("Url autocomplete");
 
@@ -32,7 +36,7 @@ function patterns_test(name, endpoints, tokenPath, expectedContext, globalUrlCom
     if (expectedContext.autoCompleteSet) {
       expectedContext.autoCompleteSet = _.map(expectedContext.autoCompleteSet, function (t) {
         if (_.isString(t)) {
-          t = {name: t}
+          t = { name: t }
         }
         return t;
       });
@@ -63,7 +67,7 @@ function patterns_test(name, endpoints, tokenPath, expectedContext, globalUrlCom
 
 function t(name, meta) {
   if (meta) {
-    return {name: name, meta: meta};
+    return { name: name, meta: meta };
   }
   return name;
 }
@@ -79,14 +83,14 @@ function t(name, meta) {
   patterns_test("simple single path - completion",
     endpoints,
     "a/b$",
-    {endpoint: "1"}
+    { endpoint: "1" }
   );
 
 
   patterns_test("simple single path - completion, with auto complete",
     endpoints,
     "a/b",
-    {autoCompleteSet: []}
+    { autoCompleteSet: [] }
   );
 
   patterns_test("simple single path - partial, without auto complete",
@@ -98,13 +102,13 @@ function t(name, meta) {
   patterns_test("simple single path - partial, with auto complete",
     endpoints,
     "a",
-    {autoCompleteSet: ["b"]}
+    { autoCompleteSet: ["b"] }
   );
 
   patterns_test("simple single path - partial, with auto complete",
     endpoints,
     [],
-    {autoCompleteSet: ["a/b"]}
+    { autoCompleteSet: ["a/b"] }
   );
 
   patterns_test("simple single path - different path",
@@ -132,31 +136,31 @@ function t(name, meta) {
   patterns_test("shared path  - completion 1",
     endpoints,
     "a/b$",
-    {endpoint: "1"}
+    { endpoint: "1" }
   );
 
   patterns_test("shared path  - completion 2",
     endpoints,
     "a/c$",
-    {endpoint: "2"}
+    { endpoint: "2" }
   );
 
   patterns_test("shared path  - completion 1 with param",
     endpoints,
     "a/b/v$",
-    {endpoint: "1", p: "v"}
+    { endpoint: "1", p: "v" }
   );
 
   patterns_test("shared path - partial, with auto complete",
     endpoints,
     "a",
-    {autoCompleteSet: ["b", "c"]}
+    { autoCompleteSet: ["b", "c"] }
   );
 
   patterns_test("shared path - partial, with auto complete of param, no options",
     endpoints,
     "a/b",
-    {autoCompleteSet: []}
+    { autoCompleteSet: [] }
   );
 
   patterns_test("shared path - partial, without auto complete",
@@ -168,7 +172,7 @@ function t(name, meta) {
   patterns_test("shared path - different path - with auto complete",
     endpoints,
     "a/e",
-    {autoCompleteSet: []}
+    { autoCompleteSet: [] }
   );
 
   patterns_test("shared path - different path - without auto complete",
@@ -198,25 +202,25 @@ function t(name, meta) {
   patterns_test("option testing - completion 1",
     endpoints,
     "a/a$",
-    {endpoint: "1", p: ["a"]}
+    { endpoint: "1", p: ["a"] }
   );
 
   patterns_test("option testing - completion 2",
     endpoints,
     "a/b$",
-    {endpoint: "1", p: ["b"]}
+    { endpoint: "1", p: ["b"] }
   );
 
   patterns_test("option testing - completion 3",
     endpoints,
     "a/b,a$",
-    {endpoint: "1", p: ["b", "a"]}
+    { endpoint: "1", p: ["b", "a"] }
   );
 
   patterns_test("option testing - completion 4",
     endpoints,
     "a/c$",
-    {endpoint: "2"}
+    { endpoint: "2" }
   );
 
   patterns_test("option testing  - completion 5",
@@ -228,7 +232,7 @@ function t(name, meta) {
   patterns_test("option testing - partial, with auto complete",
     endpoints,
     "a",
-    {autoCompleteSet: [t("a", "p"), t("b", "p"), "c"]}
+    { autoCompleteSet: [t("a", "p"), t("b", "p"), "c"] }
   );
 
   patterns_test("option testing - partial, without auto complete",
@@ -241,7 +245,7 @@ function t(name, meta) {
   patterns_test("option testing - different path - with auto complete",
     endpoints,
     "a/e",
-    {autoCompleteSet: []}
+    { autoCompleteSet: [] }
   );
 
 
@@ -284,14 +288,14 @@ function t(name, meta) {
   patterns_test("global parameters testing - completion 1",
     endpoints,
     "a/a$",
-    {endpoint: "1", p: ["a"]},
+    { endpoint: "1", p: ["a"] },
     globalFactories
   );
 
   patterns_test("global parameters testing - completion 2",
     endpoints,
     "b/g1$",
-    {endpoint: "2", p: ["g1"]},
+    { endpoint: "2", p: ["g1"] },
     globalFactories
   );
 
@@ -299,27 +303,27 @@ function t(name, meta) {
   patterns_test("global parameters testing - partial, with auto complete",
     endpoints,
     "a",
-    {autoCompleteSet: [t("a", "p"), t("b", "p")]},
+    { autoCompleteSet: [t("a", "p"), t("b", "p")] },
     globalFactories
   );
 
   patterns_test("global parameters testing - partial, with auto complete 2",
     endpoints,
     "b",
-    {autoCompleteSet: [t("g1", "p"), t("g2", "p"), t("la", "l"), t("lb", "l")]},
+    { autoCompleteSet: [t("g1", "p"), t("g2", "p"), t("la", "l"), t("lb", "l")] },
     globalFactories
   );
 
   patterns_test("Non valid token acceptance - partial, with auto complete 1",
     endpoints,
     "b/la",
-    {autoCompleteSet: ["c"], "l": ["la"]},
+    { autoCompleteSet: ["c"], "l": ["la"] },
     globalFactories
   );
   patterns_test("Non valid token acceptance - partial, with auto complete 2",
     endpoints,
     "b/non_valid",
-    {autoCompleteSet: ["c"], "l": ["non_valid"]},
+    { autoCompleteSet: ["c"], "l": ["non_valid"] },
     globalFactories
   );
 
@@ -336,25 +340,25 @@ function t(name, meta) {
   patterns_test("look ahead - autocomplete before param 1",
     endpoints,
     "a",
-    {autoCompleteSet: ["b"]}
+    { autoCompleteSet: ["b"] }
   );
 
   patterns_test("look ahead - autocomplete before param 2",
     endpoints,
     [],
-    {autoCompleteSet: ["a/b"]}
+    { autoCompleteSet: ["a/b"] }
   );
 
   patterns_test("look ahead - autocomplete after param 1",
     endpoints,
     "a/b/v",
-    {autoCompleteSet: ["c/e"], "p": "v"}
+    { autoCompleteSet: ["c/e"], "p": "v" }
   );
 
   patterns_test("look ahead - autocomplete after param 2",
     endpoints,
     "a/b/v/c",
-    {autoCompleteSet: ["e"], "p": "v"}
+    { autoCompleteSet: ["e"], "p": "v" }
   );
 })();
 
@@ -380,7 +384,7 @@ function t(name, meta) {
   patterns_test("Competing endpoints - priority 1",
     e,
     "a/b$",
-    {method: "GET", endpoint: "1_param", "p": "b"}
+    { method: "GET", endpoint: "1_param", "p": "b" }
   );
   e = _.cloneDeep(endpoints);
   e["1_param"].priority = 1;
@@ -388,7 +392,7 @@ function t(name, meta) {
   patterns_test("Competing endpoints - priority 2",
     e,
     "a/b$",
-    {method: "GET", endpoint: "2_explicit"}
+    { method: "GET", endpoint: "2_explicit" }
   );
 
   e = _.cloneDeep(endpoints);
@@ -396,7 +400,7 @@ function t(name, meta) {
   patterns_test("Competing endpoints - priority 3",
     e,
     "a/b$",
-    {method: "GET", endpoint: "2_explicit"}
+    { method: "GET", endpoint: "2_explicit" }
   );
 
 })();
@@ -431,44 +435,44 @@ function t(name, meta) {
   patterns_test("Competing endpoint - sub url of another - auto complete",
     endpoints,
     "a",
-    {method: "GET", autoCompleteSet: ["b"]}
+    { method: "GET", autoCompleteSet: ["b"] }
   );
   patterns_test("Competing endpoint - sub url of another, complete 1",
     endpoints,
     "a$",
-    {method: "GET", endpoint: "1_GET"}
+    { method: "GET", endpoint: "1_GET" }
   );
   patterns_test("Competing endpoint - sub url of another, complete 2",
     endpoints,
     "a$",
-    {method: "PUT", endpoint: "1_PUT"}
+    { method: "PUT", endpoint: "1_PUT" }
   );
   patterns_test("Competing endpoint - sub url of another, complete 3",
     endpoints,
     "a$",
-    {method: "DELETE"}
+    { method: "DELETE" }
   );
 
   patterns_test("Competing endpoint - extension of another, complete 1, auto complete",
     endpoints,
     "a/b$",
-    {method: "PUT", autoCompleteSet: []}
+    { method: "PUT", autoCompleteSet: [] }
   );
 
   patterns_test("Competing endpoint - extension of another, complete 1",
     endpoints,
     "a/b$",
-    {method: "GET", endpoint: "2_GET"}
+    { method: "GET", endpoint: "2_GET" }
   );
 
   patterns_test("Competing endpoint - extension of another, complete 1",
     endpoints,
     "a/b$",
-    {method: "DELETE", endpoint: "2_DELETE"}
+    { method: "DELETE", endpoint: "2_DELETE" }
   );
   patterns_test("Competing endpoint - extension of another, complete 1",
     endpoints,
     "a/b$",
-    {method: "PUT"}
+    { method: "PUT" }
   );
 })();
diff --git a/src/core_plugins/console/public/tests/src/url_params_tests.js b/src/core_plugins/console/public/tests/src/url_params_tests.js
index a529e67b42b2f..b4a1490d20728 100644
--- a/src/core_plugins/console/public/tests/src/url_params_tests.js
+++ b/src/core_plugins/console/public/tests/src/url_params_tests.js
@@ -2,7 +2,11 @@ let _ = require('lodash');
 let url_params = require('../../src/autocomplete/url_params');
 let autocomplete_engine = require('../../src/autocomplete/engine');
 
-var {test, module, ok, fail, asyncTest, deepEqual, equal, start} = QUnit;
+var {
+  test,
+  module,
+  deepEqual
+} = QUnit;
 
 module("Url params");
 
@@ -23,7 +27,7 @@ function param_test(name, description, tokenPath, expectedContext, globalParams)
     if (expectedContext.autoCompleteSet) {
       expectedContext.autoCompleteSet = _.map(expectedContext.autoCompleteSet, function (t) {
         if (_.isString(t)) {
-          t = {name: t}
+          t = { name: t }
         }
         return t;
       });
@@ -49,14 +53,14 @@ function param_test(name, description, tokenPath, expectedContext, globalParams)
 function t(name, meta, insert_value) {
   var r = name;
   if (meta) {
-    r = {name: name, meta: meta};
+    r = { name: name, meta: meta };
     if (meta === "param" && !insert_value) {
       insert_value = name + "=";
     }
   }
   if (insert_value) {
     if (_.isString(r)) {
-      r = {name: name}
+      r = { name: name }
     }
     r.insert_value = insert_value;
   }
@@ -71,19 +75,19 @@ function t(name, meta, insert_value) {
   param_test("settings params",
     params,
     "a/1",
-    {"a": ["1"]}
+    { "a": ["1"] }
   );
 
   param_test("autocomplete top level",
     params,
     [],
-    {autoCompleteSet: [t("a", "param"), t("b", "flag")]}
+    { autoCompleteSet: [t("a", "param"), t("b", "flag")] }
   );
 
   param_test("autocomplete top level, with defaults",
     params,
     [],
-    {autoCompleteSet: [t("a", "param"), t("b", "flag"), t("c", "param")]},
+    { autoCompleteSet: [t("a", "param"), t("b", "flag"), t("c", "param")] },
     {
       "c": [2]
     }
@@ -92,13 +96,13 @@ function t(name, meta, insert_value) {
   param_test("autocomplete values",
     params,
     "a",
-    {autoCompleteSet: [t("1", "a"), t("2", "a")]}
+    { autoCompleteSet: [t("1", "a"), t("2", "a")] }
   );
 
   param_test("autocomplete values flag",
     params,
     "b",
-    {autoCompleteSet: [t("true", "b"), t("false", "b")]}
+    { autoCompleteSet: [t("true", "b"), t("false", "b")] }
   );
 
 
diff --git a/src/core_plugins/console/public/tests/webpackShims/qunit-1.10.0.js b/src/core_plugins/console/public/tests/webpackShims/qunit-1.10.0.js
index 002d5f5a7eaeb..4014c1f469522 100644
--- a/src/core_plugins/console/public/tests/webpackShims/qunit-1.10.0.js
+++ b/src/core_plugins/console/public/tests/webpackShims/qunit-1.10.0.js
@@ -1202,7 +1202,7 @@
   function extractStacktrace(e, offset) {
     offset = offset === undefined ? 3 : offset;
 
-    var stack, include, i, regex;
+    var stack, include, i;
 
     if (e.stacktrace) {
       // Opera
@@ -1309,7 +1309,7 @@
     }
   }
 
-  function checkPollution(name) {
+  function checkPollution() {
     var newGlobals,
         deletedGlobals,
         old = config.pollution;
diff --git a/src/core_plugins/console/server/__tests__/wildcard_matcher.js b/src/core_plugins/console/server/__tests__/wildcard_matcher.js
index 8ef3131891a83..32dac21e31476 100644
--- a/src/core_plugins/console/server/__tests__/wildcard_matcher.js
+++ b/src/core_plugins/console/server/__tests__/wildcard_matcher.js
@@ -1,6 +1,3 @@
-/* eslint-env mocha */
-import expect from 'expect.js'
-
 import { WildcardMatcher } from '../wildcard_matcher'
 
 function should(candidate, ...constructorArgs) {
diff --git a/src/core_plugins/console/server/proxy_config.js b/src/core_plugins/console/server/proxy_config.js
index 455784df2d125..3e96d1750fd7b 100644
--- a/src/core_plugins/console/server/proxy_config.js
+++ b/src/core_plugins/console/server/proxy_config.js
@@ -1,15 +1,10 @@
-import { memoize, values } from 'lodash'
+import { values } from 'lodash'
 import { format as formatUrl } from 'url'
 import { Agent as HttpsAgent } from 'https'
 import { readFileSync } from 'fs'
 
 import { WildcardMatcher } from './wildcard_matcher'
 
-const makeHttpsAgent = memoize(
-  opts => new HttpsAgent(opts),
-  opts => JSON.stringify(opts)
-)
-
 export class ProxyConfig {
   constructor(config) {
     config = Object.assign({}, config);
diff --git a/src/core_plugins/dev_mode/public/vis_debug_spy_panel.js b/src/core_plugins/dev_mode/public/vis_debug_spy_panel.js
index 05ce703ab2de6..fccc8bfde707c 100644
--- a/src/core_plugins/dev_mode/public/vis_debug_spy_panel.js
+++ b/src/core_plugins/dev_mode/public/vis_debug_spy_panel.js
@@ -2,13 +2,13 @@ import visDebugSpyPanelTemplate from 'plugins/dev_mode/vis_debug_spy_panel.html'
 // register the spy mode or it won't show up in the spys
 require('ui/registry/spy_modes').register(VisDetailsSpyProvider);
 
-function VisDetailsSpyProvider(Notifier, $filter, $rootScope, config) {
+function VisDetailsSpyProvider() {
   return {
     name: 'debug',
     display: 'Debug',
     template: visDebugSpyPanelTemplate,
     order: 5,
-    link: function ($scope, $el) {
+    link: function ($scope) {
       $scope.$watch('vis.getEnabledState() | json', function (json) {
         $scope.visStateJson = json;
       });
diff --git a/src/core_plugins/elasticsearch/index.js b/src/core_plugins/elasticsearch/index.js
index 46cce51c73d59..391323aad4569 100644
--- a/src/core_plugins/elasticsearch/index.js
+++ b/src/core_plugins/elasticsearch/index.js
@@ -46,7 +46,7 @@ module.exports = function ({ Plugin }) {
       }
     },
 
-    init(server, options) {
+    init(server) {
       const kibanaIndex = server.config().get('kibana.index');
 
       // Expose the client to the server
diff --git a/src/core_plugins/elasticsearch/lib/__tests__/check_es_version.js b/src/core_plugins/elasticsearch/lib/__tests__/check_es_version.js
index 74d43816d8384..06600e5f8d605 100644
--- a/src/core_plugins/elasticsearch/lib/__tests__/check_es_version.js
+++ b/src/core_plugins/elasticsearch/lib/__tests__/check_es_version.js
@@ -12,7 +12,6 @@ describe('plugins/elasticsearch', () => {
     const KIBANA_VERSION = '5.1.0';
 
     let server;
-    let plugin;
 
     beforeEach(function () {
       server = {
diff --git a/src/core_plugins/elasticsearch/lib/__tests__/is_es_compatible_with_kibana.js b/src/core_plugins/elasticsearch/lib/__tests__/is_es_compatible_with_kibana.js
index d8b76e14d7d45..d2c98858815b9 100644
--- a/src/core_plugins/elasticsearch/lib/__tests__/is_es_compatible_with_kibana.js
+++ b/src/core_plugins/elasticsearch/lib/__tests__/is_es_compatible_with_kibana.js
@@ -1,5 +1,4 @@
 import expect from 'expect.js';
-import sinon from 'sinon';
 
 import isEsCompatibleWithKibana from '../is_es_compatible_with_kibana';
 
diff --git a/src/core_plugins/elasticsearch/lib/__tests__/is_upgradeable.js b/src/core_plugins/elasticsearch/lib/__tests__/is_upgradeable.js
index 0e9b064393d15..400990a9b8265 100644
--- a/src/core_plugins/elasticsearch/lib/__tests__/is_upgradeable.js
+++ b/src/core_plugins/elasticsearch/lib/__tests__/is_upgradeable.js
@@ -1,6 +1,5 @@
 import _ from 'lodash';
 import expect from 'expect.js';
-import sinon from 'sinon';
 
 import isUpgradeable from '../is_upgradeable';
 import pkg from '../../../../utils/package_json';
@@ -8,7 +7,7 @@ let version = pkg.version;
 
 describe('plugins/elasticsearch', function () {
   describe('lib/is_upgradeable', function () {
-    let server = {
+    const server = {
       config: _.constant({
         get: function (key) {
           switch (key) {
@@ -44,7 +43,7 @@ describe('plugins/elasticsearch', function () {
     upgradeDoc('5.0.0-alpha1', '5.0.0', false);
 
     it('should handle missing _id field', function () {
-      let doc = {
+      const doc = {
         '_index': '.kibana',
         '_type': 'config',
         '_score': 1,
@@ -58,7 +57,7 @@ describe('plugins/elasticsearch', function () {
     });
 
     it('should handle _id of @@version', function () {
-      let doc = {
+      const doc = {
         '_index': '.kibana',
         '_type': 'config',
         '_id': '@@version',
diff --git a/src/core_plugins/elasticsearch/lib/__tests__/map_uri.js b/src/core_plugins/elasticsearch/lib/__tests__/map_uri.js
index 0859ae8640b3f..a3f93ba1897e9 100644
--- a/src/core_plugins/elasticsearch/lib/__tests__/map_uri.js
+++ b/src/core_plugins/elasticsearch/lib/__tests__/map_uri.js
@@ -1,7 +1,6 @@
 import expect from 'expect.js';
 import mapUri from '../map_uri';
 import { get, defaults } from 'lodash';
-import sinon from 'sinon';
 
 describe('plugins/elasticsearch', function () {
   describe('lib/map_uri', function () {
@@ -47,7 +46,7 @@ describe('plugins/elasticsearch', function () {
     it('sends configured custom headers even if the same named header exists in request', function () {
       const server = stubServer({
         'elasticsearch.requestHeadersWhitelist': ['x-my-custom-header'],
-        'elasticsearch.customHeaders': {'x-my-custom-header': 'asconfigured'}
+        'elasticsearch.customHeaders': { 'x-my-custom-header': 'asconfigured' }
       });
 
       mapUri(server)(request, function (err, upstreamUri, upstreamHeaders) {
@@ -97,7 +96,7 @@ describe('plugins/elasticsearch', function () {
       request.path = '/elasticsearch/es/path';
       const server = stubServer();
 
-      mapUri(server)(request, function (err, upstreamUri, upstreamHeaders) {
+      mapUri(server)(request, function (err, upstreamUri) {
         expect(err).to.be(null);
         expect(upstreamUri).to.be('http://localhost:9200/es/path');
       });
@@ -107,7 +106,7 @@ describe('plugins/elasticsearch', function () {
       request.path = '/elasticsearch/index/type';
       const server = stubServer({ 'elasticsearch.url': 'https://localhost:9200/base-path' });
 
-      mapUri(server)(request, function (err, upstreamUri, upstreamHeaders) {
+      mapUri(server)(request, function (err, upstreamUri) {
         expect(err).to.be(null);
         expect(upstreamUri).to.be('https://localhost:9200/base-path/index/type');
       });
@@ -118,7 +117,7 @@ describe('plugins/elasticsearch', function () {
       request.query = { foo: 'bar' };
       const server = stubServer({ 'elasticsearch.url': 'https://localhost:9200/?base=query' });
 
-      mapUri(server)(request, function (err, upstreamUri, upstreamHeaders) {
+      mapUri(server)(request, function (err, upstreamUri) {
         expect(err).to.be(null);
         expect(upstreamUri).to.be('https://localhost:9200/*?foo=bar&base=query');
       });
@@ -129,7 +128,7 @@ describe('plugins/elasticsearch', function () {
       request.query = { _: Date.now() };
       const server = stubServer();
 
-      mapUri(server)(request, function (err, upstreamUri, upstreamHeaders) {
+      mapUri(server)(request, function (err, upstreamUri) {
         expect(err).to.be(null);
         expect(upstreamUri).to.be('http://localhost:9200/*');
       });
diff --git a/src/core_plugins/elasticsearch/lib/__tests__/routes.js b/src/core_plugins/elasticsearch/lib/__tests__/routes.js
index 9bc60d809ccb9..46e519dd4ded4 100644
--- a/src/core_plugins/elasticsearch/lib/__tests__/routes.js
+++ b/src/core_plugins/elasticsearch/lib/__tests__/routes.js
@@ -1,4 +1,3 @@
-import expect from 'expect.js';
 import { format } from 'util';
 
 import * as kbnTestServer from '../../../../../test/utils/kbn_server';
@@ -94,13 +93,13 @@ describe('plugins/elasticsearch', function () {
     testRoute({
       method: 'POST',
       url: '/elasticsearch/.kibana/__kibanaQueryValidator/_validate/query?explain=true&ignore_unavailable=true',
-      payload: {query: {query_string: {analyze_wildcard: true, query: '*'}}}
+      payload: { query: { query_string: { analyze_wildcard: true, query: '*' } } }
     });
 
     testRoute({
       method: 'POST',
       url: '/elasticsearch/_mget',
-      payload: {docs: [{_index: '.kibana', _type: 'index-pattern', _id: '[logstash-]YYYY.MM.DD'}]}
+      payload: { docs: [{ _index: '.kibana', _type: 'index-pattern', _id: '[logstash-]YYYY.MM.DD' }] }
     });
 
     testRoute({
diff --git a/src/core_plugins/elasticsearch/lib/__tests__/set_headers.js b/src/core_plugins/elasticsearch/lib/__tests__/set_headers.js
index 0bed49f4d4c1c..2ee97b53d5474 100644
--- a/src/core_plugins/elasticsearch/lib/__tests__/set_headers.js
+++ b/src/core_plugins/elasticsearch/lib/__tests__/set_headers.js
@@ -1,5 +1,4 @@
 import expect from 'expect.js';
-import sinon from 'sinon';
 import setHeaders from '../set_headers';
 
 describe('plugins/elasticsearch', function () {
diff --git a/src/core_plugins/elasticsearch/lib/__tests__/upgrade_config.js b/src/core_plugins/elasticsearch/lib/__tests__/upgrade_config.js
index 96e744c11ac10..39d627c9800e5 100644
--- a/src/core_plugins/elasticsearch/lib/__tests__/upgrade_config.js
+++ b/src/core_plugins/elasticsearch/lib/__tests__/upgrade_config.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import Promise from 'bluebird';
 import sinon from 'sinon';
 import expect from 'expect.js';
@@ -10,7 +9,6 @@ describe('plugins/elasticsearch', function () {
     let get;
     let server;
     let client;
-    let config;
     let upgrade;
 
     beforeEach(function () {
@@ -46,7 +44,7 @@ describe('plugins/elasticsearch', function () {
         });
 
         it('should resolve buildNum to pkg.buildNum config', function () {
-          return upgrade(response).then(function (resp) {
+          return upgrade(response).then(function () {
             sinon.assert.calledOnce(client.create);
             const params = client.create.args[0][0];
             expect(params.body).to.have.property('buildNum', get('pkg.buildNum'));
@@ -54,7 +52,7 @@ describe('plugins/elasticsearch', function () {
         });
 
         it('should resolve version to pkg.version config', function () {
-          return upgrade(response).then(function (resp) {
+          return upgrade(response).then(function () {
             const params = client.create.args[0][0];
             expect(params).to.have.property('id', get('pkg.version'));
           });
@@ -69,14 +67,14 @@ describe('plugins/elasticsearch', function () {
         });
 
         it('should resolve buildNum to pkg.buildNum config', function () {
-          return upgrade(response).then(function (resp) {
+          return upgrade(response).then(function () {
             const params = client.create.args[0][0];
             expect(params.body).to.have.property('buildNum', get('pkg.buildNum'));
           });
         });
 
         it('should resolve version to pkg.version config', function () {
-          return upgrade(response).then(function (resp) {
+          return upgrade(response).then(function () {
             const params = client.create.args[0][0];
             expect(params).to.have.property('id', get('pkg.version'));
           });
@@ -95,7 +93,7 @@ describe('plugins/elasticsearch', function () {
       get.withArgs('pkg.buildNum').returns(9833);
       client.create.returns(Promise.resolve());
       const response = { hits: { hits: [ { _id: '4.0.1-alpha3' }, { _id: '4.0.1-beta1' }, { _id: '4.0.0-SNAPSHOT1' } ] } };
-      return upgrade(response).then(function (resp) {
+      return upgrade(response).then(function () {
         sinon.assert.calledOnce(client.create);
         const params = client.create.args[0][0];
         expect(params).to.have.property('body');
@@ -110,7 +108,7 @@ describe('plugins/elasticsearch', function () {
       get.withArgs('pkg.buildNum').returns(5801);
       client.create.returns(Promise.resolve());
       const response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } };
-      return upgrade(response).then(function (resp) {
+      return upgrade(response).then(function () {
         sinon.assert.calledOnce(client.create);
         const params = client.create.args[0][0];
         expect(params).to.have.property('body');
@@ -125,7 +123,7 @@ describe('plugins/elasticsearch', function () {
       get.withArgs('pkg.buildNum').returns(5801);
       client.create.returns(Promise.resolve());
       const response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1 } } ] } };
-      return upgrade(response).then(function (resp) {
+      return upgrade(response).then(function () {
         sinon.assert.calledOnce(server.log);
         expect(server.log.args[0][0]).to.eql(['plugin', 'elasticsearch']);
         const msg = server.log.args[0][1];
@@ -139,13 +137,12 @@ describe('plugins/elasticsearch', function () {
       get.withArgs('pkg.buildNum').returns(5801);
       client.create.returns(Promise.resolve());
       const response = { hits: { hits: [ { _id: '4.0.0', _source: { buildNum: 1, defaultIndex: 'logstash-*' } } ] } };
-      return upgrade(response).then(function (resp) {
+      return upgrade(response).then(function () {
         sinon.assert.calledOnce(client.create);
         const params = client.create.args[0][0];
         expect(params).to.have.property('body');
         expect(params.body).to.have.property('defaultIndex', 'logstash-*');
       });
     });
-
   });
 });
diff --git a/src/core_plugins/elasticsearch/lib/check_es_version.js b/src/core_plugins/elasticsearch/lib/check_es_version.js
index b9eddd0e0f249..a3570af0472fe 100644
--- a/src/core_plugins/elasticsearch/lib/check_es_version.js
+++ b/src/core_plugins/elasticsearch/lib/check_es_version.js
@@ -76,7 +76,7 @@ module.exports = function checkEsVersion(server, kibanaVersion) {
     if (incompatibleNodes.length) {
       const incompatibleNodeNames = getHumanizedNodeNames(incompatibleNodes);
       throw new Error(
-        `This version of Kibana requires Elasticsearch v` +
+        'This version of Kibana requires Elasticsearch v' +
         `${kibanaVersion} on all nodes. I found ` +
         `the following incompatible nodes in your cluster: ${incompatibleNodeNames.join(',')}`
       );
diff --git a/src/core_plugins/elasticsearch/lib/create_kibana_index.js b/src/core_plugins/elasticsearch/lib/create_kibana_index.js
index 54e48658dee79..d02cd0a2f8003 100644
--- a/src/core_plugins/elasticsearch/lib/create_kibana_index.js
+++ b/src/core_plugins/elasticsearch/lib/create_kibana_index.js
@@ -1,4 +1,3 @@
-import { format } from 'util';
 import { mappings } from './kibana_index_mappings';
 
 module.exports = function (server) {
diff --git a/src/core_plugins/elasticsearch/lib/create_proxy.js b/src/core_plugins/elasticsearch/lib/create_proxy.js
index 068712ca9c70f..a4bea6847b9fd 100644
--- a/src/core_plugins/elasticsearch/lib/create_proxy.js
+++ b/src/core_plugins/elasticsearch/lib/create_proxy.js
@@ -1,6 +1,5 @@
 import createAgent from './create_agent';
 import mapUri from './map_uri';
-import { resolve } from 'url';
 import { assign } from 'lodash';
 
 function createProxy(server, method, route, config) {
@@ -39,7 +38,7 @@ function createProxy(server, method, route, config) {
   assign(options.config, config);
 
   server.route(options);
-};
+}
 
 createProxy.createPath = function createPath(path) {
   const pre = '/elasticsearch';
diff --git a/src/core_plugins/elasticsearch/lib/expose_client.js b/src/core_plugins/elasticsearch/lib/expose_client.js
index a1748e54ebbeb..8caeb03f29cdc 100644
--- a/src/core_plugins/elasticsearch/lib/expose_client.js
+++ b/src/core_plugins/elasticsearch/lib/expose_client.js
@@ -41,7 +41,6 @@ module.exports = function (server) {
 
     const uri = url.parse(options.url);
 
-    let authorization;
     if (options.auth && options.username && options.password) {
       uri.auth = util.format('%s:%s', options.username, options.password);
     }
diff --git a/src/core_plugins/elasticsearch/lib/filter_headers.js b/src/core_plugins/elasticsearch/lib/filter_headers.js
index 285b45f560697..891306fd260c2 100644
--- a/src/core_plugins/elasticsearch/lib/filter_headers.js
+++ b/src/core_plugins/elasticsearch/lib/filter_headers.js
@@ -1,7 +1,6 @@
 import _ from 'lodash';
 
 export default function (originalHeaders, headersToKeep) {
-
   const normalizeHeader = function (header) {
     if (!header) {
       return '';
@@ -13,10 +12,5 @@ export default function (originalHeaders, headersToKeep) {
   // Normalize list of headers we want to allow in upstream request
   const headersToKeepNormalized = headersToKeep.map(normalizeHeader);
 
-  // Normalize original headers in request
-  const originalHeadersNormalized = _.mapKeys(originalHeaders, function (headerValue, headerName) {
-    return normalizeHeader(headerName);
-  });
-
   return _.pick(originalHeaders, headersToKeepNormalized);
 }
diff --git a/src/core_plugins/elasticsearch/lib/get_basic_auth_realm.js b/src/core_plugins/elasticsearch/lib/get_basic_auth_realm.js
index 9a9c183def983..11646439fad3b 100644
--- a/src/core_plugins/elasticsearch/lib/get_basic_auth_realm.js
+++ b/src/core_plugins/elasticsearch/lib/get_basic_auth_realm.js
@@ -4,4 +4,4 @@ export default function getBasicAuthRealm(message) {
   const parts = message.match(/Basic\ realm=\\"(.*)\\"/);
   if (parts && parts.length === 2) return parts[1];
   else return null;
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/core_plugins/elasticsearch/lib/health_check.js b/src/core_plugins/elasticsearch/lib/health_check.js
index 4f1555893d871..76f20f515d466 100644
--- a/src/core_plugins/elasticsearch/lib/health_check.js
+++ b/src/core_plugins/elasticsearch/lib/health_check.js
@@ -1,7 +1,6 @@
 import _ from 'lodash';
 import Promise from 'bluebird';
 import elasticsearch from 'elasticsearch';
-import exposeClient from './expose_client';
 import migrateConfig from './migrate_config';
 import createKibanaIndex from './create_kibana_index';
 import checkEsVersion from './check_es_version';
diff --git a/src/core_plugins/elasticsearch/lib/map_uri.js b/src/core_plugins/elasticsearch/lib/map_uri.js
index daaf9b73c9633..76fe47b18a449 100644
--- a/src/core_plugins/elasticsearch/lib/map_uri.js
+++ b/src/core_plugins/elasticsearch/lib/map_uri.js
@@ -1,9 +1,9 @@
 import { defaults, omit, trimLeft, trimRight } from 'lodash';
-import { parse as parseUrl, format as formatUrl, resolve } from 'url';
+import { parse as parseUrl, format as formatUrl } from 'url';
 import filterHeaders from './filter_headers';
 import setHeaders from './set_headers';
 
-export default function mapUri(server, prefix) {
+export default function mapUri(server) {
   const config = server.config();
 
   function joinPaths(pathA, pathB) {
@@ -45,4 +45,4 @@ export default function mapUri(server, prefix) {
     const mappedUrl = formatUrl(mappedUrlComponents);
     done(null, mappedUrl, mappedHeaders);
   };
-};
+}
diff --git a/src/core_plugins/elasticsearch/lib/upgrade_config.js b/src/core_plugins/elasticsearch/lib/upgrade_config.js
index 9050767d969ac..8fd4609daa64d 100644
--- a/src/core_plugins/elasticsearch/lib/upgrade_config.js
+++ b/src/core_plugins/elasticsearch/lib/upgrade_config.js
@@ -1,11 +1,8 @@
 import Promise from 'bluebird';
 import isUpgradeable from './is_upgradeable';
 import _ from 'lodash';
-import { format } from 'util';
 
 module.exports = function (server) {
-  const MAX_INTEGER = Math.pow(2, 53) - 1;
-
   const client = server.plugins.elasticsearch.client;
   const config = server.config();
 
@@ -19,8 +16,6 @@ module.exports = function (server) {
   }
 
   return function (response) {
-    const newConfig = {};
-
     // Check to see if there are any doc. If not then we set the build number and id
     if (response.hits.hits.length === 0) {
       return createNewConfig();
diff --git a/src/core_plugins/kbn_doc_views/index.js b/src/core_plugins/kbn_doc_views/index.js
index 7f94a42489d31..47af2971d166d 100644
--- a/src/core_plugins/kbn_doc_views/index.js
+++ b/src/core_plugins/kbn_doc_views/index.js
@@ -10,4 +10,4 @@ export default function (kibana) {
 
   });
 
-};
+}
diff --git a/src/core_plugins/kbn_doc_views/public/__tests__/doc_views.js b/src/core_plugins/kbn_doc_views/public/__tests__/doc_views.js
index c931996d53a22..89e67a658b72e 100644
--- a/src/core_plugins/kbn_doc_views/public/__tests__/doc_views.js
+++ b/src/core_plugins/kbn_doc_views/public/__tests__/doc_views.js
@@ -3,7 +3,6 @@ import _ from 'lodash';
 import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import $ from 'jquery';
 import 'ui/render_directive';
 import 'plugins/kbn_doc_views/views/table';
 import docViewsRegistry from 'ui/registry/doc_views';
@@ -16,9 +15,9 @@ const hit = {
   '_source': {
     'extension': 'html',
     'bytes': 100,
-    'area': [{lat: 7, lon: 7}],
+    'area': [{ lat: 7, lon: 7 }],
     'noMapping': 'hasNoMapping',
-    'objectArray': [{foo: true}, {bar: false}],
+    'objectArray': [{ foo: true }, { bar: false }],
     '_underscore': 1
   }
 };
@@ -78,7 +77,6 @@ describe('docViews', function () {
       initView(docViews.byName.Table);
     });
     it('should have a row for each field', function () {
-      const rows = $elem.find('tr');
       expect($elem.find('tr').length).to.be(_.keys(flattened).length);
     });
 
diff --git a/src/core_plugins/kbn_doc_views/public/views/json.js b/src/core_plugins/kbn_doc_views/public/views/json.js
index 120935e4b9cde..8415da47fd5e6 100644
--- a/src/core_plugins/kbn_doc_views/public/views/json.js
+++ b/src/core_plugins/kbn_doc_views/public/views/json.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import angular from 'angular';
 import 'ace';
 import docViewsRegistry from 'ui/registry/doc_views';
diff --git a/src/core_plugins/kbn_doc_views/public/views/table.js b/src/core_plugins/kbn_doc_views/public/views/table.js
index af201f39c3539..fef633e5827ec 100644
--- a/src/core_plugins/kbn_doc_views/public/views/table.js
+++ b/src/core_plugins/kbn_doc_views/public/views/table.js
@@ -26,7 +26,7 @@ docViewsRegistry.register(function () {
         };
 
         $scope.showArrayInObjectsWarning = function (row, field) {
-          let value = $scope.flattened[field];
+          const value = $scope.flattened[field];
           return _.isArray(value) && typeof value[0] === 'object';
         };
       }
diff --git a/src/core_plugins/kbn_vislib_vis_types/index.js b/src/core_plugins/kbn_vislib_vis_types/index.js
index 0f7e42cfbf556..b74e5a4cf56c7 100644
--- a/src/core_plugins/kbn_vislib_vis_types/index.js
+++ b/src/core_plugins/kbn_vislib_vis_types/index.js
@@ -10,4 +10,4 @@ export default function (kibana) {
 
   });
 
-};
+}
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/area.js b/src/core_plugins/kbn_vislib_vis_types/public/area.js
index 8ba764e50a6d8..8968b2d532c2f 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/area.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/area.js
@@ -71,4 +71,4 @@ export default function HistogramVisType(Private) {
       }
     ])
   });
-};
+}
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js
index a62607f67e307..2159713cf1937 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/line_interpolation_option.js
@@ -1,10 +1,8 @@
-import _ from 'lodash';
-import $ from 'jquery';
 import uiModules from 'ui/modules';
 import lineInterpolationOptionTemplate from 'plugins/kbn_vislib_vis_types/controls/line_interpolation_option.html';
 const module = uiModules.get('kibana');
 
-module.directive('lineInterpolationOption', function ($parse, $compile) {
+module.directive('lineInterpolationOption', function () {
   return {
     restrict: 'E',
     template: lineInterpolationOptionTemplate,
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
index 653d3afd5c755..88b92f760b07c 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series_options.js
@@ -1,11 +1,9 @@
-import _ from 'lodash';
-import $ from 'jquery';
 import 'ui/directives/inequality';
 import uiModules from 'ui/modules';
 import pointSeriesOptionsTemplate from 'plugins/kbn_vislib_vis_types/controls/point_series_options.html';
 const module = uiModules.get('kibana');
 
-module.directive('pointSeriesOptions', function ($parse, $compile) {
+module.directive('pointSeriesOptions', function () {
   return {
     restrict: 'E',
     template: pointSeriesOptionsTemplate,
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js
index fd7f7b9eaa8e0..4f160429e9493 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.js
@@ -1,10 +1,8 @@
-import _ from 'lodash';
-import $ from 'jquery';
 import uiModules from 'ui/modules';
 import vislibBasicOptionsTemplate from 'plugins/kbn_vislib_vis_types/controls/vislib_basic_options.html';
 const module = uiModules.get('kibana');
 
-module.directive('vislibBasicOptions', function ($parse, $compile) {
+module.directive('vislibBasicOptions', function () {
   return {
     restrict: 'E',
     template: vislibBasicOptionsTemplate,
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/histogram.js b/src/core_plugins/kbn_vislib_vis_types/public/histogram.js
index 40099fe4c7bf0..23a08e3e98d51 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/histogram.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/histogram.js
@@ -67,4 +67,4 @@ export default function HistogramVisType(Private) {
       }
     ])
   });
-};
+}
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/line.js b/src/core_plugins/kbn_vislib_vis_types/public/line.js
index 0c7830da74583..f292dade6788d 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/line.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/line.js
@@ -77,4 +77,4 @@ export default function HistogramVisType(Private) {
       }
     ])
   });
-};
+}
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/pie.js b/src/core_plugins/kbn_vislib_vis_types/public/pie.js
index 170178cf1d153..64a2242fbe7bb 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/pie.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/pie.js
@@ -57,4 +57,4 @@ export default function HistogramVisType(Private) {
       }
     ])
   });
-};
+}
diff --git a/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js b/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js
index 8c2e18ed3e2b5..7c43770184638 100644
--- a/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js
+++ b/src/core_plugins/kbn_vislib_vis_types/public/tile_map.js
@@ -43,7 +43,7 @@ export default function TileMapVisType(Private, getAppState, courier, config) {
         const pushFilter = Private(FilterBarPushFilterProvider)(getAppState());
         const indexPatternName = agg.vis.indexPattern.id;
         const field = agg.fieldName();
-        const filter = {geo_bounding_box: {}};
+        const filter = { geo_bounding_box: {} };
         filter.geo_bounding_box[field] = event.bounds;
 
         pushFilter(filter, false, indexPatternName);
@@ -98,4 +98,4 @@ export default function TileMapVisType(Private, getAppState, courier, config) {
       }
     ])
   });
-};
+}
diff --git a/src/core_plugins/kibana/common/lib/__tests__/convert_pattern_and_ingest_name.js b/src/core_plugins/kibana/common/lib/__tests__/convert_pattern_and_ingest_name.js
index 97dea17fc5bfe..38e3c751ad2a9 100644
--- a/src/core_plugins/kibana/common/lib/__tests__/convert_pattern_and_ingest_name.js
+++ b/src/core_plugins/kibana/common/lib/__tests__/convert_pattern_and_ingest_name.js
@@ -1,5 +1,5 @@
 import expect from 'expect.js';
-import {patternToIngest, ingestToPattern} from '../convert_pattern_and_ingest_name';
+import { patternToIngest, ingestToPattern } from '../convert_pattern_and_ingest_name';
 
 describe('convertPatternAndTemplateName', function () {
 
diff --git a/src/core_plugins/kibana/index.js b/src/core_plugins/kibana/index.js
index 85bc26a855046..512d33eeb7751 100644
--- a/src/core_plugins/kibana/index.js
+++ b/src/core_plugins/kibana/index.js
@@ -38,8 +38,8 @@ module.exports = function (kibana) {
           'docViews'
         ],
 
-        injectVars: function (server, options) {
-          let config = server.config();
+        injectVars: function (server) {
+          const config = server.config();
           return {
             kbnDefaultAppId: config.get('kibana.defaultAppId'),
             tilemap: config.get('tilemap')
@@ -105,7 +105,7 @@ module.exports = function (kibana) {
       }
     },
 
-    init: function (server, options) {
+    init: function (server) {
       // uuid
       manageUuid(server);
       // routes
diff --git a/src/core_plugins/kibana/public/dashboard/__tests__/dashboard_panels.js b/src/core_plugins/kibana/public/dashboard/__tests__/dashboard_panels.js
index 0611c8eba587a..acc48c7fffa94 100644
--- a/src/core_plugins/kibana/public/dashboard/__tests__/dashboard_panels.js
+++ b/src/core_plugins/kibana/public/dashboard/__tests__/dashboard_panels.js
@@ -36,7 +36,7 @@ describe('dashboard panels', function () {
 
   it('loads with no vizualizations', function () {
     ngMock.inject((SavedDashboard) => {
-      let dash = new SavedDashboard();
+      const dash = new SavedDashboard();
       dash.init();
       compile(dash);
     });
@@ -45,9 +45,9 @@ describe('dashboard panels', function () {
 
   it('loads one vizualization', function () {
     ngMock.inject((SavedDashboard) => {
-      let dash = new SavedDashboard();
+      const dash = new SavedDashboard();
       dash.init();
-      dash.panelsJSON = `[{"col":3,"id":"foo1","row":1,"size_x":2,"size_y":2,"type":"visualization"}]`;
+      dash.panelsJSON = '[{"col":3,"id":"foo1","row":1,"size_x":2,"size_y":2,"type":"visualization"}]';
       compile(dash);
     });
     expect($scope.state.panels.length).to.be(1);
@@ -55,7 +55,7 @@ describe('dashboard panels', function () {
 
   it('loads vizualizations in correct order', function () {
     ngMock.inject((SavedDashboard) => {
-      let dash = new SavedDashboard();
+      const dash = new SavedDashboard();
       dash.init();
       dash.panelsJSON = `[
         {"col":3,"id":"foo1","row":1,"size_x":2,"size_y":2,"type":"visualization"},
diff --git a/src/core_plugins/kibana/public/dashboard/components/panel/lib/load_panel.js b/src/core_plugins/kibana/public/dashboard/components/panel/lib/load_panel.js
index 54e12f3fd4d7e..bc2744a70d8a1 100644
--- a/src/core_plugins/kibana/public/dashboard/components/panel/lib/load_panel.js
+++ b/src/core_plugins/kibana/public/dashboard/components/panel/lib/load_panel.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import PluginsKibanaDashboardComponentsPanelLibVisualizationProvider from 'plugins/kibana/dashboard/components/panel/lib/visualization';
 import PluginsKibanaDashboardComponentsPanelLibSearchProvider from 'plugins/kibana/dashboard/components/panel/lib/search';
 export default function loadPanelFunction(Private) { // Inject services here
@@ -15,4 +14,4 @@ export default function loadPanelFunction(Private) { // Inject services here
     }
 
   };
-};
+}
diff --git a/src/core_plugins/kibana/public/dashboard/components/panel/lib/search.js b/src/core_plugins/kibana/public/dashboard/components/panel/lib/search.js
index e0d7a914b2f4f..eca3f43f24ffc 100644
--- a/src/core_plugins/kibana/public/dashboard/components/panel/lib/search.js
+++ b/src/core_plugins/kibana/public/dashboard/components/panel/lib/search.js
@@ -1,4 +1,4 @@
-export default function searchLoader(savedSearches, Private) { // Inject services here
+export default function searchLoader(savedSearches) { // Inject services here
   return function (panel, $scope) { // Function parameters here
     return savedSearches.get(panel.id)
       .then(function (savedSearch) {
@@ -21,4 +21,4 @@ export default function searchLoader(savedSearches, Private) { // Inject service
         };
       });
   };
-};
+}
diff --git a/src/core_plugins/kibana/public/dashboard/components/panel/lib/visualization.js b/src/core_plugins/kibana/public/dashboard/components/panel/lib/visualization.js
index 87b04bc1cb535..3c47e4d253feb 100644
--- a/src/core_plugins/kibana/public/dashboard/components/panel/lib/visualization.js
+++ b/src/core_plugins/kibana/public/dashboard/components/panel/lib/visualization.js
@@ -20,4 +20,4 @@ export default function visualizationLoader(savedVisualizations, Private) { // I
       };
     });
   };
-};
+}
diff --git a/src/core_plugins/kibana/public/dashboard/components/panel/panel.js b/src/core_plugins/kibana/public/dashboard/components/panel/panel.js
index 5cdf1a8469dfa..2737bd3e43fbd 100644
--- a/src/core_plugins/kibana/public/dashboard/components/panel/panel.js
+++ b/src/core_plugins/kibana/public/dashboard/components/panel/panel.js
@@ -1,11 +1,8 @@
-import moment from 'moment';
-import $ from 'jquery';
 import _ from 'lodash';
 import 'ui/visualize';
 import 'ui/doc_table';
 import PluginsKibanaDashboardComponentsPanelLibLoadPanelProvider from 'plugins/kibana/dashboard/components/panel/lib/load_panel';
 import FilterManagerProvider from 'ui/filter_manager';
-import UtilsBrushEventProvider from 'ui/utils/brush_event';
 import uiModules from 'ui/modules';
 import panelTemplate from 'plugins/kibana/dashboard/components/panel/panel.html';
 uiModules
@@ -13,7 +10,6 @@ uiModules
 .directive('dashboardPanel', function (savedVisualizations, savedSearches, Notifier, Private, $injector) {
   const loadPanel = Private(PluginsKibanaDashboardComponentsPanelLibLoadPanelProvider);
   const filterManager = Private(FilterManagerProvider);
-  const notify = new Notifier();
 
   const services = require('plugins/kibana/management/saved_object_registry').all().map(function (serviceObj) {
     const service = $injector.get(serviceObj.service);
@@ -24,8 +20,6 @@ uiModules
   });
 
 
-  const brushEvent = Private(UtilsBrushEventProvider);
-
   const getPanelId = function (panel) {
     return ['P', panel.panelIndex].join('-');
   };
@@ -34,7 +28,7 @@ uiModules
     restrict: 'E',
     template: panelTemplate,
     requires: '^dashboardGrid',
-    link: function ($scope, $el) {
+    link: function ($scope) {
       // using $scope inheritance, panels are available in AppState
       const $state = $scope.state;
 
diff --git a/src/core_plugins/kibana/public/dashboard/directives/grid.js b/src/core_plugins/kibana/public/dashboard/directives/grid.js
index ef4ea724aab88..1b3cab8bbd19a 100644
--- a/src/core_plugins/kibana/public/dashboard/directives/grid.js
+++ b/src/core_plugins/kibana/public/dashboard/directives/grid.js
@@ -16,7 +16,6 @@ app.directive('dashboardGrid', function ($compile, Notifier) {
       $el = $('<ul>').appendTo($container);
 
       const $window = $(window);
-      const $body = $(document.body);
       const binder = new Binder($scope);
 
       // appState from controller
@@ -198,7 +197,7 @@ app.directive('dashboardGrid', function ($compile, Notifier) {
       }
 
       // when gridster tell us it made a change, update each of the panel objects
-      function readGridsterChangeHandler(e, ui, $widget) {
+      function readGridsterChangeHandler() {
         // ensure that our panel objects keep their size in sync
         gridster.$widgets.each(function (i, el) {
           const panel = getPanelFor(el);
diff --git a/src/core_plugins/kibana/public/dashboard/index.js b/src/core_plugins/kibana/public/dashboard/index.js
index ca3d54c4178af..6e63603ea673b 100644
--- a/src/core_plugins/kibana/public/dashboard/index.js
+++ b/src/core_plugins/kibana/public/dashboard/index.js
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import $ from 'jquery';
 import angular from 'angular';
 import chrome from 'ui/chrome';
 import 'ui/courier';
@@ -36,7 +35,7 @@ uiRoutes
 .when('/dashboard', {
   template: indexTemplate,
   resolve: {
-    dash: function (savedDashboards, config) {
+    dash: function (savedDashboards) {
       return savedDashboards.get();
     }
   }
@@ -91,7 +90,7 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter,
         panels: dash.panelsJSON ? JSON.parse(dash.panelsJSON) : [],
         options: dash.optionsJSON ? JSON.parse(dash.optionsJSON) : {},
         uiState: dash.uiStateJSON ? JSON.parse(dash.uiStateJSON) : {},
-        query: extractQueryFromFilters(dash.searchSource.getOwn('filter')) || {query_string: {query: '*'}},
+        query: extractQueryFromFilters(dash.searchSource.getOwn('filter')) || { query_string: { query: '*' } },
         filters: _.reject(dash.searchSource.getOwn('filter'), matchQueryFilter),
       };
 
@@ -234,7 +233,7 @@ app.directive('dashboardApp', function (Notifier, courier, AppState, timefilter,
           if (id) {
             notify.info('Saved Dashboard as "' + dash.title + '"');
             if (dash.id !== $routeParams.id) {
-              kbnUrl.change('/dashboard/{{id}}', {id: dash.id});
+              kbnUrl.change('/dashboard/{{id}}', { id: dash.id });
             }
           }
         })
diff --git a/src/core_plugins/kibana/public/dashboard/services/_saved_dashboard.js b/src/core_plugins/kibana/public/dashboard/services/_saved_dashboard.js
index 5e0ef2f2cb9c0..2cc9976a23977 100644
--- a/src/core_plugins/kibana/public/dashboard/services/_saved_dashboard.js
+++ b/src/core_plugins/kibana/public/dashboard/services/_saved_dashboard.js
@@ -1,6 +1,5 @@
 import angular from 'angular';
 import _ from 'lodash';
-import moment from 'moment';
 import uiModules from 'ui/modules';
 const module = uiModules.get('app/dashboard');
 
@@ -60,10 +59,10 @@ module.factory('SavedDashboard', function (courier, config) {
     refreshInterval: {
       type: 'object',
       properties: {
-        display: {type: 'string'},
-        pause: { type: 'boolean'},
-        section: { type: 'integer'},
-        value: { type: 'integer'}
+        display: { type: 'string' },
+        pause: { type: 'boolean' },
+        section: { type: 'integer' },
+        value: { type: 'integer' }
       }
     }
   };
diff --git a/src/core_plugins/kibana/public/dashboard/services/saved_dashboard_register.js b/src/core_plugins/kibana/public/dashboard/services/saved_dashboard_register.js
index 207a3298b9c69..f9c3c9c6cb31f 100644
--- a/src/core_plugins/kibana/public/dashboard/services/saved_dashboard_register.js
+++ b/src/core_plugins/kibana/public/dashboard/services/saved_dashboard_register.js
@@ -1,3 +1,3 @@
 export default function savedDashboardFn(savedDashboards) {
   return savedDashboards;
-};
+}
diff --git a/src/core_plugins/kibana/public/dashboard/services/saved_dashboards.js b/src/core_plugins/kibana/public/dashboard/services/saved_dashboards.js
index d90f5faa750f7..8f86452a07c1b 100644
--- a/src/core_plugins/kibana/public/dashboard/services/saved_dashboards.js
+++ b/src/core_plugins/kibana/public/dashboard/services/saved_dashboards.js
@@ -38,7 +38,7 @@ module.service('savedDashboards', function (Promise, SavedDashboard, kbnIndex, e
   };
 
   this.urlFor = function (id) {
-    return kbnUrl.eval('#/dashboard/{{id}}', {id: id});
+    return kbnUrl.eval('#/dashboard/{{id}}', { id: id });
   };
 
   this.delete = function (ids) {
@@ -75,7 +75,7 @@ module.service('savedDashboards', function (Promise, SavedDashboard, kbnIndex, e
         }
       };
     } else {
-      body = { query: {match_all: {}}};
+      body = { query: { match_all: {} } };
     }
 
     return es.search({
diff --git a/src/core_plugins/kibana/public/discover/__tests__/directives/discover_field.js b/src/core_plugins/kibana/public/discover/__tests__/directives/discover_field.js
index 7515cf94fc842..43a7bad1f2c72 100644
--- a/src/core_plugins/kibana/public/discover/__tests__/directives/discover_field.js
+++ b/src/core_plugins/kibana/public/discover/__tests__/directives/discover_field.js
@@ -4,7 +4,6 @@ import _ from 'lodash';
 import sinon from 'auto-release-sinon';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
-import $ from 'jquery';
 import 'ui/private';
 import 'plugins/kibana/discover/components/field_chooser/discover_field';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/core_plugins/kibana/public/discover/_hit_sort_fn.js b/src/core_plugins/kibana/public/discover/_hit_sort_fn.js
index 83cc68c160504..523ebdf5a0d2e 100644
--- a/src/core_plugins/kibana/public/discover/_hit_sort_fn.js
+++ b/src/core_plugins/kibana/public/discover/_hit_sort_fn.js
@@ -1,66 +1,64 @@
-define(function () {
-  return function HitSortFnFactory() {
+export default function HitSortFnFactory() {
 
-    /**
-     * Creates a sort function that will resort hits based on the value
-     * es used to sort them.
-     *
-     * background:
-     * When a hit is sorted by elasticsearch, es will write the values that it used
-     * to sort them into an array at the top level of the hit like so
-     *
-     * ```
-     * hits: {
-     *   total: x,
-     *   hits: [
-     *     {
-     *       _id: i,
-     *       _source: {},
-     *       sort: [
-     *         // all values used to sort, in the order of precidance
-     *       ]
-     *     }
-     *   ]
-     * };
-     * ```
-     *
-     * @param  {[type]} field     [description]
-     * @param  {[type]} direction [description]
-     * @return {[type]}           [description]
-     */
-    return function createHitSortFn(direction) {
-      const descending = (direction === 'desc');
+  /**
+   * Creates a sort function that will resort hits based on the value
+   * es used to sort them.
+   *
+   * background:
+   * When a hit is sorted by elasticsearch, es will write the values that it used
+   * to sort them into an array at the top level of the hit like so
+   *
+   * ```
+   * hits: {
+   *   total: x,
+   *   hits: [
+   *     {
+   *       _id: i,
+   *       _source: {},
+   *       sort: [
+   *         // all values used to sort, in the order of precidance
+   *       ]
+   *     }
+   *   ]
+   * };
+   * ```
+   *
+   * @param  {[type]} field     [description]
+   * @param  {[type]} direction [description]
+   * @return {[type]}           [description]
+   */
+  return function createHitSortFn(direction) {
+    const descending = (direction === 'desc');
 
-      return function sortHits(hitA, hitB) {
-        let bBelowa = null;
+    return function sortHits(hitA, hitB) {
+      let bBelowa = null;
 
-        const aSorts = hitA.sort || [];
-        const bSorts = hitB.sort || [];
+      const aSorts = hitA.sort || [];
+      const bSorts = hitB.sort || [];
 
-        // walk each sort value, and compair until one is different
-        for (let i = 0; i < bSorts.length; i++) {
-          const a = aSorts[i];
-          const b = bSorts[i];
+      // walk each sort value, and compair until one is different
+      for (let i = 0; i < bSorts.length; i++) {
+        const a = aSorts[i];
+        const b = bSorts[i];
 
-          if (a == null || b > a) {
-            bBelowa = !descending;
-            break;
-          }
-
-          if (b < a) {
-            bBelowa = descending;
-            break;
-          }
+        if (a == null || b > a) {
+          bBelowa = !descending;
+          break;
         }
 
-        if (bBelowa !== null) {
-          return bBelowa ? -1 : 1;
-        } else {
-          return 0;
+        if (b < a) {
+          bBelowa = descending;
+          break;
         }
+      }
 
-      };
-    };
+      if (bBelowa !== null) {
+        return bBelowa ? -1 : 1;
+      } else {
+        return 0;
+      }
 
+    };
   };
-});
+
+}
diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js b/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
index 1295301146037..dc0bafe39566f 100644
--- a/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
+++ b/src/core_plugins/kibana/public/discover/components/field_chooser/field_chooser.js
@@ -51,9 +51,9 @@ app.directive('discFieldChooser', function ($location, globalState, config, $rou
           missing: true
         },
         boolOpts: [
-          {label: 'any', value: undefined },
-          {label: 'yes', value: true },
-          {label: 'no', value: false }
+          { label: 'any', value: undefined },
+          { label: 'yes', value: true },
+          { label: 'no', value: false }
         ],
         toggleVal: function (name, def) {
           if (filter.vals[name] !== def) filter.vals[name] = def;
@@ -204,7 +204,7 @@ app.directive('discFieldChooser', function ($location, globalState, config, $rou
               type: type,
               aggs: [
                 agg,
-                {schema: 'metric', type: 'count', 'id': '2'}
+                { schema: 'metric', type: 'count', 'id': '2' }
               ]
             }
           })
diff --git a/src/core_plugins/kibana/public/discover/controllers/discover.js b/src/core_plugins/kibana/public/discover/controllers/discover.js
index f70e0d08fd5d3..9dd276f02b771 100644
--- a/src/core_plugins/kibana/public/discover/controllers/discover.js
+++ b/src/core_plugins/kibana/public/discover/controllers/discover.js
@@ -353,7 +353,6 @@ function discoverController($scope, config, courier, $route, $window, Notifier,
   };
 
   $scope.searchSource.onBeginSegmentedFetch(function (segmented) {
-
     function flushResponseData() {
       $scope.hits = 0;
       $scope.faliures = [];
@@ -365,7 +364,6 @@ function discoverController($scope, config, courier, $route, $window, Notifier,
 
     const sort = $state.sort;
     const timeField = $scope.indexPattern.timeFieldName;
-    const totalSize = $scope.size || $scope.opts.sampleSize;
 
     /**
      * Basically an emum.
@@ -482,7 +480,7 @@ function discoverController($scope, config, courier, $route, $window, Notifier,
       $scope.searchSource.highlight({
         pre_tags: [highlightTags.pre],
         post_tags: [highlightTags.post],
-        fields: {'*': {}},
+        fields: { '*': {} },
         require_field_match: false,
         fragment_size: 2147483647 // Limit of an integer.
       });
@@ -589,4 +587,4 @@ function discoverController($scope, config, courier, $route, $window, Notifier,
   }
 
   init();
-};
+}
diff --git a/src/core_plugins/kibana/public/discover/directives/no_results.js b/src/core_plugins/kibana/public/discover/directives/no_results.js
index 85cffe96ab54d..73366a6642621 100644
--- a/src/core_plugins/kibana/public/discover/directives/no_results.js
+++ b/src/core_plugins/kibana/public/discover/directives/no_results.js
@@ -1,5 +1,3 @@
-import _ from 'lodash';
-import $ from 'jquery';
 import uiModules from 'ui/modules';
 import noResultsTemplate from '../partials/no_results.html';
 
diff --git a/src/core_plugins/kibana/public/discover/directives/timechart.js b/src/core_plugins/kibana/public/discover/directives/timechart.js
index a969c19cf5e49..16dd54483da71 100644
--- a/src/core_plugins/kibana/public/discover/directives/timechart.js
+++ b/src/core_plugins/kibana/public/discover/directives/timechart.js
@@ -1,10 +1,8 @@
-import _ from 'lodash';
-import $ from 'jquery';
 import VislibProvider from 'ui/vislib';
 import uiModules from 'ui/modules';
 uiModules
 .get('apps/discover')
-.directive('discoverTimechart', function (Private, $compile) {
+.directive('discoverTimechart', function (Private) {
   const vislib = Private(VislibProvider);
 
   return {
diff --git a/src/core_plugins/kibana/public/discover/saved_searches/saved_search_register.js b/src/core_plugins/kibana/public/discover/saved_searches/saved_search_register.js
index 9ca6c654e1738..4b9c3de26a06e 100644
--- a/src/core_plugins/kibana/public/discover/saved_searches/saved_search_register.js
+++ b/src/core_plugins/kibana/public/discover/saved_searches/saved_search_register.js
@@ -1,3 +1,3 @@
 export default function savedSearchObjectFn(savedSearches) {
   return savedSearches;
-};
+}
diff --git a/src/core_plugins/kibana/public/discover/saved_searches/saved_searches.js b/src/core_plugins/kibana/public/discover/saved_searches/saved_searches.js
index 0ad2526d78bc8..d7214a5d54967 100644
--- a/src/core_plugins/kibana/public/discover/saved_searches/saved_searches.js
+++ b/src/core_plugins/kibana/public/discover/saved_searches/saved_searches.js
@@ -22,10 +22,6 @@ module.service('savedSearches', function (Promise, config, kbnIndex, es, createN
     type: 'search'
   });
 
-  const notify = createNotifier({
-    location: 'Saved Searches'
-  });
-
   this.type = SavedSearch.type;
   this.Class = SavedSearch;
 
@@ -49,7 +45,7 @@ module.service('savedSearches', function (Promise, config, kbnIndex, es, createN
   };
 
   this.urlFor = function (id) {
-    return kbnUrl.eval('#/discover/{{id}}', {id: id});
+    return kbnUrl.eval('#/discover/{{id}}', { id: id });
   };
 
   this.delete = function (ids) {
@@ -79,7 +75,7 @@ module.service('savedSearches', function (Promise, config, kbnIndex, es, createN
         }
       };
     } else {
-      body = { query: {match_all: {}}};
+      body = { query: { match_all: {} } };
     }
 
     return es.search({
diff --git a/src/core_plugins/kibana/public/doc/__tests__/doc.js b/src/core_plugins/kibana/public/doc/__tests__/doc.js
index 5efbe5a49f980..054cd4f524005 100644
--- a/src/core_plugins/kibana/public/doc/__tests__/doc.js
+++ b/src/core_plugins/kibana/public/doc/__tests__/doc.js
@@ -53,10 +53,10 @@ const init = function (index, type, id) {
             });
             break;
           case 'missingIndex':
-            deferred.reject({status: 404});
+            deferred.reject({ status: 404 });
             break;
           case 'badRequest':
-            deferred.reject({status: 500});
+            deferred.reject({ status: 500 });
             break;
         }
 
diff --git a/src/core_plugins/kibana/public/doc/controllers/doc.js b/src/core_plugins/kibana/public/doc/controllers/doc.js
index 9d403c3f66677..4bf5e80b9a146 100644
--- a/src/core_plugins/kibana/public/doc/controllers/doc.js
+++ b/src/core_plugins/kibana/public/doc/controllers/doc.js
@@ -1,5 +1,3 @@
-import _ from 'lodash';
-import angular from 'angular';
 import 'ui/notify';
 import 'ui/courier';
 import 'ui/doc_viewer';
diff --git a/src/core_plugins/kibana/public/kibana.js b/src/core_plugins/kibana/public/kibana.js
index 5815cc33c2d15..30d0d9edc8519 100644
--- a/src/core_plugins/kibana/public/kibana.js
+++ b/src/core_plugins/kibana/public/kibana.js
@@ -6,7 +6,6 @@ import chrome from 'ui/chrome';
 import routes from 'ui/routes';
 import modules from 'ui/modules';
 
-import kibanaLogoUrl from 'ui/images/kibana.svg';
 import 'ui/autoload/all';
 import 'plugins/kibana/discover/index';
 import 'plugins/kibana/visualize/index';
diff --git a/src/core_plugins/kibana/public/management/index.js b/src/core_plugins/kibana/public/management/index.js
index bc61a4c14be85..9dfb7bcce8501 100644
--- a/src/core_plugins/kibana/public/management/index.js
+++ b/src/core_plugins/kibana/public/management/index.js
@@ -1,5 +1,3 @@
-import _ from 'lodash';
-
 import 'plugins/kibana/management/sections';
 import 'plugins/kibana/management/styles/main.less';
 import 'ui/filters/start_from';
@@ -12,7 +10,6 @@ import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
 import appTemplate from 'plugins/kibana/management/app.html';
 import landingTemplate from 'plugins/kibana/management/landing.html';
-import chrome from 'ui/chrome/chrome';
 import management from 'ui/management';
 import 'ui/kbn_top_nav';
 
diff --git a/src/core_plugins/kibana/public/management/sections/indices/_create.js b/src/core_plugins/kibana/public/management/sections/indices/_create.js
index 050187efdeb2a..5389859880f90 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/_create.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/_create.js
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import moment from 'moment';
 import { IndexPatternMissingIndices } from 'ui/errors';
 import 'ui/directives/validate_index_name';
 import 'ui/directives/auto_select_if_only_one';
diff --git a/src/core_plugins/kibana/public/management/sections/indices/_date_scripts.js b/src/core_plugins/kibana/public/management/sections/indices/_date_scripts.js
index 02d4788d45916..a557b2ce0bb5d 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/_date_scripts.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/_date_scripts.js
@@ -23,4 +23,4 @@ export default function (indexPattern) {
   });
 
   return dateScripts;
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/_edit.js b/src/core_plugins/kibana/public/management/sections/indices/_edit.js
index a5f4095d088a9..d8520893f5dd6 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/_edit.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/_edit.js
@@ -9,7 +9,6 @@ import IndicesEditSectionsProvider from 'plugins/kibana/management/sections/indi
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
 import editTemplate from 'plugins/kibana/management/sections/indices/_edit.html';
-import IngestProvider from 'ui/ingest';
 
 uiRoutes
 .when('/management/kibana/indices/:indexPatternId', {
@@ -41,11 +40,9 @@ uiRoutes
 
 uiModules.get('apps/management')
 .controller('managementIndicesEdit', function ($scope, $location, $route, config, courier, Notifier, Private, AppState, docTitle) {
-
   const notify = new Notifier();
   const $state = $scope.state = new AppState();
   const refreshKibanaIndex = Private(RefreshKibanaIndex);
-  const ingest = Private(IngestProvider);
 
   $scope.kbnUrl = Private(UrlProvider);
   $scope.indexPattern = $route.current.locals.indexPattern;
@@ -66,7 +63,7 @@ uiModules.get('apps/management')
   });
 
   $scope.$watchCollection('indexPattern.fields', function () {
-    $scope.conflictFields = _.filter($scope.indexPattern.fields, {type: 'conflict'});
+    $scope.conflictFields = _.filter($scope.indexPattern.fields, { type: 'conflict' });
   });
 
   $scope.refreshFields = function () {
diff --git a/src/core_plugins/kibana/public/management/sections/indices/_edit_sections.js b/src/core_plugins/kibana/public/management/sections/indices/_edit_sections.js
index f05ebb0873aa0..2717817dbc241 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/_edit_sections.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/_edit_sections.js
@@ -30,4 +30,4 @@ export default function GetFieldTypes() {
       }
     ];
   };
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/_indexed_fields.js b/src/core_plugins/kibana/public/management/sections/indices/_indexed_fields.js
index 87ffe31b4d850..0704c1356c78c 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/_indexed_fields.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/_indexed_fields.js
@@ -40,7 +40,7 @@ uiModules.get('apps/management')
         const fields = filter($scope.indexPattern.getNonScriptedFields(), $scope.fieldFilter);
         const sourceFilters = $scope.indexPattern.sourceFilters && $scope.indexPattern.sourceFilters.map(f => f.value) || [];
         const fieldWildcardMatch = fieldWildcardMatcher(sourceFilters);
-        _.find($scope.editSections, {index: 'indexedFields'}).count = fields.length; // Update the tab count
+        _.find($scope.editSections, { index: 'indexedFields' }).count = fields.length; // Update the tab count
 
         $scope.rows = fields.map(function (field) {
           const childScope = _.assign($scope.$new(), { field: field });
diff --git a/src/core_plugins/kibana/public/management/sections/indices/_refresh_kibana_index.js b/src/core_plugins/kibana/public/management/sections/indices/_refresh_kibana_index.js
index e0becc475ab43..dcc4af88a2f9d 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/_refresh_kibana_index.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/_refresh_kibana_index.js
@@ -4,4 +4,4 @@ export default function RefreshKibanaIndexFn(es, kbnIndex) {
       index: kbnIndex
     });
   };
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/_scripted_fields.js b/src/core_plugins/kibana/public/management/sections/indices/_scripted_fields.js
index 7faeb3ac94ac5..5a486339c7272 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/_scripted_fields.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/_scripted_fields.js
@@ -1,6 +1,5 @@
 import _ from 'lodash';
 import 'ui/paginated_table';
-import popularityHtml from 'plugins/kibana/management/sections/indices/_field_popularity.html';
 import controlsHtml from 'plugins/kibana/management/sections/indices/_field_controls.html';
 import dateScripts from 'plugins/kibana/management/sections/indices/_date_scripts';
 import uiModules from 'ui/modules';
@@ -38,7 +37,7 @@ uiModules.get('apps/management')
         rowScopes.length = 0;
 
         const fields = filter($scope.indexPattern.getScriptedFields(), $scope.fieldFilter);
-        _.find($scope.editSections, {index: 'scriptedFields'}).count = fields.length; // Update the tab count
+        _.find($scope.editSections, { index: 'scriptedFields' }).count = fields.length; // Update the tab count
 
         $scope.rows = fields.map(function (field) {
           const rowScope = $scope.$new();
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/directives/output_preview.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/directives/output_preview.js
index 8135fca9e1b4a..be9ecea4d89b3 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/directives/output_preview.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/directives/output_preview.js
@@ -28,8 +28,8 @@ app.directive('outputPreview', function () {
       });
 
       $scope.updateUi = function () {
-        let left = $scope.oldObject;
-        let right = $scope.newObject;
+        const left = $scope.oldObject;
+        const right = $scope.newObject;
         let delta = $scope.diffpatch.diff(left, right);
         if (!delta || $scope.error) delta = {};
 
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/directives/pipeline_setup.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/directives/pipeline_setup.js
index 667849fa7aa50..4470a8a62ccb4 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/directives/pipeline_setup.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/directives/pipeline_setup.js
@@ -1,7 +1,6 @@
 import uiModules from 'ui/modules';
 import _ from 'lodash';
 import Pipeline from '../lib/pipeline';
-import angular from 'angular';
 import * as ProcessorTypes from '../processors/view_models';
 import IngestProvider from 'ui/ingest';
 import '../styles/_pipeline_setup.less';
@@ -39,7 +38,7 @@ app.directive('pipelineSetup', function () {
     },
     controller: function ($scope, debounce, Private, Notifier) {
       const ingest = Private(IngestProvider);
-      const notify = new Notifier({ location: `Ingest Pipeline Setup` });
+      const notify = new Notifier({ location: 'Ingest Pipeline Setup' });
       $scope.sample = {};
 
       //determines which processors are available on the cluster
@@ -59,7 +58,7 @@ app.directive('pipelineSetup', function () {
       $scope.pipeline = pipeline;
 
       //initiates the simulate call if the pipeline is dirty
-      const simulatePipeline = debounce((event, message) => {
+      const simulatePipeline = debounce(() => {
         if (pipeline.processors.length === 0) {
           pipeline.updateOutput();
           return;
@@ -70,11 +69,11 @@ app.directive('pipelineSetup', function () {
         .catch(notify.error);
       }, 200);
 
-      $scope.$watchCollection('pipeline.processors', (newVal, oldVal) => {
+      $scope.$watchCollection('pipeline.processors', () => {
         pipeline.updateParents();
       });
 
-      $scope.$watch('sample', (newVal) => {
+      $scope.$watch('sample', () => {
         pipeline.input = $scope.sample;
         pipeline.updateParents();
       });
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/directives/processor_ui_container.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/directives/processor_ui_container.js
index 4f53e822bf088..4b02acd1fe9f3 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/directives/processor_ui_container.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/directives/processor_ui_container.js
@@ -1,5 +1,4 @@
 import uiModules from 'ui/modules';
-import _ from 'lodash';
 import '../styles/_processor_ui_container.less';
 import './output_preview';
 import './processor_ui_container_header';
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/__tests__/create_multi_select_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/__tests__/create_multi_select_model.js
index 75ee3ed792a5c..d2a29ae0bea40 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/__tests__/create_multi_select_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/__tests__/create_multi_select_model.js
@@ -1,5 +1,4 @@
 import expect from 'expect.js';
-import sinon from 'sinon';
 import createMultiSelectModel from '../create_multi_select_model';
 
 describe('createMultiSelectModel', function () {
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/__tests__/keys_deep.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/__tests__/keys_deep.js
index 05f06927a4351..6d13c215e4558 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/__tests__/keys_deep.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/__tests__/keys_deep.js
@@ -1,15 +1,14 @@
 import expect from 'expect.js';
-import sinon from 'sinon';
 import keysDeep from '../keys_deep';
 
 describe('keys deep', function () {
 
   it('should list first level properties', function () {
-    let object = {
+    const object = {
       property1: 'value1',
       property2: 'value2'
     };
-    let expected = [
+    const expected = [
       'property1',
       'property2'
     ];
@@ -20,14 +19,14 @@ describe('keys deep', function () {
   });
 
   it('should list nested properties', function () {
-    let object = {
+    const object = {
       property1: 'value1',
       property2: 'value2',
       property3: {
         subProperty1: 'value1.1'
       }
     };
-    let expected = [
+    const expected = [
       'property1',
       'property2',
       'property3.subProperty1',
@@ -40,7 +39,7 @@ describe('keys deep', function () {
   });
 
   it('should recursivly list nested properties', function () {
-    let object = {
+    const object = {
       property1: 'value1',
       property2: 'value2',
       property3: {
@@ -52,7 +51,7 @@ describe('keys deep', function () {
         subProperty3: 'value1.3'
       }
     };
-    let expected = [
+    const expected = [
       'property1',
       'property2',
       'property3.subProperty1',
@@ -69,11 +68,11 @@ describe('keys deep', function () {
   });
 
   it('should list array properties, but not contents', function () {
-    let object = {
+    const object = {
       property1: 'value1',
       property2: [ 'item1', 'item2' ]
     };
-    let expected = [
+    const expected = [
       'property1',
       'property2'
     ];
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/create_multi_select_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/create_multi_select_model.js
index 5be0dfeed4e65..2a577defc86ff 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/create_multi_select_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/create_multi_select_model.js
@@ -14,7 +14,7 @@ export default function selectableArray(items, selectedItems) {
       selected: !_.isUndefined(selected)
     };
   });
-};
+}
 
 function cleanItem(item) {
   return _.trim(item).toUpperCase();
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/keys_deep.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/keys_deep.js
index 6485f55344d81..b31778d96bc39 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/keys_deep.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/lib/keys_deep.js
@@ -2,10 +2,10 @@ import _ from 'lodash';
 
 export default function keysDeep(object, base) {
   let result = [];
-  let delimitedBase = base ? base + '.' : '';
+  const delimitedBase = base ? base + '.' : '';
 
   _.forEach(object, (value, key) => {
-    var fullKey = delimitedBase + key;
+    const fullKey = delimitedBase + key;
     if (_.isPlainObject(value)) {
       result = result.concat(keysDeep(value, fullKey));
     } else {
@@ -18,4 +18,4 @@ export default function keysDeep(object, base) {
   }
 
   return result;
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/append/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/append/view_model.js
index a0a9711367a42..167dc66c2aa39 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/append/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/append/view_model.js
@@ -20,4 +20,4 @@ export class Append extends Processor {
       values: this.values || []
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/convert/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/convert/view_model.js
index ada158dc34454..2940c805652b9 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/convert/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/convert/view_model.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import Processor from '../base/view_model';
 
 export class Convert extends Processor {
@@ -25,4 +24,4 @@ export class Convert extends Processor {
       type: this.type || 'auto'
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/date/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/date/view_model.js
index 0186675e3e229..188f23784b309 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/date/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/date/view_model.js
@@ -29,4 +29,4 @@ export class Date extends Processor {
       customFormat: this.customFormat || ''
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/geoip/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/geoip/view_model.js
index 7041b92cb4a44..752968ac9a053 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/geoip/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/geoip/view_model.js
@@ -25,4 +25,4 @@ export class GeoIp extends Processor {
       databaseFields: this.databaseFields || []
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/grok/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/grok/view_model.js
index 548b2d52f2a2f..56219d00f92df 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/grok/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/grok/view_model.js
@@ -27,4 +27,4 @@ export class Grok extends Processor {
       pattern: this.pattern || ''
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/gsub/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/gsub/view_model.js
index 32559f9d8ea59..2d2eca413080c 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/gsub/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/gsub/view_model.js
@@ -22,4 +22,4 @@ export class Gsub extends Processor {
       replacement: this.replacement || ''
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/join/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/join/view_model.js
index a480b749d8680..5a8a49317423e 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/join/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/join/view_model.js
@@ -21,4 +21,4 @@ export class Join extends Processor {
       separator: this.separator || ''
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/lowercase/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/lowercase/view_model.js
index 4cc12cd0437df..c81c8883cf964 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/lowercase/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/lowercase/view_model.js
@@ -18,4 +18,4 @@ export class Lowercase extends Processor {
       sourceField: this.sourceField || ''
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/remove/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/remove/view_model.js
index fb33cfc5e4cef..4f6fdf0fb10eb 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/remove/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/remove/view_model.js
@@ -18,4 +18,4 @@ export class Remove extends Processor {
       sourceField: this.sourceField || ''
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/rename/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/rename/view_model.js
index 1899fcfc3c2a9..aa53f72687d91 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/rename/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/rename/view_model.js
@@ -21,4 +21,4 @@ export class Rename extends Processor {
       targetField: this.targetField || ''
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/set/directive.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/set/directive.js
index b7a2521f37187..fc90b48ff635f 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/set/directive.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/set/directive.js
@@ -9,7 +9,6 @@ app.directive('processorUiSet', function () {
     restrict: 'E',
     template: template,
     controller : function ($scope) {
-      const processor = $scope.processor;
       const pipeline = $scope.pipeline;
 
       function processorUiChanged() {
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/set/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/set/view_model.js
index 4c7f31352c2d9..6546e1d224d63 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/set/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/set/view_model.js
@@ -20,4 +20,4 @@ export class Set extends Processor {
       value: this.value || ''
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/split/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/split/view_model.js
index 30e7c8d81473c..c985f5caa2c9c 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/split/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/split/view_model.js
@@ -21,4 +21,4 @@ export class Split extends Processor {
       separator: this.separator || ''
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/trim/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/trim/view_model.js
index c0a52f2a899fc..4e41c5eab7313 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/trim/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/trim/view_model.js
@@ -18,4 +18,4 @@ export class Trim extends Processor {
       sourceField: this.sourceField || ''
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/uppercase/view_model.js b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/uppercase/view_model.js
index ce831ab40028c..4407c8b3f3bd4 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/uppercase/view_model.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/add_data_steps/pipeline_setup/processors/uppercase/view_model.js
@@ -18,4 +18,4 @@ export class Uppercase extends Processor {
       sourceField: this.sourceField || ''
     };
   }
-};
+}
diff --git a/src/core_plugins/kibana/public/management/sections/indices/index.js b/src/core_plugins/kibana/public/management/sections/indices/index.js
index 8a5e970de666e..b8b65d368b99b 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/index.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/index.js
@@ -39,7 +39,7 @@ uiModules.get('apps/management')
         $scope.indexPatternList = ids.map(function (id) {
           return {
             id: id,
-            url: kbnUrl.eval('#/management/kibana/indices/{{id}}', {id: id}),
+            url: kbnUrl.eval('#/management/kibana/indices/{{id}}', { id: id }),
             class: 'sidebar-item-title ' + ($scope.editingId === id ? 'active' : ''),
             default: $scope.defaultIndex === id
           };
diff --git a/src/core_plugins/kibana/public/management/sections/indices/source_filters/source_filters.js b/src/core_plugins/kibana/public/management/sections/indices/source_filters/source_filters.js
index adcb4af477f8b..8a0c7a37abdd5 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/source_filters/source_filters.js
+++ b/src/core_plugins/kibana/public/management/sections/indices/source_filters/source_filters.js
@@ -82,7 +82,7 @@ uiModules.get('kibana')
               ]);
             });
             // Update the tab count
-            find($scope.$parent.editSections, {index: 'sourceFilters'}).count = $scope.rows.length;
+            find($scope.$parent.editSections, { index: 'sourceFilters' }).count = $scope.rows.length;
           }
         });
       }
diff --git a/src/core_plugins/kibana/public/management/sections/objects/_objects.js b/src/core_plugins/kibana/public/management/sections/objects/_objects.js
index 1d68a35cb3fea..3c320130b03fa 100644
--- a/src/core_plugins/kibana/public/management/sections/objects/_objects.js
+++ b/src/core_plugins/kibana/public/management/sections/objects/_objects.js
@@ -7,8 +7,6 @@ import 'ui/directives/file_upload';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
 
-const MAX_SIZE = Math.pow(2, 31) - 1;
-
 uiRoutes
 .when('/management/kibana/objects', {
   template: objectIndexHTML
@@ -42,8 +40,7 @@ uiModules.get('apps/management')
 
         $q.all(services).then(function (data) {
           $scope.services = sortBy(data, 'title');
-          let tab = $scope.services[0];
-          if ($state.tab) $scope.currentTab = tab = find($scope.services, {title: $state.tab});
+          if ($state.tab) $scope.currentTab = find($scope.services, { title: $state.tab });
 
           $scope.$watch('state.tab', function (tab) {
             if (!tab) $scope.changeTab($scope.services[0]);
@@ -92,7 +89,7 @@ uiModules.get('apps/management')
       };
 
       $scope.bulkExport = function () {
-        const objs = $scope.selectedItems.map(partialRight(extend, {type: $scope.currentTab.type}));
+        const objs = $scope.selectedItems.map(partialRight(extend, { type: $scope.currentTab.type }));
         retrieveAndExportDocs(objs);
       };
 
@@ -108,7 +105,7 @@ uiModules.get('apps/management')
         if (!objs.length) return notify.error('No saved objects to export.');
         es.mget({
           index: kbnIndex,
-          body: {docs: objs.map(transformToMget)}
+          body: { docs: objs.map(transformToMget) }
         })
         .then(function (response) {
           saveToFile(response.docs.map(partialRight(pick, '_id', '_type', '_source')));
@@ -117,11 +114,11 @@ uiModules.get('apps/management')
 
       // Takes an object and returns the associated data needed for an mget API request
       function transformToMget(obj) {
-        return {_id: obj.id, _type: obj.type};
+        return { _id: obj.id, _type: obj.type };
       }
 
       function saveToFile(results) {
-        const blob = new Blob([angular.toJson(results, true)], {type: 'application/json'});
+        const blob = new Blob([angular.toJson(results, true)], { type: 'application/json' });
         saveAs(blob, 'export.json');
       }
 
@@ -134,7 +131,7 @@ uiModules.get('apps/management')
         }
 
         return Promise.map(docs, function (doc) {
-          const service = find($scope.services, {type: doc._type}).service;
+          const service = find($scope.services, { type: doc._type }).service;
           return service.get().then(function (obj) {
             obj.id = doc._id;
             return obj.applyESResp(doc).then(function () {
diff --git a/src/core_plugins/kibana/public/management/sections/objects/_view.js b/src/core_plugins/kibana/public/management/sections/objects/_view.js
index ef868fa6bfa90..20e6be49df648 100644
--- a/src/core_plugins/kibana/public/management/sections/objects/_view.js
+++ b/src/core_plugins/kibana/public/management/sections/objects/_view.js
@@ -140,7 +140,7 @@ uiModules.get('apps/management')
         session.setUseSoftTabs(true);
         session.on('changeAnnotation', function () {
           const annotations = session.getAnnotations();
-          if (_.some(annotations, { type: 'error'})) {
+          if (_.some(annotations, { type: 'error' })) {
             if (!_.contains($scope.aceInvalidEditors, fieldName)) {
               $scope.aceInvalidEditors.push(fieldName);
             }
@@ -168,7 +168,7 @@ uiModules.get('apps/management')
           type: service.type,
           id: $routeParams.id
         })
-        .then(function (resp) {
+        .then(function () {
           return redirectHandler('deleted');
         })
         .catch(notify.fatal);
@@ -197,7 +197,7 @@ uiModules.get('apps/management')
           id: $routeParams.id,
           body: source
         })
-        .then(function (resp) {
+        .then(function () {
           return redirectHandler('updated');
         })
         .catch(notify.fatal);
@@ -207,7 +207,7 @@ uiModules.get('apps/management')
         return es.indices.refresh({
           index: kbnIndex
         })
-        .then(function (resp) {
+        .then(function () {
           const msg = 'You successfully ' + action + ' the "' + $scope.obj._source.title + '" ' + $scope.title.toLowerCase() + ' object';
 
           $location.path('/management/kibana/objects').search({
diff --git a/src/core_plugins/kibana/public/management/sections/settings/advanced_row.js b/src/core_plugins/kibana/public/management/sections/settings/advanced_row.js
index 4d15f9d6466a3..355ac22c4ecf3 100644
--- a/src/core_plugins/kibana/public/management/sections/settings/advanced_row.js
+++ b/src/core_plugins/kibana/public/management/sections/settings/advanced_row.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import 'ui/elastic_textarea';
 import 'ui/filters/markdown';
 import uiModules from 'ui/modules';
diff --git a/src/core_plugins/kibana/public/management/sections/settings/index.js b/src/core_plugins/kibana/public/management/sections/settings/index.js
index 50dd85df3e1f4..78a9460331a78 100644
--- a/src/core_plugins/kibana/public/management/sections/settings/index.js
+++ b/src/core_plugins/kibana/public/management/sections/settings/index.js
@@ -12,7 +12,7 @@ uiRoutes
 });
 
 uiModules.get('apps/management')
-.directive('kbnManagementAdvanced', function (config, Notifier, Private, $rootScope) {
+.directive('kbnManagementAdvanced', function (config) {
   return {
     restrict: 'E',
     link: function ($scope) {
@@ -22,7 +22,7 @@ uiModules.get('apps/management')
       // initial config setup
       changed();
 
-      function changed(values) {
+      function changed() {
         const all = config.getAll();
         const editable = _(all)
           .map((def, name) => toEditableConfig({
diff --git a/src/core_plugins/kibana/public/management/sections/settings/lib/__tests__/get_val_type.js b/src/core_plugins/kibana/public/management/sections/settings/lib/__tests__/get_val_type.js
index 27bc982798622..f6743a194805f 100644
--- a/src/core_plugins/kibana/public/management/sections/settings/lib/__tests__/get_val_type.js
+++ b/src/core_plugins/kibana/public/management/sections/settings/lib/__tests__/get_val_type.js
@@ -10,27 +10,27 @@ describe('Settings', function () {
       });
 
       it('should return the explicitly defined type of a setting', function () {
-        expect(getValType({type: 'string'})).to.be('string');
-        expect(getValType({type: 'json'})).to.be('json');
-        expect(getValType({type: 'string', value: 5})).to.be('string');
+        expect(getValType({ type: 'string' })).to.be('string');
+        expect(getValType({ type: 'json' })).to.be('json');
+        expect(getValType({ type: 'string', value: 5 })).to.be('string');
       });
 
       it('should return array if the value is an Array and there is no defined type', function () {
-        expect(getValType({type: 'string'}, [1, 2, 3])).to.be('string');
-        expect(getValType({type: 'json', value: [1, 2, 3]})).to.be('json');
+        expect(getValType({ type: 'string' }, [1, 2, 3])).to.be('string');
+        expect(getValType({ type: 'json', value: [1, 2, 3] })).to.be('json');
 
-        expect(getValType({value: 'someString'}, [1, 2, 3])).to.be('array');
-        expect(getValType({value: [1, 2, 3]}, 'someString')).to.be('array');
+        expect(getValType({ value: 'someString' }, [1, 2, 3])).to.be('array');
+        expect(getValType({ value: [1, 2, 3] }, 'someString')).to.be('array');
 
       });
 
       it('should return the type of the default value if there is no type and it is not an array', function () {
-        expect(getValType({value: 'someString'})).to.be('string');
-        expect(getValType({value: 'someString'}, 42)).to.be('string');
+        expect(getValType({ value: 'someString' })).to.be('string');
+        expect(getValType({ value: 'someString' }, 42)).to.be('string');
       });
 
       it('should return the type of the value if the default value is null', function () {
-        expect(getValType({value: null}, 'someString')).to.be('string');
+        expect(getValType({ value: null }, 'someString')).to.be('string');
       });
     });
   });
diff --git a/src/core_plugins/kibana/public/management/sections/settings/lib/to_editable_config.js b/src/core_plugins/kibana/public/management/sections/settings/lib/to_editable_config.js
index 6789b541de7d5..eda3248923f36 100644
--- a/src/core_plugins/kibana/public/management/sections/settings/lib/to_editable_config.js
+++ b/src/core_plugins/kibana/public/management/sections/settings/lib/to_editable_config.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import getValType from './get_val_type';
 import getEditorType from './get_editor_type';
 
diff --git a/src/core_plugins/kibana/public/visualize/editor/__tests__/agg.js b/src/core_plugins/kibana/public/visualize/editor/__tests__/agg.js
index f8b1baeacedd8..9ac0b8878f2ed 100644
--- a/src/core_plugins/kibana/public/visualize/editor/__tests__/agg.js
+++ b/src/core_plugins/kibana/public/visualize/editor/__tests__/agg.js
@@ -3,13 +3,11 @@ import angular from 'angular';
 import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import $ from 'jquery';
 import 'plugins/kibana/visualize/editor/agg';
 
 
 describe('Vis-Editor-Agg plugin directive', function () {
   const $parentScope = {};
-  let $scope;
   let $elem;
 
   function makeConfig(which) {
@@ -72,9 +70,6 @@ describe('Vis-Editor-Agg plugin directive', function () {
 
     // Digest everything
     $elem.scope().$digest();
-
-    // give us a scope to work with
-    $scope = $elem.isolateScope();
   }));
 
   it('should only add the close button if there is more than the minimum', function () {
diff --git a/src/core_plugins/kibana/public/visualize/editor/agg.js b/src/core_plugins/kibana/public/visualize/editor/agg.js
index 217d099b90e19..42c84c37d1c83 100644
--- a/src/core_plugins/kibana/public/visualize/editor/agg.js
+++ b/src/core_plugins/kibana/public/visualize/editor/agg.js
@@ -1,17 +1,11 @@
 import 'plugins/kibana/visualize/editor/agg_params';
 import 'plugins/kibana/visualize/editor/agg_add';
 import _ from 'lodash';
-import $ from 'jquery';
-import advancedToggleHtml from 'plugins/kibana/visualize/editor/advanced_toggle.html';
-import AggTypesIndexProvider from 'ui/agg_types/index';
 import uiModules from 'ui/modules';
 import aggTemplate from 'plugins/kibana/visualize/editor/agg.html';
 uiModules
 .get('app/visualize')
 .directive('visEditorAgg', function ($compile, $parse, $filter, Private, Notifier) {
-
-  const aggTypes = Private(AggTypesIndexProvider);
-
   const notify = new Notifier({
     location: 'visAggGroup'
   });
@@ -46,13 +40,13 @@ uiModules
         return label ? label : '';
       };
 
-      $scope.$on('drag-start', e => {
+      $scope.$on('drag-start', () => {
         $scope.editorWasOpen = $scope.editorOpen;
         $scope.editorOpen = false;
         $scope.$emit('agg-drag-start', $scope.agg);
       });
 
-      $scope.$on('drag-end', e => {
+      $scope.$on('drag-end', () => {
         $scope.editorOpen = $scope.editorWasOpen;
         $scope.$emit('agg-drag-end', $scope.agg);
       });
diff --git a/src/core_plugins/kibana/public/visualize/editor/agg_filter.js b/src/core_plugins/kibana/public/visualize/editor/agg_filter.js
index f127238c72d25..4a54313da00bd 100644
--- a/src/core_plugins/kibana/public/visualize/editor/agg_filter.js
+++ b/src/core_plugins/kibana/public/visualize/editor/agg_filter.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import propFilter from 'ui/filters/_prop_filter';
 import uiModules from 'ui/modules';
 
diff --git a/src/core_plugins/kibana/public/visualize/editor/agg_group.js b/src/core_plugins/kibana/public/visualize/editor/agg_group.js
index 87a8ecd12094b..5c7e7b881d80d 100644
--- a/src/core_plugins/kibana/public/visualize/editor/agg_group.js
+++ b/src/core_plugins/kibana/public/visualize/editor/agg_group.js
@@ -7,7 +7,7 @@ import aggGroupTemplate from 'plugins/kibana/visualize/editor/agg_group.html';
 
 uiModules
 .get('app/visualize')
-.directive('visEditorAggGroup', function (Private) {
+.directive('visEditorAggGroup', function () {
 
   return {
     restrict: 'E',
@@ -42,8 +42,8 @@ uiModules
         });
       });
 
-      $scope.$on('agg-drag-start', e => $scope.dragging = true);
-      $scope.$on('agg-drag-end', e => {
+      $scope.$on('agg-drag-start', () => $scope.dragging = true);
+      $scope.$on('agg-drag-end', () => {
         $scope.dragging = false;
 
         //the aggs have been reordered in [group] and we need
diff --git a/src/core_plugins/kibana/public/visualize/editor/agg_param.js b/src/core_plugins/kibana/public/visualize/editor/agg_param.js
index 89e7c5b3f08c1..9030b9a249ed4 100644
--- a/src/core_plugins/kibana/public/visualize/editor/agg_param.js
+++ b/src/core_plugins/kibana/public/visualize/editor/agg_param.js
@@ -3,7 +3,7 @@ import uiModules from 'ui/modules';
 
 uiModules
 .get('app/visualize')
-.directive('visAggParamEditor', function (config, $parse, Private) {
+.directive('visAggParamEditor', function (config) {
   return {
     restrict: 'E',
     scope: true,
@@ -14,7 +14,7 @@ uiModules
       pre: function ($scope, $el, attr) {
         $scope.$bind('aggParam', attr.aggParam);
       },
-      post: function ($scope, $el, attr) {
+      post: function ($scope) {
         $scope.config = config;
 
         $scope.optionEnabled = function (option) {
diff --git a/src/core_plugins/kibana/public/visualize/editor/agg_params.js b/src/core_plugins/kibana/public/visualize/editor/agg_params.js
index 12db500fd7cad..18a6c1ef3029d 100644
--- a/src/core_plugins/kibana/public/visualize/editor/agg_params.js
+++ b/src/core_plugins/kibana/public/visualize/editor/agg_params.js
@@ -1,5 +1,3 @@
-import IndexedArray from 'ui/indexed_array';
-import _ from 'lodash';
 import $ from 'jquery';
 import aggSelectHtml from 'plugins/kibana/visualize/editor/agg_select.html';
 import advancedToggleHtml from 'plugins/kibana/visualize/editor/advanced_toggle.html';
@@ -11,13 +9,9 @@ import aggParamsTemplate from 'plugins/kibana/visualize/editor/agg_params.html';
 
 uiModules
 .get('app/visualize')
-.directive('visEditorAggParams', function ($compile, $parse, Private, Notifier, $filter) {
+.directive('visEditorAggParams', function ($compile, Private) {
   const aggTypes = Private(AggTypesIndexProvider);
 
-  const notify = new Notifier({
-    location: 'visAggGroup'
-  });
-
   return {
     restrict: 'E',
     template: aggParamsTemplate,
diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.js b/src/core_plugins/kibana/public/visualize/editor/editor.js
index ea8bd1bbee123..bdfb38e40ff6b 100644
--- a/src/core_plugins/kibana/public/visualize/editor/editor.js
+++ b/src/core_plugins/kibana/public/visualize/editor/editor.js
@@ -23,7 +23,7 @@ uiRoutes
   resolve: {
     savedVis: function (savedVisualizations, courier, $route, Private) {
       const visTypes = Private(RegistryVisTypesProvider);
-      const visType = _.find(visTypes, {name: $route.current.params.type});
+      const visType = _.find(visTypes, { name: $route.current.params.type });
       if (visType.requiresSearch && !$route.current.params.indexPattern && !$route.current.params.savedSearchId) {
         throw new Error('You must provide either an indexPattern or a savedSearchId');
       }
@@ -133,13 +133,13 @@ function VisEditor($scope, $route, timefilter, AppState, $location, kbnUrl, $tim
   const stateDefaults = {
     uiState: savedVis.uiStateJSON ? JSON.parse(savedVis.uiStateJSON) : {},
     linked: !!savedVis.savedSearchId,
-    query: searchSource.getOwn('query') || {query_string: {query: '*'}},
+    query: searchSource.getOwn('query') || { query_string: { query: '*' } },
     filters: searchSource.getOwn('filter') || [],
     vis: savedVisState
   };
 
   // Instance of app_state.js.
-  let $state = $scope.$state = (function initState() {
+  const $state = $scope.$state = (function initState() {
     // This is used to sync visualization state with the url when `appState.save()` is called.
     const appState = new AppState(stateDefaults);
 
@@ -301,7 +301,7 @@ function VisEditor($scope, $route, timefilter, AppState, $location, kbnUrl, $tim
       if (id) {
         notify.info('Saved Visualization "' + savedVis.title + '"');
         if (savedVis.id === $route.current.params.id) return;
-        kbnUrl.change('/visualize/edit/{{id}}', {id: savedVis.id});
+        kbnUrl.change('/visualize/edit/{{id}}', { id: savedVis.id });
       }
     }, notify.fatal);
   };
@@ -356,4 +356,4 @@ function VisEditor($scope, $route, timefilter, AppState, $location, kbnUrl, $tim
   }
 
   init();
-};
+}
diff --git a/src/core_plugins/kibana/public/visualize/editor/nesting_indicator.js b/src/core_plugins/kibana/public/visualize/editor/nesting_indicator.js
index 6187760f8265b..6255a6b640be7 100644
--- a/src/core_plugins/kibana/public/visualize/editor/nesting_indicator.js
+++ b/src/core_plugins/kibana/public/visualize/editor/nesting_indicator.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import $ from 'jquery';
 import VislibComponentsColorColorPaletteProvider from 'ui/vislib/components/color/color_palette';
 import uiModules from 'ui/modules';
@@ -13,11 +12,10 @@ uiModules
       item: '=',
       list: '='
     },
-    link: function ($scope, $el, attr) {
+    link: function ($scope, $el) {
       $scope.$watchCollection('list', function () {
         if (!$scope.list || !$scope.item) return;
 
-        const item = $scope.item;
         const index = $scope.list.indexOf($scope.item);
         const bars = $scope.list.slice(0, index + 1);
         const colors = getColors(bars.length);
diff --git a/src/core_plugins/kibana/public/visualize/editor/sidebar.js b/src/core_plugins/kibana/public/visualize/editor/sidebar.js
index 40187ba84bed9..ec3741f94ceb6 100644
--- a/src/core_plugins/kibana/public/visualize/editor/sidebar.js
+++ b/src/core_plugins/kibana/public/visualize/editor/sidebar.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import 'plugins/kibana/visualize/editor/agg_group';
 import 'plugins/kibana/visualize/editor/vis_options';
 import uiModules from 'ui/modules';
diff --git a/src/core_plugins/kibana/public/visualize/editor/vis_options.js b/src/core_plugins/kibana/public/visualize/editor/vis_options.js
index 1506d881c0cc6..c2611e638228f 100644
--- a/src/core_plugins/kibana/public/visualize/editor/vis_options.js
+++ b/src/core_plugins/kibana/public/visualize/editor/vis_options.js
@@ -1,5 +1,3 @@
-import _ from 'lodash';
-import $ from 'jquery';
 import uiModules from 'ui/modules';
 import visOptionsTemplate from 'plugins/kibana/visualize/editor/vis_options.html';
 
diff --git a/src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js b/src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
index 0bf171cd90333..b582dd9f86b21 100644
--- a/src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
+++ b/src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
@@ -12,13 +12,9 @@ import uiModules from 'ui/modules';
 
 uiModules
 .get('app/visualize')
-.factory('SavedVis', function (config, $injector, courier, Promise, savedSearches, Private, Notifier) {
+.factory('SavedVis', function (courier, Promise, savedSearches, Private) {
   const Vis = Private(VisProvider);
 
-  const notify = new Notifier({
-    location: 'SavedVis'
-  });
-
   _.class(SavedVis).inherits(courier.SavedObject);
   function SavedVis(opts) {
     const self = this;
@@ -72,7 +68,7 @@ uiModules
 
       return self.vis ? self._updateVis() : self._createVis();
     })
-    .then(function (vis) {
+    .then(function () {
       self.searchSource.aggs(function () {
         self.vis.requesting();
         return self.vis.aggs.toDsl();
diff --git a/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.js b/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.js
index 36d563ca69b08..2a8a9fd4c9308 100644
--- a/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.js
+++ b/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualization_register.js
@@ -1,3 +1,3 @@
 export default function savedVisualizationFn(savedVisualizations) {
   return savedVisualizations;
-};
+}
diff --git a/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js b/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
index 2b845d6391563..0ff66ada4fe50 100644
--- a/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
+++ b/src/core_plugins/kibana/public/visualize/saved_visualizations/saved_visualizations.js
@@ -39,7 +39,7 @@ app.service('savedVisualizations', function (Promise, es, kbnIndex, SavedVis, Pr
   };
 
   this.urlFor = function (id) {
-    return kbnUrl.eval('#/visualize/edit/{{id}}', {id: id});
+    return kbnUrl.eval('#/visualize/edit/{{id}}', { id: id });
   };
 
   this.delete = function (ids) {
@@ -70,7 +70,7 @@ app.service('savedVisualizations', function (Promise, es, kbnIndex, SavedVis, Pr
     if (!typeName || !visTypes.byName[typeName]) {
       if (!typeName) notify.error('Visualization type is missing. Please add a type to this visualization.', hit);
       else notify.error('Visualization type of "' + typeName + '" is invalid. Please change to a valid type.', hit);
-      return kbnUrl.redirect('/management/kibana/objects/savedVisualizations/{{id}}', {id: source.id});
+      return kbnUrl.redirect('/management/kibana/objects/savedVisualizations/{{id}}', { id: source.id });
     }
 
     source.type = visTypes.byName[typeName];
@@ -92,7 +92,7 @@ app.service('savedVisualizations', function (Promise, es, kbnIndex, SavedVis, Pr
         }
       };
     } else {
-      body = { query: {match_all: {}}};
+      body = { query: { match_all: {} } };
     }
 
     return es.search({
diff --git a/src/core_plugins/kibana/public/visualize/wizard/wizard.js b/src/core_plugins/kibana/public/visualize/wizard/wizard.js
index 64d71203d56bb..11bb9de1eb2a7 100644
--- a/src/core_plugins/kibana/public/visualize/wizard/wizard.js
+++ b/src/core_plugins/kibana/public/visualize/wizard/wizard.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import 'plugins/kibana/visualize/saved_visualizations/saved_visualizations';
 import 'ui/directives/saved_object_finder';
 import 'ui/directives/paginated_selectable_list';
@@ -47,7 +46,7 @@ module.controller('VisualizeWizardStep2', function ($route, $scope, $location, t
   const type = $route.current.params.type;
 
   $scope.step2WithSearchUrl = function (hit) {
-    return kbnUrl.eval('#/visualize/create?&type={{type}}&savedSearchId={{id}}', {type: type, id: hit.id});
+    return kbnUrl.eval('#/visualize/create?&type={{type}}&savedSearchId={{id}}', { type: type, id: hit.id });
   };
 
   timefilter.enabled = false;
diff --git a/src/core_plugins/kibana/server/lib/__tests__/converters/ingest_simulate_api_kibana_to_es_converter.js b/src/core_plugins/kibana/server/lib/__tests__/converters/ingest_simulate_api_kibana_to_es_converter.js
index 66c1339c3b56d..688cd91a2fa4d 100644
--- a/src/core_plugins/kibana/server/lib/__tests__/converters/ingest_simulate_api_kibana_to_es_converter.js
+++ b/src/core_plugins/kibana/server/lib/__tests__/converters/ingest_simulate_api_kibana_to_es_converter.js
@@ -1,5 +1,4 @@
 import expect from 'expect.js';
-import _ from 'lodash';
 import ingestSimulateApiKibanaToEsConverter from '../../converters/ingest_simulate_api_kibana_to_es_converter';
 
 describe('ingestSimulateApiKibanaToEsConverter', function () {
@@ -74,7 +73,7 @@ describe('ingestSimulateApiKibanaToEsConverter', function () {
         ]
       },
       'docs': [
-        {'_source': {}}
+        { '_source': {} }
       ]
     };
 
diff --git a/src/core_plugins/kibana/server/lib/__tests__/create_mappings_from_pattern_fields.js b/src/core_plugins/kibana/server/lib/__tests__/create_mappings_from_pattern_fields.js
index 7444d38384638..4b0ad09dca8e7 100644
--- a/src/core_plugins/kibana/server/lib/__tests__/create_mappings_from_pattern_fields.js
+++ b/src/core_plugins/kibana/server/lib/__tests__/create_mappings_from_pattern_fields.js
@@ -36,7 +36,7 @@ describe('createMappingsFromPatternFields', function () {
   });
 
   it('should set the same default mapping for all non-strings', function () {
-    let mappings = createMappingsFromPatternFields(testFields);
+    const mappings = createMappingsFromPatternFields(testFields);
 
     _.forEach(mappings, function (mapping) {
       if (mapping.type !== 'text') {
@@ -50,7 +50,7 @@ describe('createMappingsFromPatternFields', function () {
   });
 
   it('should give strings a multi-field mapping with a "text" base type', function () {
-    let mappings = createMappingsFromPatternFields(testFields);
+    const mappings = createMappingsFromPatternFields(testFields);
 
     _.forEach(mappings, function (mapping) {
       if (mapping.type === 'text') {
@@ -60,8 +60,8 @@ describe('createMappingsFromPatternFields', function () {
   });
 
   it('should handle nested fields', function () {
-    testFields.push({name: 'geo.coordinates', type: 'geo_point'});
-    let mappings = createMappingsFromPatternFields(testFields);
+    testFields.push({ name: 'geo.coordinates', type: 'geo_point' });
+    const mappings = createMappingsFromPatternFields(testFields);
 
     expect(mappings).to.have.property('geo');
     expect(mappings.geo).to.have.property('properties');
@@ -74,7 +74,7 @@ describe('createMappingsFromPatternFields', function () {
   });
 
   it('should map all number fields as an ES double', function () {
-    let mappings = createMappingsFromPatternFields(testFields);
+    const mappings = createMappingsFromPatternFields(testFields);
 
     expect(mappings).to.have.property('bytes');
     expect(mappings.bytes).to.have.property('type', 'double');
diff --git a/src/core_plugins/kibana/server/lib/__tests__/handle_es_error.js b/src/core_plugins/kibana/server/lib/__tests__/handle_es_error.js
index d45c4a01c796e..b2d98d73b0a91 100644
--- a/src/core_plugins/kibana/server/lib/__tests__/handle_es_error.js
+++ b/src/core_plugins/kibana/server/lib/__tests__/handle_es_error.js
@@ -1,5 +1,4 @@
 import expect from 'expect.js';
-import Boom from 'boom';
 import handleESError from '../handle_es_error';
 import { errors as esErrors } from 'elasticsearch';
 
diff --git a/src/core_plugins/kibana/server/lib/__tests__/init_default_field_props.js b/src/core_plugins/kibana/server/lib/__tests__/init_default_field_props.js
index 3a1d0d309407e..5adf3771da2eb 100644
--- a/src/core_plugins/kibana/server/lib/__tests__/init_default_field_props.js
+++ b/src/core_plugins/kibana/server/lib/__tests__/init_default_field_props.js
@@ -73,7 +73,7 @@ describe('initDefaultFieldProps', function () {
   });
 
   it('should apply some overrides to metafields', function () {
-    const results = initDefaultFieldProps([{name: '_source'}, {name: '_timestamp'}]);
+    const results = initDefaultFieldProps([{ name: '_source' }, { name: '_timestamp' }]);
     const expected = [
       {
         name: '_source',
diff --git a/src/core_plugins/kibana/server/lib/__tests__/manage_uuid.js b/src/core_plugins/kibana/server/lib/__tests__/manage_uuid.js
index 9b0d16faafe4e..1b61f1f6b5e7c 100644
--- a/src/core_plugins/kibana/server/lib/__tests__/manage_uuid.js
+++ b/src/core_plugins/kibana/server/lib/__tests__/manage_uuid.js
@@ -1,6 +1,5 @@
 import expect from 'expect.js';
 import sinon from 'sinon';
-import Joi from 'joi';
 import * as kbnTestServer from '../../../../../../test/utils/kbn_server.js';
 import fromRoot from '../../../../../utils/from_root';
 import manageUuid from '../manage_uuid';
diff --git a/src/core_plugins/kibana/server/lib/__tests__/process_es_ingest_processors_response.js b/src/core_plugins/kibana/server/lib/__tests__/process_es_ingest_processors_response.js
index 888f6d352f9bd..075db2eade9ee 100644
--- a/src/core_plugins/kibana/server/lib/__tests__/process_es_ingest_processors_response.js
+++ b/src/core_plugins/kibana/server/lib/__tests__/process_es_ingest_processors_response.js
@@ -79,7 +79,7 @@ describe('processESIngestSimulateResponse', function () {
   });
 
   it('should return an empty array for unexpected response', function () {
-    expect(_.isEqual(processESIngestProcessorsResponse({ nodes: {}}), [])).to.be.ok();
+    expect(_.isEqual(processESIngestProcessorsResponse({ nodes: {} }), [])).to.be.ok();
     expect(_.isEqual(processESIngestProcessorsResponse({}), [])).to.be.ok();
     expect(_.isEqual(processESIngestProcessorsResponse(undefined), [])).to.be.ok();
     expect(_.isEqual(processESIngestProcessorsResponse(null), [])).to.be.ok();
diff --git a/src/core_plugins/kibana/server/lib/__tests__/process_es_ingest_simulate_response.js b/src/core_plugins/kibana/server/lib/__tests__/process_es_ingest_simulate_response.js
index 0ff2fd0f7b191..dae37d13a2bc6 100644
--- a/src/core_plugins/kibana/server/lib/__tests__/process_es_ingest_simulate_response.js
+++ b/src/core_plugins/kibana/server/lib/__tests__/process_es_ingest_simulate_response.js
@@ -1,6 +1,5 @@
 import processESIngestSimulateResponse from '../process_es_ingest_simulate_response';
 import expect from 'expect.js';
-import _ from 'lodash';
 
 describe('processESIngestSimulateResponse', function () {
 
@@ -39,7 +38,7 @@ describe('processESIngestSimulateResponse', function () {
 
       const expected = [
         { processorId: 'processor1', output: 'new_foo', error: undefined },
-        { processorId: 'processor2', output: undefined, error: { compile: false, message: 'something bad happened'} }
+        { processorId: 'processor2', output: undefined, error: { compile: false, message: 'something bad happened' } }
       ];
       const actual = processESIngestSimulateResponse(response);
 
@@ -60,7 +59,7 @@ describe('processESIngestSimulateResponse', function () {
 
       const expected = [
         { processorId: 'processor2', output: 'new_bar', error: undefined },
-        { processorId: 'processor3', output: undefined, error: { compile: false, message: 'something bad happened'} }
+        { processorId: 'processor3', output: undefined, error: { compile: false, message: 'something bad happened' } }
       ];
       const actual = processESIngestSimulateResponse(response);
 
diff --git a/src/core_plugins/kibana/server/lib/converters/ingest_simulate_api_kibana_to_es_converter.js b/src/core_plugins/kibana/server/lib/converters/ingest_simulate_api_kibana_to_es_converter.js
index 7859d21fc2e70..86e236683ae50 100644
--- a/src/core_plugins/kibana/server/lib/converters/ingest_simulate_api_kibana_to_es_converter.js
+++ b/src/core_plugins/kibana/server/lib/converters/ingest_simulate_api_kibana_to_es_converter.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import ingestPipelineApiKibanaToEsConverter from './ingest_pipeline_api_kibana_to_es_converter';
 
 export default function ingestSimulateApiKibanaToEsConverter(simulateApiDocument) {
diff --git a/src/core_plugins/kibana/server/lib/create_mappings_from_pattern_fields.js b/src/core_plugins/kibana/server/lib/create_mappings_from_pattern_fields.js
index d48cf5e1ab831..3e38e230d2a0b 100644
--- a/src/core_plugins/kibana/server/lib/create_mappings_from_pattern_fields.js
+++ b/src/core_plugins/kibana/server/lib/create_mappings_from_pattern_fields.js
@@ -15,7 +15,7 @@ module.exports = function createMappingsFromPatternFields(fields) {
       mapping = {
         type: 'text',
         fields: {
-          keyword: {type: 'keyword', ignore_above: 256}
+          keyword: { type: 'keyword', ignore_above: 256 }
         }
       };
     }
diff --git a/src/core_plugins/kibana/server/lib/process_es_ingest_processors_response.js b/src/core_plugins/kibana/server/lib/process_es_ingest_processors_response.js
index 720ad47264193..c25427e9b37f8 100644
--- a/src/core_plugins/kibana/server/lib/process_es_ingest_processors_response.js
+++ b/src/core_plugins/kibana/server/lib/process_es_ingest_processors_response.js
@@ -1,4 +1,4 @@
-const _ = require('lodash');
+import _ from 'lodash';
 
 export default function processESIngestProcessorsResponse(response) {
   const nodes = _.get(response, 'nodes');
@@ -13,4 +13,4 @@ export default function processESIngestProcessorsResponse(response) {
     .value();
 
   return results;
-};
+}
diff --git a/src/core_plugins/kibana/server/lib/process_es_ingest_simulate_error.js b/src/core_plugins/kibana/server/lib/process_es_ingest_simulate_error.js
index 10bf2dc1b9720..05dad26fc43fe 100644
--- a/src/core_plugins/kibana/server/lib/process_es_ingest_simulate_error.js
+++ b/src/core_plugins/kibana/server/lib/process_es_ingest_simulate_error.js
@@ -1,4 +1,4 @@
-const _ = require('lodash');
+import _ from 'lodash';
 
 function buildError(error) {
   const errorMessage = _.get(error, 'body.error.root_cause[0].reason');
diff --git a/src/core_plugins/kibana/server/lib/process_es_ingest_simulate_response.js b/src/core_plugins/kibana/server/lib/process_es_ingest_simulate_response.js
index 7a7119432f7f5..65945ee9d2064 100644
--- a/src/core_plugins/kibana/server/lib/process_es_ingest_simulate_response.js
+++ b/src/core_plugins/kibana/server/lib/process_es_ingest_simulate_response.js
@@ -1,4 +1,4 @@
-const _ = require('lodash');
+import _ from 'lodash';
 
 function buildError(error) {
   const errorMessage =  _.get(error, 'root_cause[0].reason') || _.get(error, 'root_cause[0].type');
@@ -21,4 +21,4 @@ export default function processESIngestSimulateResponse(resp) {
   });
 
   return results;
-};
+}
diff --git a/src/core_plugins/kibana/server/routes/api/ingest/register_field_capabilities.js b/src/core_plugins/kibana/server/routes/api/ingest/register_field_capabilities.js
index e4d619ab1e322..f30d394341475 100644
--- a/src/core_plugins/kibana/server/routes/api/ingest/register_field_capabilities.js
+++ b/src/core_plugins/kibana/server/routes/api/ingest/register_field_capabilities.js
@@ -22,7 +22,7 @@ export function registerFieldCapabilities(server) {
             return _.pick(value, ['searchable', 'aggregatable']);
           });
 
-          reply({fields: fieldsFilteredValues});
+          reply({ fields: fieldsFilteredValues });
         },
         (error) => {
           reply(handleESError(error));
diff --git a/src/core_plugins/kibana/server/routes/api/ingest/register_processors.js b/src/core_plugins/kibana/server/routes/api/ingest/register_processors.js
index 399e33ea1a852..424425830d91b 100644
--- a/src/core_plugins/kibana/server/routes/api/ingest/register_processors.js
+++ b/src/core_plugins/kibana/server/routes/api/ingest/register_processors.js
@@ -1,7 +1,6 @@
 import _ from 'lodash';
 import handleESError from '../../../lib/handle_es_error';
 import handleResponse from '../../../lib/process_es_ingest_processors_response';
-import { keysToCamelCaseShallow, keysToSnakeCaseShallow } from '../../../../common/lib/case_conversion';
 
 export function registerProcessors(server) {
   server.route({
@@ -21,4 +20,4 @@ export function registerProcessors(server) {
       });
     }
   });
-};
+}
diff --git a/src/core_plugins/kibana/server/routes/api/ingest/register_simulate.js b/src/core_plugins/kibana/server/routes/api/ingest/register_simulate.js
index 5370534884666..b7fae78d66eac 100644
--- a/src/core_plugins/kibana/server/routes/api/ingest/register_simulate.js
+++ b/src/core_plugins/kibana/server/routes/api/ingest/register_simulate.js
@@ -4,7 +4,7 @@ import handleResponse from '../../../lib/process_es_ingest_simulate_response';
 import handleError from '../../../lib/process_es_ingest_simulate_error';
 import simulateRequestSchema from '../../../lib/schemas/simulate_request_schema';
 import ingestSimulateApiKibanaToEsConverter from '../../../lib/converters/ingest_simulate_api_kibana_to_es_converter';
-import { keysToCamelCaseShallow, keysToSnakeCaseShallow } from '../../../../common/lib/case_conversion';
+import { keysToSnakeCaseShallow } from '../../../../common/lib/case_conversion';
 
 export function registerSimulate(server) {
   server.route({
@@ -34,4 +34,4 @@ export function registerSimulate(server) {
       });
     }
   });
-};
+}
diff --git a/src/core_plugins/kibana/server/routes/api/search/count/register_count.js b/src/core_plugins/kibana/server/routes/api/search/count/register_count.js
index 8e542afe70cf0..4ed7b499ad087 100644
--- a/src/core_plugins/kibana/server/routes/api/search/count/register_count.js
+++ b/src/core_plugins/kibana/server/routes/api/search/count/register_count.js
@@ -14,7 +14,7 @@ export default function registerCount(server) {
       })
       .then(
         function (res) {
-          reply({count: res.count});
+          reply({ count: res.count });
         },
         function (error) {
           reply(handleESError(error));
diff --git a/src/core_plugins/kibana/server/routes/api/settings/register_set_many.js b/src/core_plugins/kibana/server/routes/api/settings/register_set_many.js
index 7ab2c035de76f..b4cd0bcd9a9f9 100644
--- a/src/core_plugins/kibana/server/routes/api/settings/register_set_many.js
+++ b/src/core_plugins/kibana/server/routes/api/settings/register_set_many.js
@@ -5,7 +5,6 @@ export default function registerSet(server) {
     path: '/api/kibana/settings',
     method: 'POST',
     handler: function (req, reply) {
-      const { key } = req.params;
       const { changes } = req.payload;
       const uiSettings = server.uiSettings();
       uiSettings
diff --git a/src/core_plugins/markdown_vis/index.js b/src/core_plugins/markdown_vis/index.js
index 973760d27889c..1ceb7c70649d9 100644
--- a/src/core_plugins/markdown_vis/index.js
+++ b/src/core_plugins/markdown_vis/index.js
@@ -10,4 +10,4 @@ export default function (kibana) {
 
   });
 
-};
+}
diff --git a/src/core_plugins/markdown_vis/public/__tests__/markdown_vis_controller.js b/src/core_plugins/markdown_vis/public/__tests__/markdown_vis_controller.js
index 93fafef12882c..39985105cd94e 100644
--- a/src/core_plugins/markdown_vis/public/__tests__/markdown_vis_controller.js
+++ b/src/core_plugins/markdown_vis/public/__tests__/markdown_vis_controller.js
@@ -3,12 +3,11 @@ import expect from 'expect.js';
 
 describe('markdown vis controller', function () {
   let $scope;
-  let $el;
 
   beforeEach(ngMock.module('kibana/markdown_vis'));
   beforeEach(ngMock.inject(function ($rootScope, $controller) {
     $scope = $rootScope.$new();
-    $controller('KbnMarkdownVisController', {$scope: $scope});
+    $controller('KbnMarkdownVisController', { $scope: $scope });
     $scope.$digest();
   }));
 
diff --git a/src/core_plugins/metric_vis/index.js b/src/core_plugins/metric_vis/index.js
index 4824fe245d402..cba768a6aaf26 100644
--- a/src/core_plugins/metric_vis/index.js
+++ b/src/core_plugins/metric_vis/index.js
@@ -10,4 +10,4 @@ export default function (kibana) {
 
   });
 
-};
+}
diff --git a/src/core_plugins/metric_vis/public/__tests__/metric_vis_controller.js b/src/core_plugins/metric_vis/public/__tests__/metric_vis_controller.js
index a745d90c7f841..e685209af2c49 100644
--- a/src/core_plugins/metric_vis/public/__tests__/metric_vis_controller.js
+++ b/src/core_plugins/metric_vis/public/__tests__/metric_vis_controller.js
@@ -11,14 +11,14 @@ describe('metric vis', function () {
   beforeEach(ngMock.module('kibana/metric_vis'));
   beforeEach(ngMock.inject(function ($rootScope, $controller) {
     $scope = $rootScope.$new();
-    $controller('KbnMetricVisController', {$scope: $scope});
+    $controller('KbnMetricVisController', { $scope: $scope });
     $scope.$digest();
   }));
 
   it('should set the metric label and value', function () {
     $scope.processTableGroups({
       tables: [{
-        columns: [{title: 'Count'}],
+        columns: [{ title: 'Count' }],
         rows: [[4301021]],
         aggConfig: function () {
           return {
@@ -39,8 +39,8 @@ describe('metric vis', function () {
     $scope.processTableGroups({
       tables: [{
         columns: [
-          {title: '1st percentile of bytes'},
-          {title: '99th percentile of bytes'}
+          { title: '1st percentile of bytes' },
+          { title: '99th percentile of bytes' }
         ],
         rows: [[182, 445842.4634666484]],
         aggConfig: function () {
diff --git a/src/core_plugins/spy_modes/index.js b/src/core_plugins/spy_modes/index.js
index 1de9c844b168d..5f100666388d9 100644
--- a/src/core_plugins/spy_modes/index.js
+++ b/src/core_plugins/spy_modes/index.js
@@ -7,4 +7,4 @@ export default function (kibana) {
       ]
     }
   });
-};
+}
diff --git a/src/core_plugins/spy_modes/public/req_resp_stats_spy_mode.js b/src/core_plugins/spy_modes/public/req_resp_stats_spy_mode.js
index 2084d42a430db..9f87b2c299a3d 100644
--- a/src/core_plugins/spy_modes/public/req_resp_stats_spy_mode.js
+++ b/src/core_plugins/spy_modes/public/req_resp_stats_spy_mode.js
@@ -1,7 +1,6 @@
-import _ from 'lodash';
 import reqRespStatsHTML from 'plugins/spy_modes/req_resp_stats_spy_mode.html';
 
-const linkReqRespStats = function ($scope, config) {
+const linkReqRespStats = function ($scope) {
   $scope.$bind('req', 'searchSource.history[searchSource.history.length - 1]');
   $scope.$watchMulti([
     'req',
diff --git a/src/core_plugins/spy_modes/public/table_spy_mode.js b/src/core_plugins/spy_modes/public/table_spy_mode.js
index f786614074779..80e3c78ab54d0 100644
--- a/src/core_plugins/spy_modes/public/table_spy_mode.js
+++ b/src/core_plugins/spy_modes/public/table_spy_mode.js
@@ -1,5 +1,3 @@
-import { saveAs } from '@spalger/filesaver';
-import _ from 'lodash';
 import 'ui/agg_table';
 import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify';
 import tableSpyModeTemplate from 'plugins/spy_modes/table_spy_mode.html';
@@ -14,7 +12,7 @@ function VisSpyTableProvider(Notifier, $filter, $rootScope, config, Private) {
     display: 'Table',
     order: 1,
     template: tableSpyModeTemplate,
-    link: function tableLinkFn($scope, $el) {
+    link: function tableLinkFn($scope) {
       $rootScope.$watchMulti.call($scope, [
         'vis',
         'esResp'
diff --git a/src/core_plugins/status_page/index.js b/src/core_plugins/status_page/index.js
index cf9ebb95f2f09..c5cae2d43e1ed 100644
--- a/src/core_plugins/status_page/index.js
+++ b/src/core_plugins/status_page/index.js
@@ -9,4 +9,4 @@ export default function (kibana) {
       }
     }
   });
-};
+}
diff --git a/src/core_plugins/status_page/public/status_page.js b/src/core_plugins/status_page/public/status_page.js
index 05c0ad1b1b226..0a9581ad6fadd 100644
--- a/src/core_plugins/status_page/public/status_page.js
+++ b/src/core_plugins/status_page/public/status_page.js
@@ -1,6 +1,4 @@
-import _ from 'lodash';
 import notify from 'ui/notify';
-import $ from 'jquery';
 import 'ui/autoload/styles';
 import 'plugins/status_page/status_page_metric';
 import 'plugins/status_page/status_page.less';
@@ -9,7 +7,7 @@ import uiModules from 'ui/modules';
 
 const chrome = require('ui/chrome')
 .setRootTemplate(require('plugins/status_page/status_page.html'))
-.setRootController('ui', function ($http, $scope) {
+.setRootController('ui', function ($http) {
   const ui = this;
   ui.loading = false;
 
diff --git a/src/core_plugins/status_page/public/status_page_metric.js b/src/core_plugins/status_page/public/status_page_metric.js
index 1893e8eda2d4b..1e62d4d75d3a4 100644
--- a/src/core_plugins/status_page/public/status_page_metric.js
+++ b/src/core_plugins/status_page/public/status_page_metric.js
@@ -1,7 +1,3 @@
-import _ from 'lodash';
-import moment from 'moment';
-import numeral from 'numeral';
-
 import toTitleCase from './lib/to_title_case';
 import formatNumber from './lib/format_number';
 import readStatData from './lib/read_stat_data';
diff --git a/src/core_plugins/table_vis/index.js b/src/core_plugins/table_vis/index.js
index 88b6f81386311..87aba9008be19 100644
--- a/src/core_plugins/table_vis/index.js
+++ b/src/core_plugins/table_vis/index.js
@@ -8,4 +8,4 @@ export default function (kibana) {
     }
   });
 
-};
+}
diff --git a/src/core_plugins/table_vis/public/__tests__/_table_vis.js b/src/core_plugins/table_vis/public/__tests__/_table_vis.js
index 8578d7ce1529b..9b2fd30ef2473 100644
--- a/src/core_plugins/table_vis/public/__tests__/_table_vis.js
+++ b/src/core_plugins/table_vis/public/__tests__/_table_vis.js
@@ -2,16 +2,11 @@ import $ from 'jquery';
 import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import sinon from 'auto-release-sinon';
-import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
 import VisProvider from 'ui/vis';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 describe('Integration', function () {
-
   let $rootScope;
-  let TableGroup;
   let $compile;
-  let $scope;
   let $el;
   let Vis;
   let indexPattern;
@@ -22,7 +17,6 @@ describe('Integration', function () {
     $rootScope = $injector.get('$rootScope');
     $compile = $injector.get('$compile');
     fixtures = require('fixtures/fake_hierarchical_data');
-    TableGroup = Private(AggResponseTabifyTableGroupProvider);
     Vis = Private(VisProvider);
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
   }));
@@ -37,8 +31,6 @@ describe('Integration', function () {
     $el = $('<visualize vis="vis" es-resp="esResponse" ui-state="uiState">');
     $compile($el)($rootScope);
     $rootScope.$apply();
-
-    $scope = $el.isolateScope();
   }
 
   function OneRangeVis(params) {
@@ -103,7 +95,7 @@ describe('Integration', function () {
   });
 
   it('displays an error if the search had no hits', function () {
-    init(new OneRangeVis(), { hits: { total: 0, hits: [] }});
+    init(new OneRangeVis(), { hits: { total: 0, hits: [] } });
 
     expect($el.find('kbn-agg-table-group').size()).to.be(0);
 
diff --git a/src/core_plugins/table_vis/public/__tests__/_table_vis_controller.js b/src/core_plugins/table_vis/public/__tests__/_table_vis_controller.js
index 8941be2b1b54c..9612b93cacea4 100644
--- a/src/core_plugins/table_vis/public/__tests__/_table_vis_controller.js
+++ b/src/core_plugins/table_vis/public/__tests__/_table_vis_controller.js
@@ -4,14 +4,11 @@ import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import sinon from 'auto-release-sinon';
 import tabifyPm from 'ui/agg_response/tabify/tabify';
-import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
 import VisProvider from 'ui/vis';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import StateManagementAppStateProvider from 'ui/state_management/app_state';
 describe('Controller', function () {
-
   let $rootScope;
-  let TableGroup;
   let $compile;
   let Private;
   let $scope;
@@ -27,7 +24,6 @@ describe('Controller', function () {
     $compile = $injector.get('$compile');
     fixtures = require('fixtures/fake_hierarchical_data');
     AppState = Private(StateManagementAppStateProvider);
-    TableGroup = Private(AggResponseTabifyTableGroupProvider);
     Vis = Private(VisProvider);
   }));
 
@@ -60,7 +56,7 @@ describe('Controller', function () {
     vis.aggs.forEach(function (agg, i) { agg.id = 'agg_' + (i + 1); });
 
     $rootScope.vis = vis;
-    $rootScope.uiState = new AppState({uiState: {}}).makeStateful('uiState');
+    $rootScope.uiState = new AppState({ uiState: {} }).makeStateful('uiState');
     $rootScope.newScope = function (scope) { $scope = scope; };
 
     $el = $('<div>')
@@ -112,7 +108,7 @@ describe('Controller', function () {
       columnIndex: 1,
       direction: 'asc'
     };
-    initController(new OneRangeVis({sort: sortObj}));
+    initController(new OneRangeVis({ sort: sortObj }));
 
     // modify the data to not have any buckets
     const resp = _.cloneDeep(fixtures.oneRangeBucket);
diff --git a/src/core_plugins/table_vis/public/table_vis_controller.js b/src/core_plugins/table_vis/public/table_vis_controller.js
index e48484b93f98c..df1b9aacfdc2a 100644
--- a/src/core_plugins/table_vis/public/table_vis_controller.js
+++ b/src/core_plugins/table_vis/public/table_vis_controller.js
@@ -11,7 +11,7 @@ const module = uiModules.get('kibana/table_vis', ['kibana']);
 module.controller('KbnTableVisController', function ($scope, Private) {
   const tabifyAggResponse = Private(AggResponseTabifyTabifyProvider);
 
-  var uiStateSort = ($scope.uiState) ? $scope.uiState.get('vis.params.sort') : {};
+  const uiStateSort = ($scope.uiState) ? $scope.uiState.get('vis.params.sort') : {};
   assign($scope.vis.params.sort, uiStateSort);
 
   $scope.sort = $scope.vis.params.sort;
diff --git a/src/core_plugins/table_vis/public/table_vis_params.js b/src/core_plugins/table_vis/public/table_vis_params.js
index 5bd00795dae6d..54f5d44e01ba2 100644
--- a/src/core_plugins/table_vis/public/table_vis_params.js
+++ b/src/core_plugins/table_vis/public/table_vis_params.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import uiModules from 'ui/modules';
 import tableVisParamsTemplate from 'plugins/table_vis/table_vis_params.html';
 
diff --git a/src/core_plugins/tests_bundle/find_source_files.js b/src/core_plugins/tests_bundle/find_source_files.js
index c6b6151166cda..a22c76c4c3d30 100644
--- a/src/core_plugins/tests_bundle/find_source_files.js
+++ b/src/core_plugins/tests_bundle/find_source_files.js
@@ -1,11 +1,11 @@
 
 import { fromRoot } from '../../utils';
-import { chain, memoize } from 'lodash';
+import { chain } from 'lodash';
 import { resolve } from 'path';
-import { map, fromNode } from 'bluebird';
+import { fromNode } from 'bluebird';
 import glob from 'glob-all';
 
-let findSourceFiles = async (patterns, cwd = fromRoot('.')) => {
+const findSourceFiles = async (patterns, cwd = fromRoot('.')) => {
   patterns = [].concat(patterns || []);
 
   const matches = await fromNode(cb => {
diff --git a/src/core_plugins/tests_bundle/index.js b/src/core_plugins/tests_bundle/index.js
index 34fe685e4602b..46f52ca91131b 100644
--- a/src/core_plugins/tests_bundle/index.js
+++ b/src/core_plugins/tests_bundle/index.js
@@ -16,7 +16,7 @@ export default (kibana) => {
     uiExports: {
       bundle: async (UiBundle, env, apps, plugins) => {
         let modules = [];
-        let config = kibana.config;
+        const config = kibana.config;
 
         const testGlobs = ['src/ui/public/**/*.js'];
         const testingPluginIds = config.get('tests_bundle.pluginId');
@@ -28,7 +28,7 @@ export default (kibana) => {
             if (!plugin) throw new Error('Invalid testingPluginId :: unknown plugin ' + pluginId);
 
             // add the modules from all of this plugins apps
-            for (let app of plugin.apps) {
+            for (const app of plugin.apps) {
               modules = union(modules, app.getModules());
             }
 
@@ -37,7 +37,7 @@ export default (kibana) => {
         } else {
 
           // add the modules from all of the apps
-          for (let app of apps) {
+          for (const app of apps) {
             modules = union(modules, app.getModules());
           }
 
@@ -47,7 +47,7 @@ export default (kibana) => {
         }
 
         const testFiles = await findSourceFiles(testGlobs);
-        for (let f of testFiles) modules.push(f);
+        for (const f of testFiles) modules.push(f);
 
         if (config.get('tests_bundle.instrument')) {
           env.addPostLoader({
diff --git a/src/core_plugins/tests_bundle/tests_entry_template.js b/src/core_plugins/tests_bundle/tests_entry_template.js
index 8717cc901cbd4..70cbdbfc58b18 100644
--- a/src/core_plugins/tests_bundle/tests_entry_template.js
+++ b/src/core_plugins/tests_bundle/tests_entry_template.js
@@ -1,4 +1,4 @@
-module.exports = function ({env, bundle}) {
+module.exports = function ({ env, bundle }) {
 
   const pluginSlug = env.pluginInfo.sort()
     .map(p => ' *  - ' + p)
diff --git a/src/core_plugins/timelion/.eslintrc b/src/core_plugins/timelion/.eslintrc
deleted file mode 100644
index 78ad50cf6a489..0000000000000
--- a/src/core_plugins/timelion/.eslintrc
+++ /dev/null
@@ -1,68 +0,0 @@
----
-parser: babel-eslint
-
-env:
-  es6: true
-  amd: true
-  node: true
-  browser: true
-  jasmine: true
-
-rules:
-  block-scoped-var: 2
-  camelcase: [ 2, { properties: never } ]
-  comma-dangle: 0
-  comma-style: [ 2, last ]
-  consistent-return: 0
-  curly: [ 2, multi-line ]
-  dot-location: [ 2, property ]
-  dot-notation: [ 2, { allowKeywords: true } ]
-  eqeqeq: [ 2, allow-null ]
-  guard-for-in: 2
-  indent: [ 2, 2, { SwitchCase: 1 } ]
-  key-spacing: [ 0, { align: value } ]
-  max-len: [ 2, 140, 2, { ignoreComments: true, ignoreUrls: true } ]
-  new-cap: [ 2, { capIsNewExceptions: [ Private ] } ]
-  no-bitwise: 0
-  no-caller: 2
-  no-cond-assign: 0
-  no-debugger: 2
-  no-empty: 2
-  no-eval: 2
-  no-extend-native: 2
-  no-extra-parens: 0
-  no-irregular-whitespace: 2
-  no-iterator: 2
-  no-loop-func: 2
-  no-multi-spaces: 0
-  no-multi-str: 2
-  no-nested-ternary: 2
-  no-new: 0
-  no-path-concat: 0
-  no-proto: 2
-  no-return-assign: 0
-  no-script-url: 2
-  no-sequences: 2
-  no-shadow: 0
-  no-trailing-spaces: 2
-  no-undef: 2
-  no-underscore-dangle: 0
-  no-unused-expressions: 0
-  no-unused-vars: 0
-  no-use-before-define: [ 2, nofunc ]
-  no-with: 2
-  one-var: [ 2, never ]
-  quotes: [ 2, single ]
-  semi-spacing: [ 2, { before: false, after: true } ]
-  semi: [ 2, always ]
-  space-after-keywords: [ 2, always ]
-  space-before-blocks: [ 2, always ]
-  space-before-function-paren: [ 2, { anonymous: always, named: never } ]
-  space-in-parens: [ 2, never ]
-  space-infix-ops: [ 2, { int32Hint: false } ]
-  space-return-throw-case: [ 2 ]
-  space-unary-ops: [ 2 ]
-  strict: [ 2, never ]
-  valid-typeof: 2
-  wrap-iife: [ 2, outside ]
-  yoda: 0
diff --git a/src/core_plugins/timelion/index.js b/src/core_plugins/timelion/index.js
index 6221d6ed03700..2de09095f1064 100644
--- a/src/core_plugins/timelion/index.js
+++ b/src/core_plugins/timelion/index.js
@@ -1,12 +1,12 @@
 
-var path = require('path');
+import path from 'path';
 
 module.exports = function (kibana) {
-  var mainFile = 'plugins/timelion/app';
+  let mainFile = 'plugins/timelion/app';
 
-  var ownDescriptor = Object.getOwnPropertyDescriptor(kibana, 'autoload');
-  var protoDescriptor = Object.getOwnPropertyDescriptor(kibana.constructor.prototype, 'autoload');
-  var descriptor = ownDescriptor || protoDescriptor || {};
+  const ownDescriptor = Object.getOwnPropertyDescriptor(kibana, 'autoload');
+  const protoDescriptor = Object.getOwnPropertyDescriptor(kibana.constructor.prototype, 'autoload');
+  const descriptor = ownDescriptor || protoDescriptor || {};
   if (descriptor.get) {
     // the autoload list has been replaced with a getter that complains about
     // improper access, bypass that getter by seeing if it is defined
@@ -22,8 +22,8 @@ module.exports = function (kibana) {
         description: 'Time series expressions for everything',
         icon: 'plugins/timelion/icon.svg',
         main: mainFile,
-        injectVars: function (server, options) {
-          var config = server.config();
+        injectVars: function (server) {
+          const config = server.config();
           return {
             kbnIndex: config.get('kibana.index'),
             esShardTimeout: config.get('elasticsearch.shardTimeout'),
diff --git a/src/core_plugins/timelion/init.js b/src/core_plugins/timelion/init.js
index 36fb506d8de62..76cb65aba7ba1 100644
--- a/src/core_plugins/timelion/init.js
+++ b/src/core_plugins/timelion/init.js
@@ -1,5 +1,5 @@
-var _ = require('lodash');
-var processFunctionDefinition = require('./server/lib/process_function_definition');
+import _ from 'lodash';
+import processFunctionDefinition from './server/lib/process_function_definition';
 
 module.exports = function (server) {
   //var config = server.config();
@@ -8,7 +8,7 @@ module.exports = function (server) {
   require('./server/routes/functions.js')(server);
   require('./server/routes/validate_es.js')(server);
 
-  var functions = require('./server/lib/load_functions')('series_functions');
+  const functions = require('./server/lib/load_functions')('series_functions');
 
   function addFunction(func) {
     _.assign(functions, processFunctionDefinition(func));
diff --git a/src/core_plugins/timelion/public/app.js b/src/core_plugins/timelion/public/app.js
index be8d263a0afa4..5e4591a32a00f 100644
--- a/src/core_plugins/timelion/public/app.js
+++ b/src/core_plugins/timelion/public/app.js
@@ -1,6 +1,5 @@
-var _ = require('lodash');
-var logoUrl = require('./logo.png');
-var moment = require('moment-timezone');
+import _ from 'lodash';
+import moment from 'moment-timezone';
 
 require('plugins/timelion/directives/cells/cells');
 require('plugins/timelion/directives/fullscreen/fullscreen');
@@ -15,7 +14,7 @@ document.title = 'Timelion - Kibana';
 
 require('ui/chrome');
 
-var app = require('ui/modules').get('apps/timelion', []);
+const app = require('ui/modules').get('apps/timelion', []);
 
 require('plugins/timelion/services/saved_sheets');
 require('plugins/timelion/services/_saved_sheet');
@@ -27,7 +26,7 @@ require('./vis');
 require('ui/saved_objects/saved_object_registry').register(require('plugins/timelion/services/saved_sheet_register'));
 
 // TODO: Expose an api for dismissing notifications
-var unsafeNotifications = require('ui/notify')._notifs;
+const unsafeNotifications = require('ui/notify')._notifs;
 //var ConfigTemplate = require('ui/config_template');
 
 require('ui/routes').enable();
@@ -48,21 +47,19 @@ require('ui/routes')
 
 app.controller('timelion', function (
   $scope, $http, timefilter, AppState, courier, $route, $routeParams, kbnUrl, Notifier, config, $timeout, Private, savedVisualizations) {
-
   // TODO: For some reason the Kibana core doesn't correctly do this for all apps.
   moment.tz.setDefault(config.get('dateFormat:tz'));
 
   timefilter.enabled = true;
-  var notify = new Notifier({
+  const notify = new Notifier({
     location: 'Timelion'
   });
 
-  var timezone = Private(require('plugins/timelion/services/timezone'))();
-  var docTitle = Private(require('ui/doc_title'));
+  const timezone = Private(require('plugins/timelion/services/timezone'))();
+  const docTitle = Private(require('ui/doc_title'));
 
-  var defaultExpression = '.es(*)';
-  var savedSheet = $route.current.locals.savedSheet;
-  var blankSheet = [defaultExpression];
+  const defaultExpression = '.es(*)';
+  const savedSheet = $route.current.locals.savedSheet;
 
   $scope.topNavMenu = [{
     key: 'new',
@@ -109,7 +106,7 @@ app.controller('timelion', function (
     };
   }
 
-  var init = function () {
+  const init = function () {
     $scope.running = false;
     $scope.search();
 
@@ -129,7 +126,7 @@ app.controller('timelion', function (
     };
   };
 
-  var refresher;
+  let refresher;
   $scope.$watchCollection('timefilter.refreshInterval', function (interval) {
     if (refresher) $timeout.cancel(refresher);
     if (interval.value > 0 && !interval.pause) {
@@ -138,7 +135,7 @@ app.controller('timelion', function (
           if (!$scope.running) $scope.search();
           startRefresh();
         }, interval.value);
-      };
+      }
       startRefresh();
     }
   });
@@ -192,7 +189,7 @@ app.controller('timelion', function (
       $scope.sheet = [];
       $scope.running = false;
 
-      var err = new Error(resp.message);
+      const err = new Error(resp.message);
       err.stack = resp.stack;
       notify.error(err);
 
@@ -212,14 +209,14 @@ app.controller('timelion', function (
       if (id) {
         notify.info('Saved sheet as "' + savedSheet.title + '"');
         if (savedSheet.id !== $routeParams.id) {
-          kbnUrl.change('/{{id}}', {id: savedSheet.id});
+          kbnUrl.change('/{{id}}', { id: savedSheet.id });
         }
       }
     });
-  };
+  }
 
   function saveExpression(title) {
-    savedVisualizations.get({type: 'timelion'}).then(function (savedExpression) {
+    savedVisualizations.get({ type: 'timelion' }).then(function (savedExpression) {
       savedExpression.id = title;
       savedExpression.visState.params = {
         expression: $scope.state.sheet[$scope.state.selected],
@@ -231,7 +228,7 @@ app.controller('timelion', function (
         if (id) notify.info('Saved expression as "' + savedExpression.title + '"');
       });
     });
-  };
+  }
 
   function dismissNotifications() {
     unsafeNotifications.splice(0, unsafeNotifications.length);
diff --git a/src/core_plugins/timelion/public/directives/cells/cells.js b/src/core_plugins/timelion/public/directives/cells/cells.js
index fb23e3f9aad64..3cc823cf01d6c 100644
--- a/src/core_plugins/timelion/public/directives/cells/cells.js
+++ b/src/core_plugins/timelion/public/directives/cells/cells.js
@@ -1,12 +1,11 @@
-var _ = require('lodash');
-var $ = require('jquery');
+import _ from 'lodash';
 
 require('angularSortableView');
 require('plugins/timelion/directives/chart/chart');
 require('plugins/timelion/directives/timelion_grid');
 
-var app = require('ui/modules').get('apps/timelion', ['angular-sortable-view']);
-var html = require('./cells.html');
+const app = require('ui/modules').get('apps/timelion', ['angular-sortable-view']);
+import html from './cells.html';
 
 app.directive('timelionCells', function () {
   return {
@@ -19,7 +18,7 @@ app.directive('timelionCells', function () {
       onSelect: '=',
     },
     template: html,
-    link: function ($scope, $elem) {
+    link: function ($scope) {
 
       $scope.removeCell = function (index) {
         _.pullAt($scope.state.sheet, index);
diff --git a/src/core_plugins/timelion/public/directives/chart/chart.js b/src/core_plugins/timelion/public/directives/chart/chart.js
index 5e88240053d54..6f122c3ef44a9 100644
--- a/src/core_plugins/timelion/public/directives/chart/chart.js
+++ b/src/core_plugins/timelion/public/directives/chart/chart.js
@@ -1,4 +1,4 @@
-var panelRegistryProvider = require('plugins/timelion/lib/panel_registry');
+import panelRegistryProvider from 'plugins/timelion/lib/panel_registry';
 
 require('ui/modules')
 .get('apps/timelion', [])
@@ -12,8 +12,8 @@ require('ui/modules')
     },
     link: function ($scope, $elem) {
 
-      var panelRegistry = Private(panelRegistryProvider);
-      var panelScope = $scope.$new(true);
+      const panelRegistry = Private(panelRegistryProvider);
+      let panelScope = $scope.$new(true);
 
       function render(seriesList) {
         panelScope.$destroy();
@@ -24,7 +24,7 @@ require('ui/modules')
           type: 'timechart'
         };
 
-        var panelSchema = panelRegistry.byName[seriesList.render.type];
+        const panelSchema = panelRegistry.byName[seriesList.render.type];
 
         if (!panelSchema) {
           $elem.text('No such panel type: ' + seriesList.render.type);
diff --git a/src/core_plugins/timelion/public/directives/docs.js b/src/core_plugins/timelion/public/directives/docs.js
index 40d938adedd48..d24e18cc6bd48 100644
--- a/src/core_plugins/timelion/public/directives/docs.js
+++ b/src/core_plugins/timelion/public/directives/docs.js
@@ -1,70 +1,67 @@
-define(function (require) {
-  var html = require('../partials/docs/tutorial.html');
-  var app = require('ui/modules').get('apps/timelion', []);
-  var _ = require('lodash');
-  var moment = require('moment');
+import html from '../partials/docs/tutorial.html';
+const app = require('ui/modules').get('apps/timelion', []);
+import _ from 'lodash';
+import moment from 'moment';
 
-  app.directive('timelionDocs', function (config, $http) {
-    return {
-      restrict: 'E',
-      template: html,
-      controller: function ($scope, config) {
-        $scope.section = config.get('timelion:showTutorial', true) ? 'tutorial' : 'functions';
-        $scope.page = 1;
-        $scope.functions = {
-          list: [],
-          details: null
-        };
+app.directive('timelionDocs', function (config, $http) {
+  return {
+    restrict: 'E',
+    template: html,
+    controller: function ($scope, config) {
+      $scope.section = config.get('timelion:showTutorial', true) ? 'tutorial' : 'functions';
+      $scope.page = 1;
+      $scope.functions = {
+        list: [],
+        details: null
+      };
 
-        function init() {
-          $scope.es = {
-            invalidCount: 0
-          };
-          getFunctions();
-          checkElasticsearch();
+      function init() {
+        $scope.es = {
+          invalidCount: 0
         };
+        getFunctions();
+        checkElasticsearch();
+      }
 
-        function getFunctions() {
-          return $http.get('../api/timelion/functions').then(function (resp) {
-            $scope.functions.list = resp.data;
-          });
-        }
-        $scope.recheckElasticsearch = function () {
-          $scope.es.valid = null;
-          checkElasticsearch().then(function (valid) {
-            if (!valid) $scope.es.invalidCount++;
-          });
-        };
+      function getFunctions() {
+        return $http.get('../api/timelion/functions').then(function (resp) {
+          $scope.functions.list = resp.data;
+        });
+      }
+      $scope.recheckElasticsearch = function () {
+        $scope.es.valid = null;
+        checkElasticsearch().then(function (valid) {
+          if (!valid) $scope.es.invalidCount++;
+        });
+      };
 
-        function checkElasticsearch() {
-          return $http.get('../api/timelion/validate/es').then(function (resp) {
-            if (resp.data.ok) {
+      function checkElasticsearch() {
+        return $http.get('../api/timelion/validate/es').then(function (resp) {
+          if (resp.data.ok) {
 
-              $scope.es.valid = true;
-              $scope.es.stats = {
-                min: moment(resp.data.min).format('LLL'),
-                max: moment(resp.data.max).format('LLL'),
-                field: resp.data.field
-              };
-            } else {
-              $scope.es.valid = false;
-              $scope.es.invalidReason = (function () {
-                try {
-                  var esResp = JSON.parse(resp.data.resp.response);
-                  return _.get(esResp, 'error.root_cause[0].reason');
-                } catch (e) {
-                  if (_.get(resp, 'data.resp.message')) return _.get(resp, 'data.resp.message');
-                  if (_.get(resp, 'data.resp.output.payload.message')) return _.get(resp, 'data.resp.output.payload.message');
-                  return 'Unknown error';
-                }
-              }());
-            }
-            return $scope.es.valid;
-          });
-        };
-        init();
+            $scope.es.valid = true;
+            $scope.es.stats = {
+              min: moment(resp.data.min).format('LLL'),
+              max: moment(resp.data.max).format('LLL'),
+              field: resp.data.field
+            };
+          } else {
+            $scope.es.valid = false;
+            $scope.es.invalidReason = (function () {
+              try {
+                const esResp = JSON.parse(resp.data.resp.response);
+                return _.get(esResp, 'error.root_cause[0].reason');
+              } catch (e) {
+                if (_.get(resp, 'data.resp.message')) return _.get(resp, 'data.resp.message');
+                if (_.get(resp, 'data.resp.output.payload.message')) return _.get(resp, 'data.resp.output.payload.message');
+                return 'Unknown error';
+              }
+            }());
+          }
+          return $scope.es.valid;
+        });
       }
-    };
-  });
-
+      init();
+    }
+  };
 });
diff --git a/src/core_plugins/timelion/public/directives/expression_directive.js b/src/core_plugins/timelion/public/directives/expression_directive.js
index 53a42db1c9254..9d90b36b5cc6b 100644
--- a/src/core_plugins/timelion/public/directives/expression_directive.js
+++ b/src/core_plugins/timelion/public/directives/expression_directive.js
@@ -1,11 +1,11 @@
-var _ = require('lodash');
-var $ = require('jquery');
-var grammar = require('raw!../chain.peg');
-var PEG = require('pegjs');
-var Parser = PEG.buildParser(grammar);
-var template =  require('./partials/suggestion.html');
+import _ from 'lodash';
+import $ from 'jquery';
+import grammar from 'raw!../chain.peg';
+import PEG from 'pegjs';
+const Parser = PEG.buildParser(grammar);
+import template from './partials/suggestion.html';
 
-var app = require('ui/modules').get('apps/timelion', []);
+const app = require('ui/modules').get('apps/timelion', []);
 
 /*
 Autocomplete proposal, this file doesn't actually work like this
@@ -34,13 +34,13 @@ Must be inside a function, and start must be adjacent to the argument name
 
 */
 
-app.directive('timelionExpression', function ($compile, $http, $timeout, $rootScope, config) {
+app.directive('timelionExpression', function ($compile, $http, $timeout, $rootScope) {
   return {
     restrict: 'A',
     require: 'ngModel',
     link: function ($scope, $elem, $attrs, ngModelCtrl) {
 
-      var keys = {
+      const keys = {
         ESC: 27,
         UP: 38,
         DOWN: 40,
@@ -48,7 +48,7 @@ app.directive('timelionExpression', function ($compile, $http, $timeout, $rootSc
         ENTER: 13
       };
 
-      var functionReference = {};
+      const functionReference = {};
 
       function init() {
         resetSuggestions();
@@ -81,7 +81,7 @@ app.directive('timelionExpression', function ($compile, $http, $timeout, $rootSc
       function suggest(val) {
         try {
           // Inside an existing function providing suggestion only as a reference. Maybe suggest an argument?
-          var possible = findFunction(getCaretPos(), Parser.parse(val).functions);
+          const possible = findFunction(getCaretPos(), Parser.parse(val).functions);
           // TODO: Reference suggestors. Only supporting completion right now;
           resetSuggestions();
           return;
@@ -124,20 +124,20 @@ app.directive('timelionExpression', function ($compile, $http, $timeout, $rootSc
       }
 
       function validateSelection() {
-        var maxSelection = $scope.suggestions.list.length - 1;
+        const maxSelection = $scope.suggestions.list.length - 1;
         if ($scope.suggestions.selected > maxSelection) $scope.suggestions.selected = maxSelection;
         else if ($scope.suggestions.selected < 0) $scope.suggestions.selected = 0;
       }
 
       $scope.completeExpression = function (selected) {
         if (!$scope.suggestions.list.length) return;
-        var expression = $attrs.timelionExpression;
-        var startOf = expression.slice(0, $scope.suggestions.location.min);
-        var endOf =  expression.slice($scope.suggestions.location.max, expression.length);
+        const expression = $attrs.timelionExpression;
+        const startOf = expression.slice(0, $scope.suggestions.location.min);
+        const endOf =  expression.slice($scope.suggestions.location.max, expression.length);
 
-        var completeFunction = $scope.suggestions.list[selected].name + '()';
+        const completeFunction = $scope.suggestions.list[selected].name + '()';
 
-        var newVal = startOf + completeFunction + endOf;
+        const newVal = startOf + completeFunction + endOf;
 
         $elem.val(newVal);
         $elem[0].selectionStart = $elem[0].selectionEnd =
@@ -195,8 +195,8 @@ app.directive('timelionExpression', function ($compile, $http, $timeout, $rootSc
 
       function scrollTo(suggestions) {
         validateSelection();
-        var suggestionsListElem = $('.suggestions');
-        var suggestedElem = $($('.suggestion')[suggestions.selected]);
+        const suggestionsListElem = $('.suggestions');
+        const suggestedElem = $($('.suggestion')[suggestions.selected]);
 
         if (!suggestedElem.position() || !suggestedElem.position().top) return;
 
@@ -204,7 +204,7 @@ app.directive('timelionExpression', function ($compile, $http, $timeout, $rootSc
       }
 
       function findFunction(position, functionList) {
-        var bestFunction;
+        let bestFunction;
 
         _.each(functionList, function (func) {
           if ((func.location.min) < position && position < (func.location.max)) {
@@ -215,11 +215,11 @@ app.directive('timelionExpression', function ($compile, $http, $timeout, $rootSc
         });
 
         return bestFunction;
-      };
+      }
 
       function getCaretPos() {
         return $elem[0].selectionStart;
-      };
+      }
 
       function digest() {
         $rootScope.$$phase || $scope.$digest();
diff --git a/src/core_plugins/timelion/public/directives/fixed_element.js b/src/core_plugins/timelion/public/directives/fixed_element.js
index 1efa8bce6de29..317ef580b0ccb 100644
--- a/src/core_plugins/timelion/public/directives/fixed_element.js
+++ b/src/core_plugins/timelion/public/directives/fixed_element.js
@@ -1,23 +1,22 @@
-var _ = require('lodash');
-var $ = require('jquery');
+import $ from 'jquery';
 
-var app = require('ui/modules').get('apps/timelion', []);
-app.directive('fixedElementRoot', function ($timeout) {
+const app = require('ui/modules').get('apps/timelion', []);
+app.directive('fixedElementRoot', function () {
   return {
     restrict: 'A',
-    link: function ($scope, $elem, attrs) {
-      var fixedAt;
+    link: function ($scope, $elem) {
+      let fixedAt;
       $(window).bind('scroll', function () {
-        var fixed = $('[fixed-element]', $elem);
-        var body = $('[fixed-element-body]', $elem);
-        var top = fixed.offset().top;
+        const fixed = $('[fixed-element]', $elem);
+        const body = $('[fixed-element-body]', $elem);
+        const top = fixed.offset().top;
 
         if ($(window).scrollTop() > top) {
           // This is a gross hack, but its better than it was. I guess
           fixedAt = $(window).scrollTop();
           fixed.addClass(fixed.attr('fixed-element'));
           body.addClass(fixed.attr('fixed-element-body'));
-          body.css({top: fixed.height()});
+          body.css({ top: fixed.height() });
         }
 
         if ($(window).scrollTop() < fixedAt) {
diff --git a/src/core_plugins/timelion/public/directives/fullscreen/fullscreen.js b/src/core_plugins/timelion/public/directives/fullscreen/fullscreen.js
index a2353c27c3bc0..90b00362c5c08 100644
--- a/src/core_plugins/timelion/public/directives/fullscreen/fullscreen.js
+++ b/src/core_plugins/timelion/public/directives/fullscreen/fullscreen.js
@@ -1,12 +1,9 @@
-var _ = require('lodash');
-var $ = require('jquery');
-
 require('angularSortableView');
 require('plugins/timelion/directives/chart/chart');
 require('plugins/timelion/directives/timelion_grid');
 
-var app = require('ui/modules').get('apps/timelion', ['angular-sortable-view']);
-var html = require('./fullscreen.html');
+const app = require('ui/modules').get('apps/timelion', ['angular-sortable-view']);
+import html from './fullscreen.html';
 
 app.directive('timelionFullscreen', function () {
   return {
diff --git a/src/core_plugins/timelion/public/directives/interval/interval.js b/src/core_plugins/timelion/public/directives/interval/interval.js
index f0266eb601d8f..8787192a61aee 100644
--- a/src/core_plugins/timelion/public/directives/interval/interval.js
+++ b/src/core_plugins/timelion/public/directives/interval/interval.js
@@ -1,11 +1,10 @@
-var _ = require('lodash');
-var $ = require('jquery');
-var moment = require('moment');
+import _ from 'lodash';
+import $ from 'jquery';
 
-var app = require('ui/modules').get('apps/timelion', []);
-var html = require('./interval.html');
+const app = require('ui/modules').get('apps/timelion', []);
+import html from './interval.html';
 
-app.directive('timelionInterval', function ($compile, $timeout, timefilter) {
+app.directive('timelionInterval', function ($compile, $timeout) {
   return {
     restrict: 'E',
     scope: {
diff --git a/src/core_plugins/timelion/public/directives/refresh_hack.js b/src/core_plugins/timelion/public/directives/refresh_hack.js
index 131f00a26205e..1922135bdd3ff 100644
--- a/src/core_plugins/timelion/public/directives/refresh_hack.js
+++ b/src/core_plugins/timelion/public/directives/refresh_hack.js
@@ -1,9 +1,8 @@
-var _ = require('lodash');
-var $ = require('jquery');
+import $ from 'jquery';
 
-var app = require('ui/modules').get('apps/timelion', []);
+const app = require('ui/modules').get('apps/timelion', []);
 
-app.directive('refreshHack', function ($rootScope) {
+app.directive('refreshHack', function () {
   return {
     restrict: 'A',
     link: function ($scope) {
diff --git a/src/core_plugins/timelion/public/directives/timelion_grid.js b/src/core_plugins/timelion/public/directives/timelion_grid.js
index 5b4da83962324..29bb5cab6e9ed 100644
--- a/src/core_plugins/timelion/public/directives/timelion_grid.js
+++ b/src/core_plugins/timelion/public/directives/timelion_grid.js
@@ -1,15 +1,14 @@
-var _ = require('lodash');
-var $ = require('jquery');
+import $ from 'jquery';
 
-var app = require('ui/modules').get('apps/timelion', []);
-app.directive('timelionGrid', function ($compile) {
+const app = require('ui/modules').get('apps/timelion', []);
+app.directive('timelionGrid', function () {
   return {
     restrict: 'A',
     scope: {
       timelionGridRows: '=',
       timelionGridColumns: '='
     },
-    link: function ($scope, $elem, attrs) {
+    link: function ($scope, $elem) {
 
       function init() {
         setDimensions();
@@ -28,9 +27,9 @@ app.directive('timelionGrid', function ($compile) {
       });
 
       function setDimensions() {
-        var borderSize = 2;
-        var headerSize = 45 + 35 + 28 + (20 * 2); // chrome + subnav + buttons + (container padding)
-        var verticalPadding = 10;
+        const borderSize = 2;
+        const headerSize = 45 + 35 + 28 + (20 * 2); // chrome + subnav + buttons + (container padding)
+        const verticalPadding = 10;
 
         if ($scope.timelionGridColumns != null) {
           $elem.width($elem.parent().width() / $scope.timelionGridColumns - (borderSize * 2));
diff --git a/src/core_plugins/timelion/public/lib/calculate_interval.js b/src/core_plugins/timelion/public/lib/calculate_interval.js
index 00aa9000caaea..bd43ec6780a7f 100644
--- a/src/core_plugins/timelion/public/lib/calculate_interval.js
+++ b/src/core_plugins/timelion/public/lib/calculate_interval.js
@@ -40,4 +40,4 @@ function roundInterval(interval) {
     default:
       return '1y';
   }
-};
+}
diff --git a/src/core_plugins/timelion/public/lib/observe_resize.js b/src/core_plugins/timelion/public/lib/observe_resize.js
index 91c68f7cc7a05..9647631bc8ac2 100644
--- a/src/core_plugins/timelion/public/lib/observe_resize.js
+++ b/src/core_plugins/timelion/public/lib/observe_resize.js
@@ -1,10 +1,10 @@
 module.exports = function ($elem, fn, frequency) {
 
   frequency = frequency || 500;
-  var currentHeight = $elem.height();
-  var currentWidth = $elem.width();
+  let currentHeight = $elem.height();
+  let currentWidth = $elem.width();
 
-  var timeout;
+  let timeout;
 
   function checkLoop() {
     timeout = setTimeout(function () {
diff --git a/src/core_plugins/timelion/public/panels/timechart/schema.js b/src/core_plugins/timelion/public/panels/timechart/schema.js
index b3c742321ddcb..58ef67b8d8c57 100644
--- a/src/core_plugins/timelion/public/panels/timechart/schema.js
+++ b/src/core_plugins/timelion/public/panels/timechart/schema.js
@@ -1,33 +1,33 @@
 require('./flot');
 require('plugins/timelion/panels/timechart/timechart.less');
-var _ = require('lodash');
-var $ = require('jquery');
-var moment = require('moment-timezone');
-var observeResize = require('plugins/timelion/lib/observe_resize');
-var calculateInterval = require('plugins/timelion/lib/calculate_interval');
+import _ from 'lodash';
+import $ from 'jquery';
+import moment from 'moment-timezone';
+import observeResize from 'plugins/timelion/lib/observe_resize';
+import calculateInterval from 'plugins/timelion/lib/calculate_interval';
 
 module.exports = function timechartFn(Private, config, $rootScope, timefilter, $compile) {
   return function () {
     return {
       help: 'Draw a timeseries chart',
       render: function ($scope, $elem) {
-        var template = '<div class="chart-top-title"></div><div class="chart-canvas"></div>';
-        var timezone = Private(require('plugins/timelion/services/timezone'))();
-        var getxAxisFormatter = Private(require('plugins/timelion/panels/timechart/xaxis_formatter'));
+        const template = '<div class="chart-top-title"></div><div class="chart-canvas"></div>';
+        Private(require('plugins/timelion/services/timezone'))();
+        const getxAxisFormatter = Private(require('plugins/timelion/panels/timechart/xaxis_formatter'));
 
         // TODO: I wonder if we should supply our own moment that sets this every time?
         // could just use angular's injection to provide a moment service?
         moment.tz.setDefault(config.get('dateFormat:tz'));
 
-        var render = $scope.seriesList.render || {};
+        const render = $scope.seriesList.render || {};
 
         $scope.chart = $scope.seriesList.list;
         $scope.interval = $scope.interval;
         $scope.search = $scope.search || _.noop;
 
-        var legendValueNumbers;
-        var debouncedSetLegendNumbers;
-        var defaultOptions = {
+        let legendValueNumbers;
+        let debouncedSetLegendNumbers; // eslint-disable-line prefer-const
+        const defaultOptions = {
           xaxis: {
             mode: 'time',
             tickLength: 5,
@@ -65,12 +65,12 @@ module.exports = function timechartFn(Private, config, $rootScope, timefilter, $
 
 
         $scope.toggleSeries = function (id) {
-          var series = $scope.chart[id];
+          const series = $scope.chart[id];
           series._hide = !series._hide;
           drawPlot($scope.chart);
         };
 
-        var cancelResize = observeResize($elem, function () {
+        const cancelResize = observeResize($elem, function () {
           drawPlot($scope.chart);
         });
 
@@ -96,19 +96,19 @@ module.exports = function timechartFn(Private, config, $rootScope, timefilter, $
           $rootScope.$broadcast('timelionPlotLeave');
         });
 
-        $scope.$on('timelionPlotHover', function (angularEvent, flotEvent, pos, time) {
+        $scope.$on('timelionPlotHover', function (angularEvent, flotEvent, pos) {
           if (!$scope.plot) return;
           $scope.plot.setCrosshair(pos);
           debouncedSetLegendNumbers(pos);
         });
 
-        $scope.$on('timelionPlotLeave', function (angularEvent, flotEvent, pos, time) {
+        $scope.$on('timelionPlotLeave', function () {
           if (!$scope.plot) return;
           $scope.plot.clearCrosshair();
           clearLegendNumbers();
         });
 
-        var debounceDelay = 50;
+        const debounceDelay = 50;
         debouncedSetLegendNumbers = _.debounce(setLegendNumbers, debounceDelay, {
           maxWait: debounceDelay,
           leading: true,
@@ -117,20 +117,20 @@ module.exports = function timechartFn(Private, config, $rootScope, timefilter, $
 
         // Shamelessly borrowed from the flotCrosshairs example
         function setLegendNumbers(pos) {
-          var plot = $scope.plot;
+          const plot = $scope.plot;
 
-          var axes = plot.getAxes();
+          const axes = plot.getAxes();
           if (pos.x < axes.xaxis.min || pos.x > axes.xaxis.max) {
             return;
           }
 
-          var i;
-          var j;
-          var dataset = plot.getData();
+          let i;
+          let j;
+          const dataset = plot.getData();
           for (i = 0; i < dataset.length; ++i) {
 
-            var series = dataset[i];
-            var precision = _.get(series, '_meta.precision', 2);
+            const series = dataset[i];
+            const precision = _.get(series, '_meta.precision', 2);
 
             if (series._hide) continue;
 
@@ -139,7 +139,7 @@ module.exports = function timechartFn(Private, config, $rootScope, timefilter, $
               if (series.data[j][0] > pos.x) break;
             }
 
-            var y;
+            let y;
             try {
               y = series.data[j][1];
             } catch (e) {
@@ -160,7 +160,7 @@ module.exports = function timechartFn(Private, config, $rootScope, timefilter, $
           });
         }
 
-        var legendScope = $scope.$new();
+        let legendScope = $scope.$new();
         function drawPlot(plotConfig) {
 
           if (!plotConfig || !plotConfig.length) {
@@ -169,22 +169,22 @@ module.exports = function timechartFn(Private, config, $rootScope, timefilter, $
           }
 
           if (!$('.chart-canvas', $elem).length) $elem.html(template);
-          var canvasElem = $('.chart-canvas', $elem);
+          const canvasElem = $('.chart-canvas', $elem);
 
-          var title = _(plotConfig).map('_title').compact().last();
+          const title = _(plotConfig).map('_title').compact().last();
           $('.chart-top-title', $elem).text(title == null ? '' : title);
 
-          var options = _.cloneDeep(defaultOptions);
+          const options = _.cloneDeep(defaultOptions);
 
           // Get the X-axis tick format
-          var time = timefilter.getBounds();
-          var interval = calculateInterval(
+          const time = timefilter.getBounds();
+          const interval = calculateInterval(
             time.min.valueOf(),
             time.max.valueOf(),
             config.get('timelion:target_buckets') || 200,
             $scope.interval
           );
-          var format = getxAxisFormatter(interval);
+          const format = getxAxisFormatter(interval);
 
           // Use moment to format ticks so we get timezone correction
           options.xaxis.tickFormatter = function (val) {
@@ -192,11 +192,11 @@ module.exports = function timechartFn(Private, config, $rootScope, timefilter, $
           };
 
           // Calculate how many ticks can fit on the axis
-          var tickLetterWidth = 7;
-          var tickPadding = 45;
+          const tickLetterWidth = 7;
+          const tickPadding = 45;
           options.xaxis.ticks = Math.floor($elem.width() / ((format.length * tickLetterWidth) + tickPadding));
 
-          var series = _.map(plotConfig, function (series, index) {
+          const series = _.map(plotConfig, function (series, index) {
             series = _.cloneDeep(_.defaults(series, {
               shadowSize: 0,
               lines: {
diff --git a/src/core_plugins/timelion/public/panels/timechart/timechart.js b/src/core_plugins/timelion/public/panels/timechart/timechart.js
index a7c91cdd61627..87b6ec6bf5aa7 100644
--- a/src/core_plugins/timelion/public/panels/timechart/timechart.js
+++ b/src/core_plugins/timelion/public/panels/timechart/timechart.js
@@ -1,5 +1,5 @@
-var Panel = require('plugins/timelion/panels/panel');
-var panelRegistry = require('plugins/timelion/lib/panel_registry');
+import Panel from 'plugins/timelion/panels/panel';
+import panelRegistry from 'plugins/timelion/lib/panel_registry';
 
 panelRegistry.register(function timeChartProvider(Private) {
   // Schema is broken out so that it may be extended for use in other plugins
diff --git a/src/core_plugins/timelion/public/panels/timechart/xaxis_formatter.js b/src/core_plugins/timelion/public/panels/timechart/xaxis_formatter.js
index 8eb8f9d81f5e1..cbb41b21d87ab 100644
--- a/src/core_plugins/timelion/public/panels/timechart/xaxis_formatter.js
+++ b/src/core_plugins/timelion/public/panels/timechart/xaxis_formatter.js
@@ -1,25 +1,25 @@
-var moment = require('moment');
+import moment from 'moment';
 
-module.exports = function xaxisFormatterProvider(config, timefilter) {
+module.exports = function xaxisFormatterProvider(config) {
 
   function getFormat(esInterval) {
-    var parts = esInterval.match(/(\d+)(ms|s|m|h|d|w|M|y|)/);
+    const parts = esInterval.match(/(\d+)(ms|s|m|h|d|w|M|y|)/);
     if (parts == null || parts[1] == null || parts[2] == null) throw new Error ('Unknown interval');
 
-    var interval = moment.duration(Number(parts[1]), parts[2]);
+    const interval = moment.duration(Number(parts[1]), parts[2]);
 
     // Cribbed from Kibana's TimeBuckets class
-    let rules = config.get('dateFormat:scaled');
+    const rules = config.get('dateFormat:scaled');
 
     for (let i = rules.length - 1; i >= 0; i--) {
-      let rule = rules[i];
+      const rule = rules[i];
       if (!rule[0] || interval >= moment.duration(rule[0])) {
         return rule[1];
       }
     }
 
     return config.get('dateFormat');
-  };
+  }
 
   return function (esInterval) {
     return getFormat(esInterval);
diff --git a/src/core_plugins/timelion/public/services/_saved_sheet.js b/src/core_plugins/timelion/public/services/_saved_sheet.js
index bdede15570705..60251de9450d4 100644
--- a/src/core_plugins/timelion/public/services/_saved_sheet.js
+++ b/src/core_plugins/timelion/public/services/_saved_sheet.js
@@ -1,6 +1,5 @@
 import uiModules from 'ui/modules';
 import _ from 'lodash';
-import moment from 'moment';
 const module = uiModules.get('app/timelion');
 
 // Used only by the savedSheets service, usually no reason to change this
diff --git a/src/core_plugins/timelion/public/services/dashboard_context.js b/src/core_plugins/timelion/public/services/dashboard_context.js
index 8c6c49f218d9c..48182ae3a1de6 100644
--- a/src/core_plugins/timelion/public/services/dashboard_context.js
+++ b/src/core_plugins/timelion/public/services/dashboard_context.js
@@ -1,20 +1,20 @@
-var _ = require('lodash');
+import _ from 'lodash';
 require('ui/state_management/app_state');
 
 
 module.exports = function dashboardContext(Private, getAppState) {
   return function () {
-    var queryFilter = Private(require('ui/filter_bar/query_filter'));
-    var bool = {must: [], must_not: []};
-    var filterBarFilters = queryFilter.getFilters();
-    var queryBarFilter = getAppState().query;
+    const queryFilter = Private(require('ui/filter_bar/query_filter'));
+    const bool = { must: [], must_not: [] };
+    const filterBarFilters = queryFilter.getFilters();
+    const queryBarFilter = getAppState().query;
 
     // Add the query bar filter, its handled differently.
     bool.must.push(queryBarFilter);
 
     // Add each of the filter bar filters
     _.each(filterBarFilters, function (filter) {
-      var esFilter = _.omit(filter, function (val, key) {
+      const esFilter = _.omit(filter, function (val, key) {
         if (key === 'meta' || key[0] === '$') return true;
         return false;
       });
@@ -27,6 +27,6 @@ module.exports = function dashboardContext(Private, getAppState) {
       }
     });
 
-    return {bool: bool};
+    return { bool: bool };
   };
 };
diff --git a/src/core_plugins/timelion/public/services/saved_sheet_register.js b/src/core_plugins/timelion/public/services/saved_sheet_register.js
index 4716d0134f664..5a08b4c19c160 100644
--- a/src/core_plugins/timelion/public/services/saved_sheet_register.js
+++ b/src/core_plugins/timelion/public/services/saved_sheet_register.js
@@ -1,5 +1,3 @@
-define(function (require) {
-  return function savedSearchObjectFn(savedSheets) {
-    return savedSheets;
-  };
-});
+export default function savedSearchObjectFn(savedSheets) {
+  return savedSheets;
+}
diff --git a/src/core_plugins/timelion/public/services/saved_sheets.js b/src/core_plugins/timelion/public/services/saved_sheets.js
index 53f6e0616ed3a..f0e27858d063c 100644
--- a/src/core_plugins/timelion/public/services/saved_sheets.js
+++ b/src/core_plugins/timelion/public/services/saved_sheets.js
@@ -1,79 +1,77 @@
-define(function (require) {
-  var module = require('ui/modules').get('app/sheet');
-  var _ = require('lodash');
-  // bring in the factory
-  require('./_saved_sheet.js');
+const module = require('ui/modules').get('app/sheet');
+import _ from 'lodash';
+// bring in the factory
+require('./_saved_sheet.js');
 
 
-  // Register this service with the saved object registry so it can be
-  // edited by the object editor.
-  require('plugins/kibana/management/saved_object_registry').register({
-    service: 'savedSheets',
-    title: 'sheets'
-  });
+// Register this service with the saved object registry so it can be
+// edited by the object editor.
+require('plugins/kibana/management/saved_object_registry').register({
+  service: 'savedSheets',
+  title: 'sheets'
+});
 
-  // This is the only thing that gets injected into controllers
-  module.service('savedSheets', function (Promise, SavedSheet, kbnIndex, es, kbnUrl) {
-    this.type = SavedSheet.type;
-    this.Class = SavedSheet;
+// This is the only thing that gets injected into controllers
+module.service('savedSheets', function (Promise, SavedSheet, kbnIndex, es, kbnUrl) {
+  this.type = SavedSheet.type;
+  this.Class = SavedSheet;
 
-    this.loaderProperties = {
-      name: 'timelion-sheet',
-      noun: 'Saved Sheets',
-      nouns: 'saved sheets'
-    };
+  this.loaderProperties = {
+    name: 'timelion-sheet',
+    noun: 'Saved Sheets',
+    nouns: 'saved sheets'
+  };
 
-    // Returns a single sheet by ID, should be the name of the sheet
-    this.get = function (id) {
-      // Returns a promise that contains a sheet which is a subclass of docSource
-      return (new SavedSheet(id)).init();
-    };
+  // Returns a single sheet by ID, should be the name of the sheet
+  this.get = function (id) {
+    // Returns a promise that contains a sheet which is a subclass of docSource
+    return (new SavedSheet(id)).init();
+  };
 
-    this.urlFor = function (id) {
-      return kbnUrl.eval('#/{{id}}', {id: id});
-    };
+  this.urlFor = function (id) {
+    return kbnUrl.eval('#/{{id}}', { id: id });
+  };
 
-    this.delete = function (ids) {
-      ids = !_.isArray(ids) ? [ids] : ids;
-      return Promise.map(ids, function (id) {
-        return (new SavedSheet(id)).delete();
-      });
-    };
+  this.delete = function (ids) {
+    ids = !_.isArray(ids) ? [ids] : ids;
+    return Promise.map(ids, function (id) {
+      return (new SavedSheet(id)).delete();
+    });
+  };
 
-    this.find = function (searchString) {
-      var self = this;
-      var body;
-      if (searchString) {
-        body = {
-          query: {
-            simple_query_string: {
-              query: searchString + '*',
-              fields: ['title^3', 'description'],
-              default_operator: 'AND'
-            }
+  this.find = function (searchString) {
+    const self = this;
+    let body;
+    if (searchString) {
+      body = {
+        query: {
+          simple_query_string: {
+            query: searchString + '*',
+            fields: ['title^3', 'description'],
+            default_operator: 'AND'
           }
-        };
-      } else {
-        body = { query: {match_all: {}}};
-      }
+        }
+      };
+    } else {
+      body = { query: { match_all: {} } };
+    }
 
-      return es.search({
-        index: kbnIndex,
-        type: 'timelion-sheet',
-        body: body,
-        size: 1000
-      })
-      .then(function (resp) {
-        return {
-          total: resp.hits.total,
-          hits: resp.hits.hits.map(function (hit) {
-            var source = hit._source;
-            source.id = hit._id;
-            source.url = self.urlFor(hit._id);
-            return source;
-          })
-        };
-      });
-    };
-  });
+    return es.search({
+      index: kbnIndex,
+      type: 'timelion-sheet',
+      body: body,
+      size: 1000
+    })
+    .then(function (resp) {
+      return {
+        total: resp.hits.total,
+        hits: resp.hits.hits.map(function (hit) {
+          const source = hit._source;
+          source.id = hit._id;
+          source.url = self.urlFor(hit._id);
+          return source;
+        })
+      };
+    });
+  };
 });
diff --git a/src/core_plugins/timelion/public/services/timezone.js b/src/core_plugins/timelion/public/services/timezone.js
index c7ee537635ec3..b1936f6c660e6 100644
--- a/src/core_plugins/timelion/public/services/timezone.js
+++ b/src/core_plugins/timelion/public/services/timezone.js
@@ -1,7 +1,7 @@
 const tzDetect = require('jstimezonedetect').jstz;
-const moment = require('moment');
+import moment from 'moment';
 
-module.exports = function timezoneFn(config, Private) {
+module.exports = function timezoneFn(config) {
   return function () {
 
     if (config.isDefault('dateFormat:tz')) {
diff --git a/src/core_plugins/timelion/public/vis/index.js b/src/core_plugins/timelion/public/vis/index.js
index d12475656fef0..e5243a8ec4336 100644
--- a/src/core_plugins/timelion/public/vis/index.js
+++ b/src/core_plugins/timelion/public/vis/index.js
@@ -1,33 +1,30 @@
-define(function (require) {
-  // we also need to load the controller and used by the template
-  require('plugins/timelion/vis/timelion_vis_controller');
-  require('plugins/timelion/vis/timelion_vis_params_controller');
+// we also need to load the controller and used by the template
+require('plugins/timelion/vis/timelion_vis_controller');
+require('plugins/timelion/vis/timelion_vis_params_controller');
 
-  // Stylin
-  require('plugins/timelion/vis/timelion_vis.less');
+// Stylin
+require('plugins/timelion/vis/timelion_vis.less');
 
-  // register the provider with the visTypes registry so that other know it exists
-  require('ui/registry/vis_types').register(TimelionVisProvider);
+// register the provider with the visTypes registry so that other know it exists
+require('ui/registry/vis_types').register(TimelionVisProvider);
 
-  function TimelionVisProvider(Private) {
-    var TemplateVisType = Private(require('ui/template_vis_type'));
+function TimelionVisProvider(Private) {
+  const TemplateVisType = Private(require('ui/template_vis_type'));
 
-    // return the visType object, which kibana will use to display and configure new
-    // Vis object of this type.
-    return new TemplateVisType({
-      name: 'timelion',
-      title: 'Timeseries',
-      icon: 'fa-clock-o',
-      description: 'Create timeseries charts using the timelion expression language. ' +
-        'Perfect for computing and combining timeseries sets with functions such as derivatives and moving averages',
-      template: require('plugins/timelion/vis/timelion_vis.html'),
-      params: {
-        editor: require('plugins/timelion/vis/timelion_vis_params.html')
-      },
-      requiresSearch: false
-    });
-  }
+  // return the visType object, which kibana will use to display and configure new
+  // Vis object of this type.
+  return new TemplateVisType({
+    name: 'timelion',
+    title: 'Timeseries',
+    icon: 'fa-clock-o',
+    description: 'Create timeseries charts using the timelion expression language. ' +
+      'Perfect for computing and combining timeseries sets with functions such as derivatives and moving averages',
+    template: require('plugins/timelion/vis/timelion_vis.html'),
+    params: {
+      editor: require('plugins/timelion/vis/timelion_vis_params.html')
+    },
+    requiresSearch: false
+  });
+}
 
-  // export the provider so that the visType can be required with Private()
-  return TimelionVisProvider;
-});
+export default TimelionVisProvider;
diff --git a/src/core_plugins/timelion/public/vis/timelion_vis_controller.js b/src/core_plugins/timelion/public/vis/timelion_vis_controller.js
index 4de140da70c8f..ba9baa7261607 100644
--- a/src/core_plugins/timelion/public/vis/timelion_vis_controller.js
+++ b/src/core_plugins/timelion/public/vis/timelion_vis_controller.js
@@ -1,63 +1,61 @@
-define(function (require) {
-  require('plugins/timelion/directives/chart/chart');
-  require('plugins/timelion/directives/interval/interval');
-  require('plugins/timelion/directives/refresh_hack');
-  require('ui/state_management/app_state');
-
-  var _ = require('lodash');
-  var module = require('ui/modules').get('kibana/timelion_vis', ['kibana']);
-  module.controller('TimelionVisController', function ($scope, Private, Notifier, $http, $rootScope, timefilter, getAppState) {
-    var queryFilter = Private(require('ui/filter_bar/query_filter'));
-    var timezone = Private(require('plugins/timelion/services/timezone'))();
-    var dashboardContext = Private(require('plugins/timelion/services/dashboard_context'));
-
-    var notify = new Notifier({
-      location: 'Timelion'
+require('plugins/timelion/directives/chart/chart');
+require('plugins/timelion/directives/interval/interval');
+require('plugins/timelion/directives/refresh_hack');
+require('ui/state_management/app_state');
+
+import _ from 'lodash';
+const module = require('ui/modules').get('kibana/timelion_vis', ['kibana']);
+module.controller('TimelionVisController', function ($scope, Private, Notifier, $http, $rootScope, timefilter) {
+  const queryFilter = Private(require('ui/filter_bar/query_filter'));
+  const timezone = Private(require('plugins/timelion/services/timezone'))();
+  const dashboardContext = Private(require('plugins/timelion/services/dashboard_context'));
+
+  const notify = new Notifier({
+    location: 'Timelion'
+  });
+
+  $scope.search = function run() {
+    const expression = $scope.vis.params.expression;
+    if (!expression) return;
+
+    $http.post('../api/timelion/run', {
+      sheet: [expression],
+      extended: {
+        es: {
+          filter: dashboardContext()
+        }
+      },
+      time: _.extend(timefilter.time, {
+        interval: $scope.vis.params.interval,
+        timezone: timezone
+      }),
+    })
+    // data, status, headers, config
+    .success(function (resp) {
+      $scope.sheet = resp.sheet;
+    })
+    .error(function (resp) {
+      $scope.sheet = [];
+      const err = new Error(resp.message);
+      err.stack = resp.stack;
+      notify.error(err);
     });
+  };
 
-    $scope.search = function run() {
-      var expression = $scope.vis.params.expression;
-      if (!expression) return;
-
-      $http.post('../api/timelion/run', {
-        sheet: [expression],
-        extended: {
-          es: {
-            filter: dashboardContext()
-          }
-        },
-        time: _.extend(timefilter.time, {
-          interval: $scope.vis.params.interval,
-          timezone: timezone
-        }),
-      })
-      // data, status, headers, config
-      .success(function (resp) {
-        $scope.sheet = resp.sheet;
-      })
-      .error(function (resp) {
-        $scope.sheet = [];
-        var err = new Error(resp.message);
-        err.stack = resp.stack;
-        notify.error(err);
-      });
-    };
-
-    // This is bad, there should be a single event that triggers a refresh of data.
-
-    // When the expression updates
-    $scope.$watchMulti(['vis.params.expression', 'vis.params.interval'], $scope.search);
-
-    // When the time filter changes
-    $scope.$listen(timefilter, 'fetch', $scope.search);
-
-    // When a filter is added to the filter bar?
-    $scope.$listen(queryFilter, 'fetch', $scope.search);
-
-    // When auto refresh happens
-    $scope.$on('courier:searchRefresh', $scope.search);
-
-    $scope.$on('fetch', $scope.search);
+  // This is bad, there should be a single event that triggers a refresh of data.
+
+  // When the expression updates
+  $scope.$watchMulti(['vis.params.expression', 'vis.params.interval'], $scope.search);
+
+  // When the time filter changes
+  $scope.$listen(timefilter, 'fetch', $scope.search);
+
+  // When a filter is added to the filter bar?
+  $scope.$listen(queryFilter, 'fetch', $scope.search);
+
+  // When auto refresh happens
+  $scope.$on('courier:searchRefresh', $scope.search);
+
+  $scope.$on('fetch', $scope.search);
 
-  });
 });
diff --git a/src/core_plugins/timelion/public/vis/timelion_vis_params_controller.js b/src/core_plugins/timelion/public/vis/timelion_vis_params_controller.js
index 6cad50894d60a..f4c0a8eac225b 100644
--- a/src/core_plugins/timelion/public/vis/timelion_vis_params_controller.js
+++ b/src/core_plugins/timelion/public/vis/timelion_vis_params_controller.js
@@ -1,14 +1,12 @@
-define(function (require) {
-  require('plugins/timelion/directives/expression_directive');
+require('plugins/timelion/directives/expression_directive');
 
-  var module = require('ui/modules').get('kibana/timelion_vis', ['kibana']);
-  module.controller('TimelionVisParamsController', function ($scope, $rootScope) {
-    $scope.vis.params.expression = $scope.vis.params.expression || '.es(*)';
-    $scope.vis.params.interval = $scope.vis.params.interval || '1m';
+const module = require('ui/modules').get('kibana/timelion_vis', ['kibana']);
+module.controller('TimelionVisParamsController', function ($scope, $rootScope) {
+  $scope.vis.params.expression = $scope.vis.params.expression || '.es(*)';
+  $scope.vis.params.interval = $scope.vis.params.interval || '1m';
 
 
-    $scope.search = function () {
-      $rootScope.$broadcast('courier:searchRefresh');
-    };
-  });
+  $scope.search = function () {
+    $rootScope.$broadcast('courier:searchRefresh');
+  };
 });
diff --git a/src/core_plugins/timelion/server/fit_functions/__test__/average.js b/src/core_plugins/timelion/server/fit_functions/__test__/average.js
index 484b9cffbaba6..2875416574142 100644
--- a/src/core_plugins/timelion/server/fit_functions/__test__/average.js
+++ b/src/core_plugins/timelion/server/fit_functions/__test__/average.js
@@ -1,20 +1,20 @@
-var filename = require('path').basename(__filename);
-var fn = require(`../${filename}`);
-var moment = require('moment');
-var expect = require('chai').expect;
-var _ = require('lodash');
+const filename = require('path').basename(__filename);
+const fn = require(`../${filename}`);
+import moment from 'moment';
+const expect = require('chai').expect;
+import _ from 'lodash';
 
 describe(filename, function () {
 
   describe('average', function () {
     it('fills holes in the data', function () {
-      var data = [
+      const data = [
         [moment.utc('1980', 'YYYY').valueOf(), 10],
         [moment.utc('1983', 'YYYY').valueOf(), 40],
         [moment.utc('1984', 'YYYY').valueOf(), 50],
       ];
 
-      var target = [
+      const target = [
         [moment.utc('1980', 'YYYY').valueOf(), null],
         [moment.utc('1981', 'YYYY').valueOf(), null],
         [moment.utc('1982', 'YYYY').valueOf(), null],
@@ -27,13 +27,13 @@ describe(filename, function () {
 
     describe('sampling', function () {
       it('up', function () {
-        var data = [
+        const data = [
           [moment.utc('1981', 'YYYY').valueOf(), 10],
           [moment.utc('1983', 'YYYY').valueOf(), 30],
           [moment.utc('1985', 'YYYY').valueOf(), 70],
         ];
 
-        var target = [
+        const target = [
           [moment.utc('1981', 'YYYY').valueOf(), null],
           [moment.utc('1982', 'YYYY').valueOf(), null],
           [moment.utc('1983', 'YYYY').valueOf(), null],
@@ -46,7 +46,7 @@ describe(filename, function () {
 
 
       it('down', function () {
-        var data = [
+        const data = [
           [moment.utc('1980', 'YYYY').valueOf(), 0],
           [moment.utc('1981', 'YYYY').valueOf(), 2],
           [moment.utc('1982', 'YYYY').valueOf(), 4],
@@ -56,7 +56,7 @@ describe(filename, function () {
           [moment.utc('1986', 'YYYY').valueOf(), 12],
         ];
 
-        var target = [
+        const target = [
           [moment.utc('1981', 'YYYY').valueOf(), null],
           [moment.utc('1983', 'YYYY').valueOf(), null],
           [moment.utc('1985', 'YYYY').valueOf(), null],
diff --git a/src/core_plugins/timelion/server/fit_functions/__test__/carry.js b/src/core_plugins/timelion/server/fit_functions/__test__/carry.js
index f719643262e48..7cf06293efaf1 100644
--- a/src/core_plugins/timelion/server/fit_functions/__test__/carry.js
+++ b/src/core_plugins/timelion/server/fit_functions/__test__/carry.js
@@ -1,18 +1,18 @@
-var filename = require('path').basename(__filename);
-var fn = require(`../${filename}`);
-var moment = require('moment');
-var expect = require('chai').expect;
-var _ = require('lodash');
+const filename = require('path').basename(__filename);
+const fn = require(`../${filename}`);
+import moment from 'moment';
+const expect = require('chai').expect;
+import _ from 'lodash';
 
 describe(filename, function () {
   it('fills holes in the data', function () {
-    var data = [
+    const data = [
       [moment.utc('1980', 'YYYY').valueOf(), 10],
       [moment.utc('1983', 'YYYY').valueOf(), 40],
       [moment.utc('1984', 'YYYY').valueOf(), 50],
     ];
 
-    var target = [
+    const target = [
       [moment.utc('1980', 'YYYY').valueOf(), null],
       [moment.utc('1981', 'YYYY').valueOf(), null],
       [moment.utc('1982', 'YYYY').valueOf(), null],
@@ -25,13 +25,13 @@ describe(filename, function () {
 
   describe('sampling', function () {
     it('up', function () {
-      var data = [
+      const data = [
         [moment.utc('1981', 'YYYY').valueOf(), 10],
         [moment.utc('1983', 'YYYY').valueOf(), 30],
         [moment.utc('1985', 'YYYY').valueOf(), 70],
       ];
 
-      var target = [
+      const target = [
         [moment.utc('1981', 'YYYY').valueOf(), null],
         [moment.utc('1982', 'YYYY').valueOf(), null],
         [moment.utc('1983', 'YYYY').valueOf(), null],
@@ -44,7 +44,7 @@ describe(filename, function () {
 
 
     it('down does not make sense', function () {
-      var data = [
+      const data = [
         [moment.utc('1980', 'YYYY').valueOf(), 0],
         [moment.utc('1981', 'YYYY').valueOf(), 2],
         [moment.utc('1982', 'YYYY').valueOf(), 4],
@@ -54,7 +54,7 @@ describe(filename, function () {
         [moment.utc('1986', 'YYYY').valueOf(), 12],
       ];
 
-      var target = [
+      const target = [
         [moment.utc('1981', 'YYYY').valueOf(), null],
         [moment.utc('1983', 'YYYY').valueOf(), null],
         [moment.utc('1985', 'YYYY').valueOf(), null],
diff --git a/src/core_plugins/timelion/server/fit_functions/average.js b/src/core_plugins/timelion/server/fit_functions/average.js
index 4f8290e4a49b0..d3d657b0aea86 100644
--- a/src/core_plugins/timelion/server/fit_functions/average.js
+++ b/src/core_plugins/timelion/server/fit_functions/average.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 // Upsampling and down sampling of non-cummulative sets
 // Good: min, max, average
@@ -9,12 +9,12 @@ module.exports = function (dataTuples, targetTuples) {
   // Phase 1: Downsample
   // We nessecarily won't well match the dataSource here as we don't know how much data
   // they had when creating their own average
-  var resultTimes = _.pluck(targetTuples, 0);
-  var dataTuplesQueue = _.clone(dataTuples);
-  var resultValues = _.map(targetTuples, function (bucket) {
-    var time = bucket[0];
-    var i = 0;
-    var avgSet = [];
+  const resultTimes = _.pluck(targetTuples, 0);
+  const dataTuplesQueue = _.clone(dataTuples);
+  const resultValues = _.map(targetTuples, function (bucket) {
+    const time = bucket[0];
+    let i = 0;
+    const avgSet = [];
 
     // This is naive, it doesn't consider where the line is going next,
     // It simply writes the point and moves on once it hits <= time.
@@ -27,7 +27,7 @@ module.exports = function (dataTuples, targetTuples) {
 
     dataTuplesQueue.splice(0, i);
 
-    var sum = _.reduce(avgSet, function (sum, num) { return sum + num; }, 0);
+    const sum = _.reduce(avgSet, function (sum, num) { return sum + num; }, 0);
 
     return avgSet.length ? (sum / avgSet.length) : NaN;
   });
@@ -35,16 +35,16 @@ module.exports = function (dataTuples, targetTuples) {
   // Phase 2: Upsample if needed
   // If we have any NaNs we are probably resampling from a big interval to a small one (eg, 1M as 1d)
   // So look for the missing stuff in the array, and smooth it out
-  var naNIndex = _.findIndex(resultValues, function (val) {
+  const naNIndex = _.findIndex(resultValues, function (val) {
     return isNaN(val);
   });
 
   if (naNIndex > -1) {
-    var i = 0;
-    var naNCount = 0;
-    var filledValues = [];
-    var previousRealNumber;
-    var stepSize;
+    let i = 0;
+    let naNCount = 0;
+    const filledValues = [];
+    let previousRealNumber;
+    let stepSize;
     while (i < resultValues.length) {
       if (isNaN(resultValues[i])) {
         if (i === 0) {
@@ -70,6 +70,6 @@ module.exports = function (dataTuples, targetTuples) {
 
   }
 
-  var resultTuples = _.zip(resultTimes, resultValues);
+  const resultTuples = _.zip(resultTimes, resultValues);
   return resultTuples;
 };
diff --git a/src/core_plugins/timelion/server/fit_functions/carry.js b/src/core_plugins/timelion/server/fit_functions/carry.js
index 6608ff438970a..a22e8e71b45b0 100644
--- a/src/core_plugins/timelion/server/fit_functions/carry.js
+++ b/src/core_plugins/timelion/server/fit_functions/carry.js
@@ -1,5 +1,4 @@
-var _ = require('lodash');
-var moment = require('moment');
+import _ from 'lodash';
 
 // Upsampling of non-cummulative sets
 // Good: average, min, max
@@ -9,13 +8,13 @@ var moment = require('moment');
 module.exports = function (dataTuples, targetTuples) {
 
   if (dataTuples.length > targetTuples.length) {
-    throw new Error (`Don't use the 'carry' fit method to down sample, use 'scale' or 'average'`);
+    throw new Error ('Don\'t use the \'carry\' fit method to down sample, use \'scale\' or \'average\'');
   }
 
-  var currentCarry = dataTuples[0][1];
-  return _.map(targetTuples, function (bucket, h) {
-    var targetTime = bucket[0];
-    var dataTime = dataTuples[0][0];
+  let currentCarry = dataTuples[0][1];
+  return _.map(targetTuples, function (bucket) {
+    const targetTime = bucket[0];
+    const dataTime = dataTuples[0][0];
 
     if (dataTuples[0] && targetTime >= dataTime) {
       currentCarry = dataTuples[0][1];
diff --git a/src/core_plugins/timelion/server/fit_functions/nearest.js b/src/core_plugins/timelion/server/fit_functions/nearest.js
index 959fc2915b48c..14849932fa57a 100644
--- a/src/core_plugins/timelion/server/fit_functions/nearest.js
+++ b/src/core_plugins/timelion/server/fit_functions/nearest.js
@@ -1,13 +1,12 @@
-var _ = require('lodash');
-var moment = require('moment');
+import _ from 'lodash';
 
 // Upsampling and downsampling of non-cummulative sets
 // Good: average, min, max
 // Bad: sum, count
 module.exports = function (dataTuples, targetTuples) {
-  return _.map(targetTuples, function (bucket, h) {
-    var time = bucket[0];
-    var i = 0;
+  return _.map(targetTuples, function (bucket) {
+    const time = bucket[0];
+    let i = 0;
     while (i < dataTuples.length - 1 &&
       (Math.abs(dataTuples[i + 1][0] - time) < Math.abs(dataTuples[i][0] - time) ||
        // TODO: Certain offset= args can cause buckets with duplicate times, eg, offset=-1M
@@ -20,7 +19,7 @@ module.exports = function (dataTuples, targetTuples) {
       i++;
     }
 
-    var closest = dataTuples[i];
+    const closest = dataTuples[i];
     dataTuples.splice(0, i);
 
     return [bucket[0], closest[1]];
diff --git a/src/core_plugins/timelion/server/fit_functions/scale.js b/src/core_plugins/timelion/server/fit_functions/scale.js
index b695955675816..5764d4cea4dc4 100644
--- a/src/core_plugins/timelion/server/fit_functions/scale.js
+++ b/src/core_plugins/timelion/server/fit_functions/scale.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 // Downsampling of cummulative metrics
 // Good: count, sum
@@ -15,15 +15,15 @@ function sum(set) {
 
 module.exports = function (dataTuples, targetTuples) {
 
-  var i = 0;
-  var j = 0;
-  var spreadCount = 0;
-  var result = [];
-  var bucket;
-  var time;
-  var scaleSet;
-  var step;
-  var nextRealNumber;
+  let i = 0;
+  let j = 0;
+  let spreadCount = 0;
+  const result = [];
+  let bucket;
+  let time;
+  let scaleSet;
+  let step;
+  let nextRealNumber;
 
   while (i < targetTuples.length) {
     scaleSet = [];
diff --git a/src/core_plugins/timelion/server/handlers/chain_runner.js b/src/core_plugins/timelion/server/handlers/chain_runner.js
index a2b7425f4793f..a2ed3a757950f 100644
--- a/src/core_plugins/timelion/server/handlers/chain_runner.js
+++ b/src/core_plugins/timelion/server/handlers/chain_runner.js
@@ -1,29 +1,21 @@
 
-var _ = require('lodash');
-var glob = require('glob');
-var Promise = require('bluebird');
-
-var parseSheet = require('./lib/parse_sheet.js');
-var parseDateMath = require('../lib/date_math.js');
-var calculateInterval = require('../../public/lib/calculate_interval.js');
-
-var repositionArguments = require('./lib/reposition_arguments.js');
-var indexArguments = require('./lib/index_arguments.js');
-var validateTime = require('./lib/validate_time.js');
-
-var loadFunctions = require('../lib/load_functions.js');
-var fitFunctions  = loadFunctions('fit_functions');
+import _ from 'lodash';
+import Promise from 'bluebird';
+import parseSheet from './lib/parse_sheet.js';
+import parseDateMath from '../lib/date_math.js';
+import calculateInterval from '../../public/lib/calculate_interval.js';
+import repositionArguments from './lib/reposition_arguments.js';
+import indexArguments from './lib/index_arguments.js';
+import validateTime from './lib/validate_time.js';
+import loadFunctions from '../lib/load_functions.js';
+loadFunctions('fit_functions');
 
 module.exports = function (tlConfig) {
-  var preprocessChain = require('./lib/preprocess_chain')(tlConfig);
+  const preprocessChain = require('./lib/preprocess_chain')(tlConfig);
 
-  var queryCache = {};
-  var stats = {};
-  var sheet;
-
-  function getQueryCacheKey(query) {
-    return JSON.stringify(_.omit(query, 'label'));
-  }
+  let queryCache = {};
+  const stats = {};
+  let sheet;
 
   function throwWithCell(cell, exception) {
     throw new Error(' in cell #' + (cell + 1) + ': ' + exception.message);
@@ -31,7 +23,7 @@ module.exports = function (tlConfig) {
 
   // Invokes a modifier function, resolving arguments into series as needed
   function invoke(fnName, args) {
-    var functionDef = tlConfig.server.plugins.timelion.getFunction(fnName);
+    const functionDef = tlConfig.server.plugins.timelion.getFunction(fnName);
 
     function resolveArgument(item) {
       if (_.isArray(item)) {
@@ -40,15 +32,16 @@ module.exports = function (tlConfig) {
 
       if (_.isObject(item)) {
         switch (item.type) {
-          case 'function':
-            var itemFunctionDef = tlConfig.server.plugins.timelion.getFunction(item.function);
+          case 'function': {
+            const itemFunctionDef = tlConfig.server.plugins.timelion.getFunction(item.function);
             if (itemFunctionDef.cacheKey && queryCache[itemFunctionDef.cacheKey(item)]) {
               stats.queryCount++;
               return Promise.resolve(_.cloneDeep(queryCache[itemFunctionDef.cacheKey(item)]));
             }
             return invoke(item.function, item.arguments);
-          case 'reference':
-            var reference;
+          }
+          case 'reference': {
+            let reference;
             if (item.series) {
               reference = sheet[item.plot - 1][item.series - 1];
             } else {
@@ -58,6 +51,7 @@ module.exports = function (tlConfig) {
               };
             }
             return invoke('first', [reference]);
+          }
           case 'chain':
             return invokeChain(item);
           case 'chainList':
@@ -87,35 +81,35 @@ module.exports = function (tlConfig) {
   function invokeChain(chainObj, result) {
     if (chainObj.chain.length === 0) return result[0];
 
-    var chain = _.clone(chainObj.chain);
-    var link = chain.shift();
+    const chain = _.clone(chainObj.chain);
+    const link = chain.shift();
 
-    var promise;
+    let promise;
     if (link.type === 'chain') {
       promise = invokeChain(link);
     } else if (!result) {
       promise = invoke('first', [link]);
     } else {
-      var args = link.arguments ? result.concat(link.arguments) : result;
+      const args = link.arguments ? result.concat(link.arguments) : result;
       promise = invoke(link.function, args);
     }
 
     return promise.then(function (result) {
-      return invokeChain({type:'chain', chain: chain}, [result]);
+      return invokeChain({ type:'chain', chain: chain }, [result]);
     });
 
   }
 
   function resolveChainList(chainList) {
-    var seriesList = _.map(chainList, function (chain) {
-      var values = invoke('first', [chain]);
+    const seriesList = _.map(chainList, function (chain) {
+      const values = invoke('first', [chain]);
       return values.then(function (args) {
         return args;
       });
     });
     return Promise.all(seriesList).then(function (args) {
-      var list = _.chain(args).pluck('list').flatten().value();
-      var seriesList = _.merge.apply(this, _.flatten([{}, args]));
+      const list = _.chain(args).pluck('list').flatten().value();
+      const seriesList = _.merge.apply(this, _.flatten([{}, args]));
       seriesList.list = list;
       return seriesList;
     });
@@ -123,10 +117,10 @@ module.exports = function (tlConfig) {
 
   function preProcessSheet(sheet) {
 
-    var queries = {};
+    let queries = {};
     _.each(sheet, function (chainList, i) {
       try {
-        var queriesInCell = _.mapValues(preprocessChain(chainList), function (val) {
+        const queriesInCell = _.mapValues(preprocessChain(chainList), function (val) {
           val.cell = i;
           return val;
         });
@@ -137,7 +131,7 @@ module.exports = function (tlConfig) {
     });
     queries = _.values(queries);
 
-    var promises = _.chain(queries).values().map(function (query) {
+    const promises = _.chain(queries).values().map(function (query) {
       return invoke(query.function, query.arguments);
     }).value();
 
@@ -146,8 +140,8 @@ module.exports = function (tlConfig) {
       stats.queryTime = (new Date()).getTime();
 
       _.each(queries, function (query, i) {
-        var functionDef = tlConfig.server.plugins.timelion.getFunction(query.function);
-        var resolvedDatasource = resolvedDatasources[i];
+        const functionDef = tlConfig.server.plugins.timelion.getFunction(query.function);
+        const resolvedDatasource = resolvedDatasources[i];
 
         if (resolvedDatasource.isRejected()) {
           if (resolvedDatasource.reason().isBoom) {
diff --git a/src/core_plugins/timelion/server/handlers/lib/arg_type.js b/src/core_plugins/timelion/server/handlers/lib/arg_type.js
index a3aa39018d72a..1cabf054733be 100644
--- a/src/core_plugins/timelion/server/handlers/lib/arg_type.js
+++ b/src/core_plugins/timelion/server/handlers/lib/arg_type.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = function argType(arg) {
   if (_.isArray(arg)) {
diff --git a/src/core_plugins/timelion/server/handlers/lib/index_arguments.js b/src/core_plugins/timelion/server/handlers/lib/index_arguments.js
index 6630894c19b40..1b5234b81988d 100644
--- a/src/core_plugins/timelion/server/handlers/lib/index_arguments.js
+++ b/src/core_plugins/timelion/server/handlers/lib/index_arguments.js
@@ -1,26 +1,26 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 // Only applies to already resolved arguments
 module.exports = function indexArguments(functionDef, orderedArgs) {
 
-  var validateArg = require('./validate_arg')(functionDef);
+  const validateArg = require('./validate_arg')(functionDef);
 
   // This almost certainly is not required
-  var allowedLength = functionDef.extended ? functionDef.args.length + 2 : functionDef.args.length;
+  const allowedLength = functionDef.extended ? functionDef.args.length + 2 : functionDef.args.length;
   if (orderedArgs.length > allowedLength) throw new Error ('Too many arguments passed to: ' + functionDef.name);
 
-  var indexedArgs = {};
+  const indexedArgs = {};
   // Check and index each known argument
   _.each(functionDef.args, function (argDef, i) {
-    var value = orderedArgs[i];
+    const value = orderedArgs[i];
     validateArg(value, argDef.name, argDef);
     indexedArgs[argDef.name] = value;
   });
 
   // Also check and index the extended arguments if enabled
   if (functionDef.extended) {
-    var values = orderedArgs[orderedArgs.length - 1];
-    var names = orderedArgs[orderedArgs.length - 2];
+    const values = orderedArgs[orderedArgs.length - 1];
+    const names = orderedArgs[orderedArgs.length - 2];
     _.each(values, function (value, i) {
       validateArg(value, names[i], functionDef.extended);
       indexedArgs[names[i]] = value;
diff --git a/src/core_plugins/timelion/server/handlers/lib/parse_sheet.js b/src/core_plugins/timelion/server/handlers/lib/parse_sheet.js
index 59f4345be4c05..deb61b832561a 100644
--- a/src/core_plugins/timelion/server/handlers/lib/parse_sheet.js
+++ b/src/core_plugins/timelion/server/handlers/lib/parse_sheet.js
@@ -1,16 +1,15 @@
-var fs = require('fs');
-var path = require('path');
-var _ = require('lodash');
-var grammar = fs.readFileSync(path.resolve(__dirname, '../../../public/chain.peg'), 'utf8');
-var PEG = require('pegjs');
-var Parser = PEG.buildParser(grammar);
+import fs from 'fs';
+import path from 'path';
+import _ from 'lodash';
+const grammar = fs.readFileSync(path.resolve(__dirname, '../../../public/chain.peg'), 'utf8');
+import PEG from 'pegjs';
+const Parser = PEG.buildParser(grammar);
 
 module.exports = function parseSheet(sheet) {
   return _.map(sheet, function (plot) {
     try {
       return Parser.parse(plot).tree;
     } catch (e) {
-      var message;
       if (e.expected) {
         throw new Error('Expected: ' + e.expected[0].description + ' @ character ' + e.column);
       } else {
diff --git a/src/core_plugins/timelion/server/handlers/lib/preprocess_chain.js b/src/core_plugins/timelion/server/handlers/lib/preprocess_chain.js
index 178ffaea07873..6915a272122a5 100644
--- a/src/core_plugins/timelion/server/handlers/lib/preprocess_chain.js
+++ b/src/core_plugins/timelion/server/handlers/lib/preprocess_chain.js
@@ -1,11 +1,11 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = function preProcessChainFn(tlConfig) {
   return function preProcessChain(chain, queries) {
     queries = queries || {};
     function validateAndStore(item) {
       if (_.isObject(item) && item.type === 'function') {
-        var functionDef = tlConfig.server.plugins.timelion.getFunction(item.function);
+        const functionDef = tlConfig.server.plugins.timelion.getFunction(item.function);
 
         if (functionDef.datasource) {
           queries[functionDef.cacheKey(item)] = item;
diff --git a/src/core_plugins/timelion/server/handlers/lib/reposition_arguments.js b/src/core_plugins/timelion/server/handlers/lib/reposition_arguments.js
index 23d1b2ddd77c2..8145e7b0f25b2 100644
--- a/src/core_plugins/timelion/server/handlers/lib/reposition_arguments.js
+++ b/src/core_plugins/timelion/server/handlers/lib/reposition_arguments.js
@@ -1,21 +1,21 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 // Applies to unresolved arguments in the AST
 module.exports = function repositionArguments(functionDef, unorderedArgs) {
-  var args = [];
+  const args = [];
 
   _.each(unorderedArgs, function (unorderedArg, i) {
-    var argDef;
-    var targetIndex;
-    var value;
-    var storeAsArray;
+    let argDef;
+    let targetIndex;
+    let value;
+    let storeAsArray;
 
     if (_.isObject(unorderedArg) && unorderedArg.type === 'namedArg') {
       argDef = functionDef.argsByName[unorderedArg.name];
 
       if (!argDef) {
         if (functionDef.extended) {
-          var namesIndex = functionDef.args.length;
+          const namesIndex = functionDef.args.length;
           targetIndex = functionDef.args.length + 1;
 
           args[namesIndex] = args[namesIndex] || [];
diff --git a/src/core_plugins/timelion/server/handlers/lib/tl_config.js b/src/core_plugins/timelion/server/handlers/lib/tl_config.js
index f2abeeae1640a..1458000f53317 100644
--- a/src/core_plugins/timelion/server/handlers/lib/tl_config.js
+++ b/src/core_plugins/timelion/server/handlers/lib/tl_config.js
@@ -1,11 +1,10 @@
-var _ = require('lodash');
-
-var buildTarget = require('../../lib/build_target.js');
+import _ from 'lodash';
+import buildTarget from '../../lib/build_target.js';
 
 module.exports = function (setup) {
-  var targetSeries;
+  let targetSeries;
 
-  var tlConfig = {
+  let tlConfig = {
     getTargetSeries: function () {
       return _.map(targetSeries, function (bucket) { // eslint-disable-line no-use-before-define
         return [bucket, null];
diff --git a/src/core_plugins/timelion/server/handlers/lib/validate_arg.js b/src/core_plugins/timelion/server/handlers/lib/validate_arg.js
index cef0b0e22f982..73ddabec53d51 100644
--- a/src/core_plugins/timelion/server/handlers/lib/validate_arg.js
+++ b/src/core_plugins/timelion/server/handlers/lib/validate_arg.js
@@ -1,12 +1,12 @@
-var argType = require('./arg_type');
-var _ = require('lodash');
+import argType from './arg_type';
+import _ from 'lodash';
 
 module.exports = function (functionDef) {
   return function validateArg(value, name, argDef) {
-    var type = argType(value);
-    var required = argDef.types;
-    var multi = argDef.multi;
-    var isCorrectType = (function () {
+    const type = argType(value);
+    const required = argDef.types;
+    const multi = argDef.multi;
+    const isCorrectType = (function () {
       // If argument is not allow to be specified multiple times, we're dealing with a plain value for type
       if (!multi) return _.contains(required, type);
       // If it is, we'll get an array for type
diff --git a/src/core_plugins/timelion/server/handlers/lib/validate_time.js b/src/core_plugins/timelion/server/handlers/lib/validate_time.js
index 6268cea94a0ba..6f2bd929b6a93 100644
--- a/src/core_plugins/timelion/server/handlers/lib/validate_time.js
+++ b/src/core_plugins/timelion/server/handlers/lib/validate_time.js
@@ -1,11 +1,11 @@
-var parseDateMath = require('../../lib/date_math.js');
-var toMS = require('../../lib/to_milliseconds.js');
+import parseDateMath from '../../lib/date_math.js';
+import toMS from '../../lib/to_milliseconds.js';
 
 module.exports = function validateTime(time, tlConfig) {
-  var span = parseDateMath(time.to, true) - parseDateMath(time.from);
-  var interval = toMS(time.interval);
-  var bucketCount = span / interval;
-  var maxBuckets = tlConfig.settings['timelion:max_buckets'];
+  const span = parseDateMath(time.to, true) - parseDateMath(time.from);
+  const interval = toMS(time.interval);
+  const bucketCount = span / interval;
+  const maxBuckets = tlConfig.settings['timelion:max_buckets'];
   if (bucketCount > maxBuckets) {
     throw new Error('Max buckets exceeded: ' +
       Math.round(bucketCount) + ' of ' + maxBuckets + ' allowed. ' +
diff --git a/src/core_plugins/timelion/server/lib/__test__/load_functions.js b/src/core_plugins/timelion/server/lib/__test__/load_functions.js
index 2e47a36be375d..ca950ad05eb60 100644
--- a/src/core_plugins/timelion/server/lib/__test__/load_functions.js
+++ b/src/core_plugins/timelion/server/lib/__test__/load_functions.js
@@ -1,8 +1,7 @@
-let filename = require('path').basename(__filename);
-let fn = require(`../${filename}`);
+const filename = require('path').basename(__filename);
+const fn = require(`../${filename}`);
 
-let _ = require('lodash');
-let expect = require('chai').expect;
+const expect = require('chai').expect;
 
 describe(filename, () => {
   it('exports a function', () => {
@@ -10,14 +9,14 @@ describe(filename, () => {
   });
 
   it('returns an object with keys named for the javascript files in the directory', () => {
-    var fnList = fn('series_functions');
+    const fnList = fn('series_functions');
 
     expect(fnList).to.be.an('object');
     expect(fnList.sum).to.be.a('object');
   });
 
   it('also includes index.js files in direct subdirectories, and names the keys for the directory', () => {
-    var fnList = fn('series_functions');
+    const fnList = fn('series_functions');
 
     expect(fnList).to.be.an('object');
     expect(fnList.es).to.be.a('object');
diff --git a/src/core_plugins/timelion/server/lib/alter.js b/src/core_plugins/timelion/server/lib/alter.js
index bdc68875c698e..a0ed14ef0cd4b 100644
--- a/src/core_plugins/timelion/server/lib/alter.js
+++ b/src/core_plugins/timelion/server/lib/alter.js
@@ -1,5 +1,5 @@
-var Promise = require('bluebird');
-var _ = require('lodash');
+import Promise from 'bluebird';
+import _ from 'lodash';
 
 /* @param {Array} args
  * - args[0] must be a seriesList
@@ -12,13 +12,13 @@ module.exports = function alter(args, fn) {
   // In theory none of the args should ever be promises. This is probably a waste.
   return Promise.all(args).then(function (args) {
 
-    var seriesList = args.shift();
+    const seriesList = args.shift();
 
     if (seriesList.type !== 'seriesList') {
       throw new Error ('args[0] must be a seriesList');
     }
 
-    var list = _.chain(seriesList.list).map(function (series) {
+    const list = _.chain(seriesList.list).map(function (series) {
       return fn.apply(this, [series].concat(args));
     }).flatten().value();
 
diff --git a/src/core_plugins/timelion/server/lib/asSorted.js b/src/core_plugins/timelion/server/lib/asSorted.js
index 914797a6e3cb2..7f19a93c43e44 100644
--- a/src/core_plugins/timelion/server/lib/asSorted.js
+++ b/src/core_plugins/timelion/server/lib/asSorted.js
@@ -1,7 +1,7 @@
-var _ = require('lodash');
-var unzipPairs = require('./unzipPairs.js');
+import _ from 'lodash';
+import unzipPairs from './unzipPairs.js';
 
 module.exports = function asSorted(timeValObject, fn) {
-  var data = unzipPairs(timeValObject);
+  const data = unzipPairs(timeValObject);
   return _.zipObject(fn(data));
 };
diff --git a/src/core_plugins/timelion/server/lib/build_target.js b/src/core_plugins/timelion/server/lib/build_target.js
index 14c8bbc20711d..a21213f4a4689 100644
--- a/src/core_plugins/timelion/server/lib/build_target.js
+++ b/src/core_plugins/timelion/server/lib/build_target.js
@@ -1,16 +1,15 @@
-var moment = require('moment');
-
-var splitInterval = require('./split_interval.js');
+import moment from 'moment';
+import splitInterval from './split_interval.js';
 
 module.exports = function (tlConfig) {
-  var min = moment(tlConfig.time.from);
-  var max = moment(tlConfig.time.to);
+  const min = moment(tlConfig.time.from);
+  const max = moment(tlConfig.time.to);
 
-  var intervalParts = splitInterval(tlConfig.time.interval);
+  const intervalParts = splitInterval(tlConfig.time.interval);
 
-  var current = min.startOf(intervalParts.unit);
+  let current = min.startOf(intervalParts.unit);
 
-  var targetSeries = [];
+  const targetSeries = [];
 
   while (current.valueOf() < max.valueOf()) {
     targetSeries.push(current.valueOf());
diff --git a/src/core_plugins/timelion/server/lib/classes/chainable.js b/src/core_plugins/timelion/server/lib/classes/chainable.js
index 1b8914e163a89..feee28cf86fca 100644
--- a/src/core_plugins/timelion/server/lib/classes/chainable.js
+++ b/src/core_plugins/timelion/server/lib/classes/chainable.js
@@ -1,4 +1,4 @@
-var TimelionFunction = require('./timelion_function');
+import TimelionFunction from './timelion_function';
 
 module.exports = class Chainable extends TimelionFunction {
   constructor(name, config) {
diff --git a/src/core_plugins/timelion/server/lib/classes/datasource.js b/src/core_plugins/timelion/server/lib/classes/datasource.js
index 5f9cf820980ff..97d93d533ffd1 100644
--- a/src/core_plugins/timelion/server/lib/classes/datasource.js
+++ b/src/core_plugins/timelion/server/lib/classes/datasource.js
@@ -1,10 +1,8 @@
-var loadFunctions = require('../load_functions.js');
-var fitFunctions  = loadFunctions('fit_functions');
-var TimelionFunction = require('./timelion_function');
-var offsetTime = require('../offset_time');
-
-var _ = require('lodash');
-var moment = require('moment');
+import loadFunctions from '../load_functions.js';
+const fitFunctions  = loadFunctions('fit_functions');
+import TimelionFunction from './timelion_function';
+import offsetTime from '../offset_time';
+import _ from 'lodash';
 
 
 function offsetSeries(response, offset) {
@@ -33,9 +31,9 @@ module.exports = class Datasource extends TimelionFunction {
     });
 
     // Wrap the original function so we can modify inputs/outputs with offset & fit
-    var originalFunction = config.fn;
+    const originalFunction = config.fn;
     config.fn = function (args, tlConfig) {
-      var config = _.clone(tlConfig);
+      const config = _.clone(tlConfig);
       if (args.byName.offset) {
         config.time = _.cloneDeep(tlConfig.time);
         config.time.from = offsetTime(config.time.from, args.byName.offset);
diff --git a/src/core_plugins/timelion/server/lib/classes/timelion_function.js b/src/core_plugins/timelion/server/lib/classes/timelion_function.js
index 10f0e9ea6fc7b..7ab70670d0585 100644
--- a/src/core_plugins/timelion/server/lib/classes/timelion_function.js
+++ b/src/core_plugins/timelion/server/lib/classes/timelion_function.js
@@ -1,6 +1,6 @@
-var _ = require('lodash');
-var loadFunctions = require('../load_functions.js');
-var fitFunctions  = loadFunctions('fit_functions');
+import _ from 'lodash';
+import loadFunctions from '../load_functions.js';
+const fitFunctions  = loadFunctions('fit_functions');
 
 module.exports = class TimelionFunction {
   constructor(name, config) {
@@ -12,21 +12,21 @@ module.exports = class TimelionFunction {
     this.extended = config.extended || false;
 
     // WTF is this? How could you not have a fn? Wtf would the thing be used for?
-    var originalFunction = config.fn || function (input) { return input; };
+    const originalFunction = config.fn || function (input) { return input; };
 
     // Currently only re-fits the series.
     this.originalFn = originalFunction;
 
     this.fn = function (args, tlConfig) {
-      var config = _.clone(tlConfig);
+      const config = _.clone(tlConfig);
       return Promise.resolve(originalFunction(args, config)).then(function (seriesList) {
         seriesList.list = _.map(seriesList.list, function (series) {
-          var target = tlConfig.getTargetSeries();
+          const target = tlConfig.getTargetSeries();
 
           // Don't fit if the series are already the same
           if (_.isEqual(_.map(series.data, 0), _.map(target, 0))) return series;
 
-          var fit;
+          let fit;
           if (args.byName.fit) {
             fit = args.byName.fit;
           } else if (series.fit) {
diff --git a/src/core_plugins/timelion/server/lib/date_math.js b/src/core_plugins/timelion/server/lib/date_math.js
index c57651b59018f..616cfd99f6120 100644
--- a/src/core_plugins/timelion/server/lib/date_math.js
+++ b/src/core_plugins/timelion/server/lib/date_math.js
@@ -1,7 +1,7 @@
-var _ = require('lodash');
-var moment = require('moment');
+import _ from 'lodash';
+import moment from 'moment';
 
-var units = ['y', 'M', 'w', 'd', 'h', 'm', 's'];
+const units = ['y', 'M', 'w', 'd', 'h', 'm', 's'];
 
 /* This is a simplified version of elasticsearch's date parser */
 function parse(text, roundUp) {
@@ -15,10 +15,10 @@ function parse(text, roundUp) {
     return moment(text);
   }
 
-  var time;
-  var mathString = '';
-  var index;
-  var parseString;
+  let time;
+  let mathString = '';
+  let index;
+  let parseString;
 
   if (text.substring(0, 3) === 'now') {
     time = moment();
@@ -44,13 +44,12 @@ function parse(text, roundUp) {
 }
 
 function parseDateMath(mathString, time, roundUp) {
-  var dateTime = time;
+  const dateTime = time;
 
-  for (var i = 0; i < mathString.length;) {
-    var c = mathString.charAt(i++);
-    var type;
-    var num;
-    var unit;
+  for (let i = 0; i < mathString.length;) {
+    const c = mathString.charAt(i++);
+    let type;
+    let num;
 
     if (c === '/') {
       type = 0;
@@ -67,7 +66,7 @@ function parseDateMath(mathString, time, roundUp) {
     } else if (mathString.length === 2) {
       num = mathString.charAt(i);
     } else {
-      var numFrom = i;
+      const numFrom = i;
       while (!isNaN(mathString.charAt(i))) {
         i++;
         if (i > 10) {
@@ -83,7 +82,7 @@ function parseDateMath(mathString, time, roundUp) {
         return undefined;
       }
     }
-    unit = mathString.charAt(i++);
+    const unit = mathString.charAt(i++);
 
     if (!_.contains(units, unit)) {
       return undefined;
@@ -104,4 +103,4 @@ function parseDateMath(mathString, time, roundUp) {
   return dateTime;
 }
 
-module.exports = parse;
\ No newline at end of file
+module.exports = parse;
diff --git a/src/core_plugins/timelion/server/lib/functions_md.js b/src/core_plugins/timelion/server/lib/functions_md.js
index 15300fa1e19ce..dec5bc48c80bc 100644
--- a/src/core_plugins/timelion/server/lib/functions_md.js
+++ b/src/core_plugins/timelion/server/lib/functions_md.js
@@ -1,16 +1,16 @@
-var loadFunctions = require('./load_functions.js');
-var functions  = loadFunctions('series_functions/');
-var _ = require('lodash');
+import loadFunctions from './load_functions.js';
+const functions  = loadFunctions('series_functions/');
+import _ from 'lodash';
 
 
 module.exports = (function () {
-  var functionArray = _.map(functions, function (val, key) {
+  const functionArray = _.map(functions, function (val, key) {
     // TODO: This won't work on frozen objects, it should be removed when everything is converted to datasources and chainables
-    return _.extend({}, val, {name: key});
+    return _.extend({}, val, { name: key });
   });
 
   function toDocBlock(fn) {
-    var help = '';
+    let help = '';
 
     if (fn.isAlias) return help;
 
@@ -18,7 +18,7 @@ module.exports = (function () {
     help += fn.help + '\n\n';
 
     // If chainable, drop first argument from help
-    var args = fn.chainable ? fn.args.slice(1) : fn.args.slice();
+    const args = fn.chainable ? fn.args.slice(1) : fn.args.slice();
     if (!args.length) {
       help += '*This function does not accept any arguments.*\n\n';
       return help;
@@ -39,7 +39,7 @@ module.exports = (function () {
   }
 
   function createDocs() {
-    var help = '';
+    let help = '';
     help += '## Timelion function reference\n';
     help += 'This document is auto generated from the timelion code. ' +
     'Do not submit pulls against this document. You want to submit a pull against something in the ' +
diff --git a/src/core_plugins/timelion/server/lib/get_namespaced_settings.js b/src/core_plugins/timelion/server/lib/get_namespaced_settings.js
index 705baff04270d..8f2de490862eb 100644
--- a/src/core_plugins/timelion/server/lib/get_namespaced_settings.js
+++ b/src/core_plugins/timelion/server/lib/get_namespaced_settings.js
@@ -1,10 +1,10 @@
-var _ = require('lodash');
-var configFile = require('../../timelion.json');
+import _ from 'lodash';
+import configFile from '../../timelion.json';
 
 module.exports = function () {
   function flattenWith(dot, nestedObj, flattenArrays) {
-    let stack = []; // track key stack
-    let flatObj = {};
+    const stack = []; // track key stack
+    const flatObj = {};
     (function flattenObj(obj) {
       _.keys(obj).forEach(function (key) {
         stack.push(key);
@@ -15,9 +15,9 @@ module.exports = function () {
       });
     }(nestedObj));
     return flatObj;
-  };
+  }
 
-  var timelionDefaults = flattenWith('.', configFile);
+  const timelionDefaults = flattenWith('.', configFile);
   return _.reduce(timelionDefaults, (result, value, key) => {
     result['timelion:' + key] = value;
     return result;
diff --git a/src/core_plugins/timelion/server/lib/load_functions.js b/src/core_plugins/timelion/server/lib/load_functions.js
index 3bb0ecee7ae25..c7986813c25db 100644
--- a/src/core_plugins/timelion/server/lib/load_functions.js
+++ b/src/core_plugins/timelion/server/lib/load_functions.js
@@ -1,33 +1,31 @@
-var _ = require('lodash');
-var glob = require('glob');
-var path = require('path');
-var processFunctionDefinition = require('./process_function_definition');
+import _ from 'lodash';
+import glob from 'glob';
+import path from 'path';
+import processFunctionDefinition from './process_function_definition';
 
 module.exports = function (directory) {
 
   function getTuple(directory, name) {
-    var func = require('../' + directory + '/' + name);
     return [name, require('../' + directory + '/' + name)];
   }
 
   // Get a list of all files and use the filename as the object key
-  var files = _.map(glob.sync(path.resolve(__dirname, '../' + directory + '/*.js')), function (file) {
-    var name = file.substring(file.lastIndexOf('/') + 1, file.lastIndexOf('.'));
+  const files = _.map(glob.sync(path.resolve(__dirname, '../' + directory + '/*.js')), function (file) {
+    const name = file.substring(file.lastIndexOf('/') + 1, file.lastIndexOf('.'));
     return getTuple(directory, name);
   });
 
   // Get a list of all directories with an index.js, use the directory name as the key in the object
-  var directories = _.chain(glob.sync(path.resolve(__dirname, '../' + directory + '/*/index.js')))
+  const directories = _.chain(glob.sync(path.resolve(__dirname, '../' + directory + '/*/index.js')))
   .filter(function (file) {
     return file.match(/__test__/) == null;
   })
   .map(function (file) {
-    var parts = file.split('/');
-    var name = parts[parts.length - 2];
+    const parts = file.split('/');
     return getTuple(directory, parts[parts.length - 2]);
   }).value();
 
-  var functions = _.zipObject(files.concat(directories));
+  const functions = _.zipObject(files.concat(directories));
 
   _.each(functions, function (func) {
     _.assign(functions, processFunctionDefinition(func));
diff --git a/src/core_plugins/timelion/server/lib/offset_time.js b/src/core_plugins/timelion/server/lib/offset_time.js
index 84dc5cd68830a..231b4696190a9 100644
--- a/src/core_plugins/timelion/server/lib/offset_time.js
+++ b/src/core_plugins/timelion/server/lib/offset_time.js
@@ -1,17 +1,17 @@
-var moment = require('moment');
+import moment from 'moment';
 
 // usually reverse = false on the request, true on the response
 module.exports = function offsetTime(milliseconds, offset, reverse) {
   if (!offset.match(/[-+][0-9]+[mshdwMy]/g)) {
     throw new Error ('Malformed `offset` at ' + offset);
   }
-  var parts = offset.match(/[-+]|[0-9]+|[mshdwMy]/g);
+  const parts = offset.match(/[-+]|[0-9]+|[mshdwMy]/g);
 
-  var add = parts[0] === '+';
+  let add = parts[0] === '+';
   add = reverse ? !add : add;
 
-  var mode = add ? 'add' : 'subtract';
+  const mode = add ? 'add' : 'subtract';
 
-  var momentObj = moment(milliseconds)[mode](parts[1], parts[2]);
+  const momentObj = moment(milliseconds)[mode](parts[1], parts[2]);
   return momentObj.valueOf();
 };
diff --git a/src/core_plugins/timelion/server/lib/process_function_definition.js b/src/core_plugins/timelion/server/lib/process_function_definition.js
index 0e17cb7a39692..141651a9d56c7 100644
--- a/src/core_plugins/timelion/server/lib/process_function_definition.js
+++ b/src/core_plugins/timelion/server/lib/process_function_definition.js
@@ -1,11 +1,11 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = function (func) {
-  var functions = {};
+  const functions = {};
   functions[func.name] = func;
   if (func.aliases) {
     _.each(func.aliases, function (alias) {
-      var aliasFn = _.clone(func);
+      const aliasFn = _.clone(func);
       aliasFn.isAlias = true;
       functions[alias] = aliasFn;
     });
diff --git a/src/core_plugins/timelion/server/lib/reduce.js b/src/core_plugins/timelion/server/lib/reduce.js
index bdb420799ba48..467be066bd20b 100644
--- a/src/core_plugins/timelion/server/lib/reduce.js
+++ b/src/core_plugins/timelion/server/lib/reduce.js
@@ -1,5 +1,5 @@
-var _ = require('lodash');
-var Promise = require('bluebird');
+import _ from 'lodash';
+import Promise from 'bluebird';
 
 
 /**
@@ -15,8 +15,8 @@ var Promise = require('bluebird');
 module.exports = function reduce(args, fn) {
   return Promise.all(args).then(function (args) {
 
-    var seriesList = args.shift();
-    var argument = args.shift();
+    const seriesList = args.shift();
+    let argument = args.shift();
 
     if (seriesList.type !== 'seriesList') {
       throw new Error ('input must be a seriesList');
@@ -34,9 +34,9 @@ module.exports = function reduce(args, fn) {
     function reduceSeries(series) {
       return _.reduce(series, function (destinationObject, argument, i, p) {
 
-        var output = _.map(destinationObject.data, function (point, index) {
+        let output = _.map(destinationObject.data, function (point, index) {
 
-          var value = point[1];
+          const value = point[1];
 
           if (value == null) {
             return [point[0], null];
@@ -64,7 +64,7 @@ module.exports = function reduce(args, fn) {
 
     }
 
-    var reduced;
+    let reduced;
 
     if (argument != null) {
       reduced = _.map(seriesList.list, function (series) {
diff --git a/src/core_plugins/timelion/server/lib/split_interval.js b/src/core_plugins/timelion/server/lib/split_interval.js
index d19ce50fac89f..db7ae68811dc8 100644
--- a/src/core_plugins/timelion/server/lib/split_interval.js
+++ b/src/core_plugins/timelion/server/lib/split_interval.js
@@ -2,7 +2,7 @@ module.exports = function splitInterval(interval) {
   if (!interval.match(/[0-9]+[mshdwMy]+/g)) {
     throw new Error ('Malformed `interval`: ' + interval);
   }
-  var parts = interval.match(/[0-9]+|[mshdwMy]+/g);
+  const parts = interval.match(/[0-9]+|[mshdwMy]+/g);
 
   return {
     count: parts[0],
diff --git a/src/core_plugins/timelion/server/lib/to_milliseconds.js b/src/core_plugins/timelion/server/lib/to_milliseconds.js
index c109749ea1f2f..449b4b917f770 100644
--- a/src/core_plugins/timelion/server/lib/to_milliseconds.js
+++ b/src/core_plugins/timelion/server/lib/to_milliseconds.js
@@ -1,9 +1,9 @@
-var _ = require('lodash');
-var moment = require('moment');
+import _ from 'lodash';
+import moment from 'moment';
 
 // map of moment's short/long unit ids and elasticsearch's long unit ids
 // to their value in milliseconds
-var vals = _.transform([
+const vals = _.transform([
   ['ms', 'milliseconds', 'millisecond'],
   ['s', 'seconds', 'second', 'sec'],
   ['m', 'minutes', 'minute', 'min'],
@@ -14,17 +14,17 @@ var vals = _.transform([
   ['quarter'],
   ['y',  'years', 'year']
 ], function (vals, units) {
-  var normal = moment.normalizeUnits(units[0]);
-  var val = moment.duration(1, normal).asMilliseconds();
+  const normal = moment.normalizeUnits(units[0]);
+  const val = moment.duration(1, normal).asMilliseconds();
   [].concat(normal, units).forEach(function (unit) {
     vals[unit] = val;
   });
 }, {});
 // match any key from the vals object prececed by an optional number
-var parseRE = new RegExp('^(\\d+(?:\\.\\d*)?)?\\s*(' + _.keys(vals).join('|') + ')$');
+const parseRE = new RegExp('^(\\d+(?:\\.\\d*)?)?\\s*(' + _.keys(vals).join('|') + ')$');
 
 module.exports = function (expr) {
-  var match = expr.match(parseRE);
+  const match = expr.match(parseRE);
   if (match) {
     if (match[2] === 'M' && match[1] !== '1') {
       throw new Error ('Invalid interval. 1M is only valid monthly interval.');
diff --git a/src/core_plugins/timelion/server/lib/unzipPairs.js b/src/core_plugins/timelion/server/lib/unzipPairs.js
index 88f1510d29c49..369ac7d19dde6 100644
--- a/src/core_plugins/timelion/server/lib/unzipPairs.js
+++ b/src/core_plugins/timelion/server/lib/unzipPairs.js
@@ -1,7 +1,7 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = function unzipPairs(timeValObject) {
-  var paired = _.chain(timeValObject).pairs().map(function (point) {
+  const paired = _.chain(timeValObject).pairs().map(function (point) {
     return [parseInt(point[0], 10), point[1]];
   }).sortBy(function (point) {
     return point[0];
diff --git a/src/core_plugins/timelion/server/routes/functions.js b/src/core_plugins/timelion/server/routes/functions.js
index 93dca0ec034ca..fe5bc2e90216a 100644
--- a/src/core_plugins/timelion/server/routes/functions.js
+++ b/src/core_plugins/timelion/server/routes/functions.js
@@ -1,13 +1,13 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = function (server) {
   server.route({
     method: 'GET',
     path: '/api/timelion/functions',
     handler: function (request, reply) {
-      var functionArray = _.map(server.plugins.timelion.functions, function (val, key) {
+      const functionArray = _.map(server.plugins.timelion.functions, function (val, key) {
         // TODO: This won't work on frozen objects, it should be removed when everything is converted to datasources and chainables
-        return _.extend({}, val, {name: key});
+        return _.extend({}, val, { name: key });
       });
       reply(_.sortBy(functionArray, 'name'));
     }
diff --git a/src/core_plugins/timelion/server/routes/run.js b/src/core_plugins/timelion/server/routes/run.js
index 0855b2384959c..acac1207eefbd 100644
--- a/src/core_plugins/timelion/server/routes/run.js
+++ b/src/core_plugins/timelion/server/routes/run.js
@@ -1,11 +1,10 @@
-var Promise = require('bluebird');
-var _ = require('lodash');
-var Boom = require('boom');
-var chainRunnerFn = require('../handlers/chain_runner.js');
-var timelionDefaults = require('../lib/get_namespaced_settings')();
+import Promise from 'bluebird';
+import _ from 'lodash';
+import chainRunnerFn from '../handlers/chain_runner.js';
+const timelionDefaults = require('../lib/get_namespaced_settings')();
 
 function replyWithError(e, reply) {
-  reply({title: e.toString(), message: e.toString(), stack: e.stack}).code(400);
+  reply({ title: e.toString(), message: e.toString(), stack: e.stack }).code(400);
 }
 
 
@@ -20,13 +19,13 @@ module.exports = (server) => {
       // before every request. This just sucks because its going to slow things
       // down. Meh.
       return server.uiSettings().getAll().then((uiSettings) => {
-        var sheet;
-        var tlConfig = require('../handlers/lib/tl_config.js')({
+        let sheet;
+        const tlConfig = require('../handlers/lib/tl_config.js')({
           server: server,
           request: request,
           settings: _.defaults(uiSettings, timelionDefaults) // Just in case they delete some setting.
         });
-        var chainRunner = chainRunnerFn(tlConfig);
+        const chainRunner = chainRunnerFn(tlConfig);
 
         try {
           sheet = chainRunner.processRequest(request.payload || {
@@ -44,7 +43,7 @@ module.exports = (server) => {
         }
 
         return Promise.all(sheet).then((sheet) => {
-          var response = {
+          const response = {
             sheet: sheet,
             stats: chainRunner.getStats()
           };
diff --git a/src/core_plugins/timelion/server/routes/validate_es.js b/src/core_plugins/timelion/server/routes/validate_es.js
index 482c2fdac4d07..1796e2449a02e 100644
--- a/src/core_plugins/timelion/server/routes/validate_es.js
+++ b/src/core_plugins/timelion/server/routes/validate_es.js
@@ -5,11 +5,11 @@ module.exports = function (server) {
     handler: function (request, reply) {
 
       return server.uiSettings().getAll().then((uiSettings) => {
-        var callWithRequest = server.plugins.elasticsearch.callWithRequest;
+        const callWithRequest = server.plugins.elasticsearch.callWithRequest;
 
-        var timefield = uiSettings['timelion:es.timefield'];
+        const timefield = uiSettings['timelion:es.timefield'];
 
-        var body = {
+        const body = {
           index: uiSettings['es.default_index'],
           fields:timefield
         };
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/abs.js b/src/core_plugins/timelion/server/series_functions/__tests__/abs.js
index a9b10c1aa13a7..9af32627af6b7 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/abs.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/abs.js
@@ -1,20 +1,20 @@
-var filename = require('path').basename(__filename);
-var fn = require(`../${filename}`);
+const filename = require('path').basename(__filename);
+const fn = require(`../${filename}`);
 
-var _ = require('lodash');
-var expect = require('chai').expect;
-var seriesList = require('./fixtures/seriesList.js')();
-var invoke = require('./helpers/invoke_series_fn.js');
+import _ from 'lodash';
+const expect = require('chai').expect;
+const seriesList = require('./fixtures/seriesList.js')();
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, function () {
   it('should return the positive value of every value', function () {
 
     return invoke(fn, [seriesList]).then(function (result) {
-      var before = _.filter(result.input[0].list[0].data, function (point) {
+      const before = _.filter(result.input[0].list[0].data, function (point) {
         return (point[1] < 0);
       });
 
-      var after = _.filter(result.output.list[0].data, function (point) {
+      const after = _.filter(result.output.list[0].data, function (point) {
         return (point[1] < 0);
       });
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/bars.js b/src/core_plugins/timelion/server/series_functions/__tests__/bars.js
index fc3156ed08047..dc3a12db0daf8 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/bars.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/bars.js
@@ -1,20 +1,20 @@
-var filename = require('path').basename(__filename);
-var fn = require(`../${filename}`);
+const filename = require('path').basename(__filename);
+const fn = require(`../${filename}`);
 
-var _ = require('lodash');
-var expect = require('chai').expect;
-var invoke = require('./helpers/invoke_series_fn.js');
+import _ from 'lodash';
+const expect = require('chai').expect;
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
-  var seriesList;
+  let seriesList;
   beforeEach(() => {
     seriesList = require('./fixtures/seriesList.js')();
   });
 
   it('creates the bars property, with defaults, on all series', () => {
     return invoke(fn, [seriesList]).then((r) => {
-      var bars = _.map(r.output.list, 'bars');
+      const bars = _.map(r.output.list, 'bars');
       _.each(bars, (bar) => expect(bar).to.be.a('object'));
       _.each(bars, (bar) => expect(bar.lineWidth).to.equal(6));
       _.each(bars, (bar) => expect(bar.show).to.equal(1));
@@ -22,9 +22,9 @@ describe(filename, () => {
   });
 
   it('leaves existing bars alone when called without option, if they exist', () => {
-    seriesList.list[0].bars = {foo: true};
+    seriesList.list[0].bars = { foo: true };
     return invoke(fn, [seriesList]).then((r) => {
-      var bars = _.map(r.output.list, 'bars');
+      const bars = _.map(r.output.list, 'bars');
       expect(bars[0].foo).to.equal(true);
       expect(bars[1].foo).to.equal(undefined);
     });
@@ -32,7 +32,7 @@ describe(filename, () => {
 
   it('sets lineWidth and show to the same value', () => {
     return invoke(fn, [seriesList, 0]).then((r) => {
-      var bars = _.map(r.output.list, 'bars');
+      const bars = _.map(r.output.list, 'bars');
       expect(bars[0].lineWidth).to.equal(0);
       expect(bars[0].show).to.equal(0);
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/color.js b/src/core_plugins/timelion/server/series_functions/__tests__/color.js
index 5328b751c9d59..40c40cb5ed902 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/color.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/color.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/condition.js b/src/core_plugins/timelion/server/series_functions/__tests__/condition.js
index 21c696a8f0072..d1ffead1aaab6 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/condition.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/condition.js
@@ -1,15 +1,15 @@
-var filename = require('path').basename(__filename);
-var fn = require(`../${filename}`);
-var moment = require('moment');
-var expect = require('chai').expect;
-var invoke = require('./helpers/invoke_series_fn.js');
-var getSeriesList = require('./helpers/get_single_series_list');
-var _ = require('lodash');
+const filename = require('path').basename(__filename);
+const fn = require(`../${filename}`);
+import moment from 'moment';
+const expect = require('chai').expect;
+import invoke from './helpers/invoke_series_fn.js';
+import getSeriesList from './helpers/get_single_series_list';
+import _ from 'lodash';
 
 describe(filename, function () {
 
-  var comparable;
-  var seriesList;
+  let comparable;
+  let seriesList;
   beforeEach(function () {
     seriesList = require('./fixtures/seriesList.js')();
     comparable = getSeriesList('',[
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/cusum.js b/src/core_plugins/timelion/server/series_functions/__tests__/cusum.js
index 5fd36227519cb..612cb32eb342d 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/cusum.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/cusum.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/derivative.js b/src/core_plugins/timelion/server/series_functions/__tests__/derivative.js
index 2e1751a1f6474..48deddd0caf18 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/derivative.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/derivative.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/divide.js b/src/core_plugins/timelion/server/series_functions/__tests__/divide.js
index de5e5ee5f942e..403734d2a7964 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/divide.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/divide.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/es.js b/src/core_plugins/timelion/server/series_functions/__tests__/es.js
index 6e227b49889e5..de6db2e0490e0 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/es.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/es.js
@@ -9,28 +9,28 @@ import esResponse from './fixtures/es_response';
 
 import Promise from 'bluebird';
 import _ from 'lodash';
-import {expect} from 'chai';
+import { expect } from 'chai';
 import invoke from './helpers/invoke_series_fn.js';
 
 function stubResponse(response) {
   return {
-    server: {plugins:{
+    server: { plugins:{
       elasticsearch: {
         callWithRequest: function () {
           return Promise.resolve(response);
         }
       }
-    }}
+    } }
   };
 }
 
 describe(filename, () => {
-  var tlConfig;
+  let tlConfig;
 
   describe('seriesList processor', () => {
     it('throws an error then the index is missing', () => {
       tlConfig = stubResponse({
-        _shards: {total: 0}
+        _shards: { total: 0 }
       });
       return invoke(es, [5], tlConfig)
       .then(expect.fail)
@@ -50,7 +50,6 @@ describe(filename, () => {
 
 
   describe('createDateAgg', () => {
-    const createDateAgg = require('../es/lib/create_date_agg');
     let tlConfig;
     let config;
     let agg;
@@ -91,8 +90,8 @@ describe(filename, () => {
       it('adds a metric agg for each metric', () => {
         config.metric = ['sum:beer', 'avg:bytes'];
         agg = createDateAgg(config, tlConfig);
-        expect(agg.time_buckets.aggs['sum(beer)']).to.eql({sum: {field: 'beer'}});
-        expect(agg.time_buckets.aggs['avg(bytes)']).to.eql({avg: {field: 'bytes'}});
+        expect(agg.time_buckets.aggs['sum(beer)']).to.eql({ sum: { field: 'beer' } });
+        expect(agg.time_buckets.aggs['avg(bytes)']).to.eql({ avg: { field: 'bytes' } });
       });
 
       it('has a special `count` metric that uses a script', () => {
@@ -102,7 +101,6 @@ describe(filename, () => {
         expect(agg.time_buckets.aggs.count.bucket_script.buckets_path).to.eql('_count');
       });
     });
-
   });
 
   describe('buildRequest', () => {
@@ -150,43 +148,42 @@ describe(filename, () => {
             from: 1,
             to: 5,
           },
-          request: {payload: {extended: {es: {filter:{
+          request: { payload: { extended: { es: { filter:{
             bool: {
               must: [
-                {query: {query_string: {query: 'foo'}}}
+                { query: { query_string: { query: 'foo' } } }
               ],
               must_not: [
-                {query: {query_string: {query: 'bar'}}},
-                {query: {query_string: {query: 'baz'}}}
+                { query: { query_string: { query: 'bar' } } },
+                { query: { query_string: { query: 'baz' } } }
               ]
             }
-          }}}}}
+          } } } } }
         });
       });
 
       it('adds the contents of payload.extended.es.filter to a filter clause of the bool', () => {
         config.kibana = true;
-        let request = fn(config, tlConfig);
-        let filter = request.body.query.bool.filter.bool;
+        const request = fn(config, tlConfig);
+        const filter = request.body.query.bool.filter.bool;
         expect(filter.must.length).to.eql(1);
         expect(filter.must_not.length).to.eql(2);
       });
 
       it('does not include filters if config.kibana = false', () => {
         config.kibana = false;
-        let request = fn(config, tlConfig);
-        let filter = request.body.query.bool.filter;
+        const request = fn(config, tlConfig);
         expect(request.body.query.bool.filter).to.eql(undefined);
       });
 
       it('adds a time filter to the bool querys must clause', () => {
         let request = fn(config, tlConfig);
         expect(request.body.query.bool.must.length).to.eql(1);
-        expect(request.body.query.bool.must[0]).to.eql({range: {'@timestamp': {
+        expect(request.body.query.bool.must[0]).to.eql({ range: { '@timestamp': {
           lte: 5,
           gte: 1,
           format: 'epoch_millis'
-        }}});
+        } } });
 
         config.kibana = true;
         request = fn(config, tlConfig);
@@ -213,7 +210,7 @@ describe(filename, () => {
   describe('Aggregation flattening', () => {
     let config;
     beforeEach(() => {
-      config = {fit: 'nearest'};
+      config = { fit: 'nearest' };
     });
 
     describe('timeBucketsToPairs', () => {
@@ -221,9 +218,9 @@ describe(filename, () => {
 
       it('Should convert a single metric agg', () => {
         const buckets = [
-          {key: 1000, count: {value: 3}},
-          {key: 2000, count: {value: 14}},
-          {key: 3000, count: {value: 15}}
+          { key: 1000, count: { value: 3 } },
+          { key: 2000, count: { value: 14 } },
+          { key: 3000, count: { value: 15 } }
         ];
 
         expect(fn(buckets)).to.eql({
@@ -233,9 +230,9 @@ describe(filename, () => {
 
       it('Should convert multiple metric aggs', () => {
         const buckets = [
-          {key: 1000, count: {value: 3},  max: {value: 92}},
-          {key: 2000, count: {value: 14}, max: {value: 65}},
-          {key: 3000, count: {value: 15}, max: {value: 35}}
+          { key: 1000, count: { value: 3 },  max: { value: 92 } },
+          { key: 2000, count: { value: 14 }, max: { value: 65 } },
+          { key: 3000, count: { value: 15 }, max: { value: 35 } }
         ];
 
         expect(fn(buckets)).to.eql({
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/first.js b/src/core_plugins/timelion/server/series_functions/__tests__/first.js
index febe0a47e7890..c9b13ab82c2bf 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/first.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/first.js
@@ -1,9 +1,9 @@
-var filename = require('path').basename(__filename);
-var fn = require(`../${filename}`);
+const filename = require('path').basename(__filename);
+const fn = require(`../${filename}`);
 
-var expect = require('chai').expect;
-var seriesList = require('./fixtures/seriesList.js')();
-var invoke = require('./helpers/invoke_series_fn.js');
+const expect = require('chai').expect;
+const seriesList = require('./fixtures/seriesList.js')();
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, function () {
   it('should return exactly the data input', function () {
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/fit.js b/src/core_plugins/timelion/server/series_functions/__tests__/fit.js
index 6caba53691183..216f39841ed45 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/fit.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/fit.js
@@ -1,16 +1,16 @@
-var filename = require('path').basename(__filename);
-var fn = require(`../${filename}`);
-var moment = require('moment');
-var expect = require('chai').expect;
-var invoke = require('./helpers/invoke_series_fn.js');
-var getSeriesList = require('./helpers/get_single_series_list');
-var _ = require('lodash');
+const filename = require('path').basename(__filename);
+const fn = require(`../${filename}`);
+import moment from 'moment';
+const expect = require('chai').expect;
+import invoke from './helpers/invoke_series_fn.js';
+import getSeriesList from './helpers/get_single_series_list';
+import _ from 'lodash';
 
 describe(filename, function () {
 
   describe('carry', function () {
     it('should maintain the previous value until it changes', function () {
-      var seriesList = getSeriesList('',[
+      const seriesList = getSeriesList('',[
         [moment.utc('1980-01-01T00:00:00.000Z'), 5],
         [moment.utc('1981-01-01T00:00:00.000Z'), null],
         [moment.utc('1982-01-01T00:00:00.000Z'), 3.4],
@@ -27,7 +27,7 @@ describe(filename, function () {
 
   describe('nearest', function () {
     it('should use the closest temporal value to fill the null', function () {
-      var seriesList = getSeriesList('',[
+      const seriesList = getSeriesList('',[
         [moment.utc('1980-01-01T00:00:00.000Z'), 5],
         [moment.utc('1981-01-01T00:00:00.000Z'), null],
         [moment.utc('1981-05-01T00:00:00.000Z'), 3.4],
@@ -46,7 +46,7 @@ describe(filename, function () {
 
   describe('average', function () {
     it('should produce a smooth, straight line between points', function () {
-      var seriesList = getSeriesList('',[
+      const seriesList = getSeriesList('',[
         [moment.utc('1980-01-01T00:00:00.000Z'), 10],
         [moment.utc('1981-07-01T00:00:00.000Z'), null],
         [moment.utc('1982-01-01T00:00:00.000Z'), null],
@@ -64,7 +64,7 @@ describe(filename, function () {
 
   describe('scale', function () {
     it('should distribute the next points value across the preceeding nulls', function () {
-      var seriesList = getSeriesList('', [
+      const seriesList = getSeriesList('', [
         [moment.utc('1980-01-01T00:00:00.000Z'), 10],
         [moment.utc('1981-07-01T00:00:00.000Z'), null],
         [moment.utc('1982-01-01T00:00:00.000Z'), null],
@@ -80,7 +80,7 @@ describe(filename, function () {
 
   describe('none', function () {
     it('basically just drops the nulls. This is going to screw you', function () {
-      var seriesList = getSeriesList('', [
+      const seriesList = getSeriesList('', [
         [moment.utc('1980-01-01T00:00:00.000Z'), 10],
         [moment.utc('1981-07-01T00:00:00.000Z'), null],
         [moment.utc('1982-01-01T00:00:00.000Z'), null],
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/bucketList.js b/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/bucketList.js
index 04cdc0f3f47c6..dcf54dd88b037 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/bucketList.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/bucketList.js
@@ -1,4 +1,4 @@
-var moment = require('moment');
+import moment from 'moment';
 
 module.exports = [
   moment('1980-01-01T00:00:00.000Z'),
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/es_response.js b/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/es_response.js
index 7a256c71e0617..21d497160eafe 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/es_response.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/es_response.js
@@ -14,31 +14,31 @@ module.exports = {
   },
   aggregations: {
     q: {
-      meta: {type: 'split'},
+      meta: { type: 'split' },
       buckets: {
         QueryA: {
           FieldA: {
-            meta: {type: 'split'},
+            meta: { type: 'split' },
             buckets: [
               {
                 key: 'ValueA',
                 FieldB: {
-                  meta: {type: 'split'},
+                  meta: { type: 'split' },
                   buckets: [
                     {
                       key: 'Value2A',
                       time_buckets: {
-                        meta: {type: 'time_buckets'},
+                        meta: { type: 'time_buckets' },
                         buckets: [
                           {
                             key: 1000,
-                            MetricA: {value: 264},
-                            MetricB: {value: 398}
+                            MetricA: { value: 264 },
+                            MetricB: { value: 398 }
                           },
                           {
                             key: 2000,
-                            MetricA: {value: 264},
-                            MetricB: {value: 1124}
+                            MetricA: { value: 264 },
+                            MetricB: { value: 1124 }
                           }
                         ]
                       }
@@ -46,17 +46,17 @@ module.exports = {
                     {
                       key: 'Value2B',
                       time_buckets: {
-                        meta: {type: 'time_buckets'},
+                        meta: { type: 'time_buckets' },
                         buckets: [
                           {
                             key: 1000,
-                            MetricA: {value: 699},
-                            MetricB: {value: 457}
+                            MetricA: { value: 699 },
+                            MetricB: { value: 457 }
                           },
                           {
                             key: 2000,
-                            MetricA: {value: 110},
-                            MetricB: {value: 506}
+                            MetricA: { value: 110 },
+                            MetricB: { value: 506 }
                           }
                         ]
                       }
@@ -67,22 +67,22 @@ module.exports = {
               {
                 key: 'ValueB',
                 FieldB: {
-                  meta: {type: 'split'},
+                  meta: { type: 'split' },
                   buckets: [
                     {
                       key: 'Value2B',
                       time_buckets: {
-                        meta: {type: 'time_buckets'},
+                        meta: { type: 'time_buckets' },
                         buckets: [
                           {
                             key: 1000,
-                            MetricA: {value: 152},
-                            MetricB: {value: 61}
+                            MetricA: { value: 152 },
+                            MetricB: { value: 61 }
                           },
                           {
                             key: 2000,
-                            MetricA: {value: 518},
-                            MetricB: {value: 77}
+                            MetricA: { value: 518 },
+                            MetricB: { value: 77 }
                           }
                         ]
                       }
@@ -90,17 +90,17 @@ module.exports = {
                     {
                       key: 'Value2A',
                       time_buckets: {
-                        meta: {type: 'time_buckets'},
+                        meta: { type: 'time_buckets' },
                         buckets: [
                           {
                             key: 1000,
-                            MetricA: {value: 114},
-                            MetricB: {value: 23}
+                            MetricA: { value: 114 },
+                            MetricB: { value: 23 }
                           },
                           {
                             key: 2000,
-                            MetricA: {value: 264},
-                            MetricB: {value: 45}
+                            MetricA: { value: 264 },
+                            MetricB: { value: 45 }
                           }
                         ]
                       }
@@ -113,27 +113,27 @@ module.exports = {
         },
         QueryB: {
           FieldA: {
-            meta: {type: 'split'},
+            meta: { type: 'split' },
             buckets: [
               {
                 key: 'ValueA',
                 FieldB: {
-                  meta: {type: 'split'},
+                  meta: { type: 'split' },
                   buckets: [
                     {
                       key: 'Value2B',
                       time_buckets: {
-                        meta: {type: 'time_buckets'},
+                        meta: { type: 'time_buckets' },
                         buckets: [
                           {
                             key: 1000,
-                            MetricA: {value: 621},
-                            MetricB: {value: 12}
+                            MetricA: { value: 621 },
+                            MetricB: { value: 12 }
                           },
                           {
                             key: 2000,
-                            MetricA: {value: 751},
-                            MetricB: {value: 12}
+                            MetricA: { value: 751 },
+                            MetricB: { value: 12 }
                           }
                         ]
                       }
@@ -141,17 +141,17 @@ module.exports = {
                     {
                       key: 'Value2A',
                       time_buckets: {
-                        meta: {type: 'time_buckets'},
+                        meta: { type: 'time_buckets' },
                         buckets: [
                           {
                             key: 1000,
-                            MetricA: {value: 110},
-                            MetricB: {value: 11}
+                            MetricA: { value: 110 },
+                            MetricB: { value: 11 }
                           },
                           {
                             key: 2000,
-                            MetricA: {value: 648},
-                            MetricB: {value: 12}
+                            MetricA: { value: 648 },
+                            MetricB: { value: 12 }
                           }
                         ]
                       }
@@ -162,22 +162,22 @@ module.exports = {
               {
                 key: 'ValueC',
                 FieldB: {
-                  meta: {type: 'split'},
+                  meta: { type: 'split' },
                   buckets: [
                     {
                       key: 'Value2C',
                       time_buckets: {
-                        meta: {type: 'time_buckets'},
+                        meta: { type: 'time_buckets' },
                         buckets: [
                           {
                             key: 1000,
-                            MetricA: {value: 755},
-                            MetricB: {value: 10}
+                            MetricA: { value: 755 },
+                            MetricB: { value: 10 }
                           },
                           {
                             key: 2000,
-                            MetricA: {value: 713},
-                            MetricB: {value: 18}
+                            MetricA: { value: 713 },
+                            MetricB: { value: 18 }
                           }
                         ]
                       }
@@ -185,17 +185,17 @@ module.exports = {
                     {
                       key: 'Value2A',
                       time_buckets: {
-                        meta: {type: 'time_buckets'},
+                        meta: { type: 'time_buckets' },
                         buckets: [
                           {
                             key: 1000,
-                            MetricA: {value: 391},
-                            MetricB: {value: 4}
+                            MetricA: { value: 391 },
+                            MetricB: { value: 4 }
                           },
                           {
                             key: 2000,
-                            MetricA: {value: 802},
-                            MetricB: {value: 4}
+                            MetricA: { value: 802 },
+                            MetricB: { value: 4 }
                           }
                         ]
                       }
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/seriesList.js b/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/seriesList.js
index 9d094541d2195..6ce724148474b 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/seriesList.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/seriesList.js
@@ -1,8 +1,6 @@
-var Promise = require('bluebird');
-var buckets = require('./bucketList');
-var getSeries = require('../helpers/get_series');
-var getSeriesList = require('../helpers/get_series_list');
-var _ = require('lodash');
+import buckets from './bucketList';
+import getSeries from '../helpers/get_series';
+import getSeriesList from '../helpers/get_series_list';
 
 module.exports = function () {
   return getSeriesList([
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/tlConfig.js b/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/tlConfig.js
index 586c7e3b7b981..4ee1b6e99e619 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/tlConfig.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/fixtures/tlConfig.js
@@ -1,8 +1,8 @@
-var moment = require('moment');
-var timelionDefaults = require('../../../lib/get_namespaced_settings');
+import moment from 'moment';
+import timelionDefaults from '../../../lib/get_namespaced_settings';
 
 module.exports = function () {
-  var tlConfig = require('../../../handlers/lib/tl_config.js')({
+  const tlConfig = require('../../../handlers/lib/tl_config.js')({
     server: {},
     request: {}
   });
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/graphite.js b/src/core_plugins/timelion/server/series_functions/__tests__/graphite.js
index 8bdb12e446c86..dfec0c214516b 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/graphite.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/graphite.js
@@ -1,9 +1,8 @@
-var proxyquire =  require('proxyquire');
-var Promise = require('bluebird');
-var _ = require('lodash');
-var expect = require('chai').expect;
+import proxyquire from 'proxyquire';
+import Promise from 'bluebird';
+const expect = require('chai').expect;
 
-var graphiteResponse = function (url) {
+const graphiteResponse = function () {
   return Promise.resolve({
     json: function () {
       return [{
@@ -19,10 +18,10 @@ var graphiteResponse = function (url) {
   });
 };
 
-var filename = require('path').basename(__filename);
-var fn = proxyquire(`../${filename}`, {'node-fetch': graphiteResponse});
+const filename = require('path').basename(__filename);
+const fn = proxyquire(`../${filename}`, { 'node-fetch': graphiteResponse });
 
-var invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, function () {
   it('should wrap the graphite response up in a seriesList', function () {
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/helpers/get_series.js b/src/core_plugins/timelion/server/series_functions/__tests__/helpers/get_series.js
index 7f8268793f685..e3bf2364e6586 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/helpers/get_series.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/helpers/get_series.js
@@ -1,7 +1,7 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = function getSeries(name, buckets, points) {
-  var fill = _.partial(_.zip, _.map(buckets, function (bucket) { return bucket.valueOf(); }));
+  const fill = _.partial(_.zip, _.map(buckets, function (bucket) { return bucket.valueOf(); }));
   return {
     data:  fill(points),
     type: 'series',
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/helpers/get_series_list.js b/src/core_plugins/timelion/server/series_functions/__tests__/helpers/get_series_list.js
index a55d824a09c31..3e1b957089df5 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/helpers/get_series_list.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/helpers/get_series_list.js
@@ -1,4 +1,4 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = function (list, overrides) {
   return _.merge({
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/helpers/get_single_series_list.js b/src/core_plugins/timelion/server/series_functions/__tests__/helpers/get_single_series_list.js
index aef77fb0a646a..53f6ef0694ed0 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/helpers/get_single_series_list.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/helpers/get_single_series_list.js
@@ -1,6 +1,6 @@
-var getSeries = require('../helpers/get_series');
-var getSeriesList = require('../helpers/get_series_list');
-var _ = require('lodash');
+import getSeries from '../helpers/get_series';
+import getSeriesList from '../helpers/get_series_list';
+import _ from 'lodash';
 
 module.exports = function (name, data) {
   return getSeriesList([getSeries(name, _.map(data, 0), _.map(data, 1))]);
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/helpers/invoke_series_fn.js b/src/core_plugins/timelion/server/series_functions/__tests__/helpers/invoke_series_fn.js
index 1e4ff72e52ddf..28b5333788926 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/helpers/invoke_series_fn.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/helpers/invoke_series_fn.js
@@ -1,18 +1,17 @@
-// invokes a series_function with the specified arguments
-var _ = require('lodash');
-var indexArguments = require('../../../handlers/lib/index_arguments');
+import _ from 'lodash';
+import indexArguments from '../../../handlers/lib/index_arguments';
 
 module.exports = function invokeSeriesFn(fnDef, args, tlConfigOverrides) {
-  var tlConfig = _.merge(require('../fixtures/tlConfig')(), tlConfigOverrides);
+  const tlConfig = _.merge(require('../fixtures/tlConfig')(), tlConfigOverrides);
 
   return Promise.all(args).then(function (args) {
     args.byName = indexArguments(fnDef, args);
 
-    var input = _.cloneDeep(args);
+    const input = _.cloneDeep(args);
 
     return Promise.resolve(fnDef.originalFn(args, tlConfig)).then(function (output) {
 
-      var result = {
+      const result = {
         output: output,
         input: input
       };
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/hide.js b/src/core_plugins/timelion/server/series_functions/__tests__/hide.js
index 918cf94a6cb2f..007316c645403 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/hide.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/hide.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/label.js b/src/core_plugins/timelion/server/series_functions/__tests__/label.js
index f865b6f90e359..31d4bc28a471e 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/label.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/label.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/legend.js b/src/core_plugins/timelion/server/series_functions/__tests__/legend.js
index deaf584839a8b..1f821e98b6772 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/legend.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/legend.js
@@ -1,9 +1,8 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
@@ -15,7 +14,7 @@ describe(filename, () => {
   it('should create the _global object if it does not exist', () => {
     expect(seriesList.list[0]._global).to.equal(undefined);
     return invoke(fn, [seriesList, 'nw', 3]).then((r) => {
-      expect(r.output.list[0]._global).to.eql({legend:{noColumns: 3, position: 'nw'}});
+      expect(r.output.list[0]._global).to.eql({ legend:{ noColumns: 3, position: 'nw' } });
     });
   });
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/lines.js b/src/core_plugins/timelion/server/series_functions/__tests__/lines.js
index f0a9de1b3b73f..172232bd90535 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/lines.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/lines.js
@@ -1,9 +1,8 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/log.js b/src/core_plugins/timelion/server/series_functions/__tests__/log.js
index eb441b8213dc9..f859752a0d0fc 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/log.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/log.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/max.js b/src/core_plugins/timelion/server/series_functions/__tests__/max.js
index f27e276cf94fa..7c185e18a3f75 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/max.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/max.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/min.js b/src/core_plugins/timelion/server/series_functions/__tests__/min.js
index 322efa5436c62..2a662d3545379 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/min.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/min.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/movingaverage.js b/src/core_plugins/timelion/server/series_functions/__tests__/movingaverage.js
index 2ab788916382c..cae2a99f7cb2c 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/movingaverage.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/movingaverage.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/movingstd.js b/src/core_plugins/timelion/server/series_functions/__tests__/movingstd.js
index f3d29f2a4e7a3..e0617876a3040 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/movingstd.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/movingstd.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
@@ -14,7 +14,7 @@ describe(filename, () => {
 
   it('computes the moving standard deviation of a list', () => {
     return invoke(fn, [seriesList, 2]).then((r) => {
-      var values = _.map(r.output.list[1].data, 1);
+      const values = _.map(r.output.list[1].data, 1);
       expect(values[0]).to.equal(null);
       expect(values[1]).to.equal(null);
       expect(values[2]).to.be.within(26, 27);
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/multiply.js b/src/core_plugins/timelion/server/series_functions/__tests__/multiply.js
index 7761a59588195..ab25a95b382e4 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/multiply.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/multiply.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/points.js b/src/core_plugins/timelion/server/series_functions/__tests__/points.js
index 2f3155742b8bf..372a92ce5ccea 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/points.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/points.js
@@ -1,10 +1,10 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
-const assert = require('chai');
+import _ from 'lodash';
+import assert from 'chai';
 const expect = assert.expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
@@ -44,7 +44,7 @@ describe(filename, () => {
   });
 
   describe('symbol', () => {
-    var symbols = ['triangle', 'cross', 'square', 'diamond', 'circle'];
+    const symbols = ['triangle', 'cross', 'square', 'diamond', 'circle'];
     _.each(symbols, (symbol) => {
       it(`is ${symbol}`, () => {
         return invoke(fn, [seriesList, null, null, null, null, symbol]).then((r) => {
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/precision.js b/src/core_plugins/timelion/server/series_functions/__tests__/precision.js
index afa58aa39001c..4f00cba224b63 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/precision.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/precision.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/quandl.js b/src/core_plugins/timelion/server/series_functions/__tests__/quandl.js
index b191f594b041b..3e98f2fb93a9f 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/quandl.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/quandl.js
@@ -1,20 +1,19 @@
-var proxyquire =  require('proxyquire');
-var Promise = require('bluebird');
-var _ = require('lodash');
-const assert = require('chai');
+import proxyquire from 'proxyquire';
+import Promise from 'bluebird';
+import assert from 'chai';
 const expect = assert.expect;
 
-var parseURL = require('url').parse;
-var parseQueryString = require('querystring').parse;
-var tlConfig = require('./fixtures/tlConfig')();
-var moment = require('moment');
+const parseURL = require('url').parse;
+const parseQueryString = require('querystring').parse;
+const tlConfig = require('./fixtures/tlConfig')();
+import moment from 'moment';
 
-var filename = require('path').basename(__filename);
-var invoke = require('./helpers/invoke_series_fn.js');
+const filename = require('path').basename(__filename);
+import invoke from './helpers/invoke_series_fn.js';
 
-var fn;
-var response;
-var calledWith;
+let fn;
+let response;
+let calledWith;
 describe(filename, function () {
 
   beforeEach(function () {
@@ -37,7 +36,7 @@ describe(filename, function () {
         }
       });
     };
-    fn = proxyquire(`../${filename}`, {'node-fetch': response});
+    fn = proxyquire(`../${filename}`, { 'node-fetch': response });
   });
 
   it('should wrap the quandl response up in a seriesList', function () {
@@ -67,7 +66,7 @@ describe(filename, function () {
   });
 
   it('should throw an error is passed an unsupported interval', function () {
-    return invoke(fn, [], {time:{interval:'2d'}})
+    return invoke(fn, [], { time:{ interval:'2d' } })
     .then(expect.fail)
     .catch(function (r) {
       expect(r).to.be.an('error');
@@ -75,7 +74,7 @@ describe(filename, function () {
   });
 
   it('should use the configured API key when talking to quandl', function () {
-    return invoke(fn, [], {settings:{'timelion:quandl.key': 'bEeR'}}).then(function () {
+    return invoke(fn, [], { settings:{ 'timelion:quandl.key': 'bEeR' } }).then(function () {
       expect(calledWith.params.auth_token).to.eql('bEeR');
     });
   });
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/range.js b/src/core_plugins/timelion/server/series_functions/__tests__/range.js
index 13b3dc218a743..1e5ae77249706 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/range.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/range.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/scale_interval.js b/src/core_plugins/timelion/server/series_functions/__tests__/scale_interval.js
index bd717795a0abd..6b6e8c681e2f7 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/scale_interval.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/scale_interval.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/static.js b/src/core_plugins/timelion/server/series_functions/__tests__/static.js
index e3053725d96d7..24cb74567db80 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/static.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/static.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
   it('returns a series in which all numbers are the same', () => {
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/subtract.js b/src/core_plugins/timelion/server/series_functions/__tests__/subtract.js
index eb98826a0b31a..9be48626d8811 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/subtract.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/subtract.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/sum.js b/src/core_plugins/timelion/server/series_functions/__tests__/sum.js
index 57a8c3b7e4a33..566982b365071 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/sum.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/sum.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/title.js b/src/core_plugins/timelion/server/series_functions/__tests__/title.js
index 5257a0c97119d..36cca365d9dd0 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/title.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/title.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/trim.js b/src/core_plugins/timelion/server/series_functions/__tests__/trim.js
index b58d279411cfc..5a09a9e7b217a 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/trim.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/trim.js
@@ -1,9 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
 
-const _ = require('lodash');
+import _ from 'lodash';
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/yaxis.js b/src/core_plugins/timelion/server/series_functions/__tests__/yaxis.js
index 45d0105e3ff52..0c3db5e403853 100644
--- a/src/core_plugins/timelion/server/series_functions/__tests__/yaxis.js
+++ b/src/core_plugins/timelion/server/series_functions/__tests__/yaxis.js
@@ -1,10 +1,9 @@
 const filename = require('path').basename(__filename);
 const fn = require(`../${filename}`);
-const Promise = require('bluebird');
+import Promise from 'bluebird';
 
-const _ = require('lodash');
 const expect = require('chai').expect;
-const invoke = require('./helpers/invoke_series_fn.js');
+import invoke from './helpers/invoke_series_fn.js';
 
 describe(filename, () => {
 
diff --git a/src/core_plugins/timelion/server/series_functions/abs.js b/src/core_plugins/timelion/server/series_functions/abs.js
index e05fc0dcd0087..590a4220be89d 100644
--- a/src/core_plugins/timelion/server/series_functions/abs.js
+++ b/src/core_plugins/timelion/server/series_functions/abs.js
@@ -1,6 +1,6 @@
-var alter = require('../lib/alter.js');
-var _ = require('lodash');
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import _ from 'lodash';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('abs', {
   args: [
     {
@@ -11,7 +11,7 @@ module.exports = new Chainable('abs', {
   help: 'Return the absolute value of each value in the series list',
   fn: function absFn(args) {
     return alter(args, function (eachSeries) {
-      var data = _.map(eachSeries.data, function (point) {
+      const data = _.map(eachSeries.data, function (point) {
         return [point[0], Math.abs(point[1])];
       });
       eachSeries.data = data;
diff --git a/src/core_plugins/timelion/server/series_functions/bars.js b/src/core_plugins/timelion/server/series_functions/bars.js
index f2600d95077a1..2af5837542961 100644
--- a/src/core_plugins/timelion/server/series_functions/bars.js
+++ b/src/core_plugins/timelion/server/series_functions/bars.js
@@ -1,5 +1,5 @@
-var alter = require('../lib/alter.js');
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('bars', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/color.js b/src/core_plugins/timelion/server/series_functions/color.js
index 0aa65431b1871..f46797876c2c2 100644
--- a/src/core_plugins/timelion/server/series_functions/color.js
+++ b/src/core_plugins/timelion/server/series_functions/color.js
@@ -1,6 +1,6 @@
-var alter = require('../lib/alter.js');
-var Chainable = require('../lib/classes/chainable');
-var tinygradient = require('tinygradient');
+import alter from '../lib/alter.js';
+import Chainable from '../lib/classes/chainable';
+import tinygradient from 'tinygradient';
 
 module.exports = new Chainable('color', {
   args: [
@@ -17,13 +17,13 @@ module.exports = new Chainable('color', {
   ],
   help: 'Change the color of the series',
   fn: function colorFn(args) {
-    var colors = args.byName.color.split(':');
+    let colors = args.byName.color.split(':');
 
     if (colors.length > 1 && args.byName.inputSeries.list.length > 1) {
       colors = tinygradient(colors).rgb(args.byName.inputSeries.list.length);
     }
 
-    var i = 0;
+    let i = 0;
     return alter(args, function (eachSeries) {
       if (colors.length === 1 || args.byName.inputSeries.list.length === 1) {
         eachSeries.color = colors[0];
diff --git a/src/core_plugins/timelion/server/series_functions/condition.js b/src/core_plugins/timelion/server/series_functions/condition.js
index 5907ab972dc48..eec00677ba668 100644
--- a/src/core_plugins/timelion/server/series_functions/condition.js
+++ b/src/core_plugins/timelion/server/series_functions/condition.js
@@ -1,7 +1,7 @@
-var alter = require('../lib/alter.js');
-var _ = require('lodash');
-var Chainable = require('../lib/classes/chainable');
-var argType = require('../handlers/lib/arg_type.js');
+import alter from '../lib/alter.js';
+import _ from 'lodash';
+import Chainable from '../lib/classes/chainable';
+import argType from '../handlers/lib/arg_type.js';
 
 module.exports = new Chainable('condition', {
   args: [
@@ -35,9 +35,9 @@ module.exports = new Chainable('condition', {
     'to the result if the condition proves true, with an optional else.',
   aliases: ['if'],
   fn: function conditionFn(args) {
-    var config = args.byName;
+    const config = args.byName;
     return alter(args, function (eachSeries) {
-      var data = _.map(eachSeries.data, function (point, i) {
+      const data = _.map(eachSeries.data, function (point, i) {
         function getNumber(source) {
           if (argType(source) === 'number') return source;
           if (argType(source) === 'null') return null;
@@ -45,11 +45,11 @@ module.exports = new Chainable('condition', {
           throw new Error ('must be a number or a seriesList');
         }
 
-        var ifVal = getNumber(config.if);
-        var thenVal = getNumber(config.then);
-        var elseVal = _.isUndefined(config.else) ? point[1] : getNumber(config.else);
+        const ifVal = getNumber(config.if);
+        const thenVal = getNumber(config.then);
+        const elseVal = _.isUndefined(config.else) ? point[1] : getNumber(config.else);
 
-        var newValue = (function () {
+        const newValue = (function () {
           switch (config.operator) {
             case 'lt':
               return point[1] <   ifVal ? thenVal : elseVal;
diff --git a/src/core_plugins/timelion/server/series_functions/cusum.js b/src/core_plugins/timelion/server/series_functions/cusum.js
index 454e11ae73852..c553dea0b0010 100644
--- a/src/core_plugins/timelion/server/series_functions/cusum.js
+++ b/src/core_plugins/timelion/server/series_functions/cusum.js
@@ -1,6 +1,6 @@
-var alter = require('../lib/alter.js');
-var _ = require('lodash');
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import _ from 'lodash';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('cusum', {
   args: [
     {
@@ -16,9 +16,9 @@ module.exports = new Chainable('cusum', {
   help: 'Return the cumulative sum of a series, starting at a base.',
   fn: function cusumFn(args) {
     return alter(args, function (eachSeries, base) {
-      var pairs = eachSeries.data;
-      var total = base || 0;
-      eachSeries.data = _.map(pairs, function (point, i) {
+      const pairs = eachSeries.data;
+      let total = base || 0;
+      eachSeries.data = _.map(pairs, function (point) {
         total += point[1];
         return [point[0], total];
       });
diff --git a/src/core_plugins/timelion/server/series_functions/derivative.js b/src/core_plugins/timelion/server/series_functions/derivative.js
index 4ec994e6dd470..ad88c82786dec 100644
--- a/src/core_plugins/timelion/server/series_functions/derivative.js
+++ b/src/core_plugins/timelion/server/series_functions/derivative.js
@@ -1,6 +1,6 @@
-var alter = require('../lib/alter.js');
-var _ = require('lodash');
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import _ from 'lodash';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('derivative', {
   args: [
     {
@@ -11,7 +11,7 @@ module.exports = new Chainable('derivative', {
   help: 'Plot the change in values over time.',
   fn: function derivativeFn(args) {
     return alter(args, function (eachSeries) {
-      var pairs = eachSeries.data;
+      const pairs = eachSeries.data;
       eachSeries.data = _.map(pairs, function (point, i) {
         if (i === 0 || pairs[i - 1][1] == null || point[1] == null) { return [point[0], null]; }
         return [point[0], point[1] - pairs[i - 1][1]];
diff --git a/src/core_plugins/timelion/server/series_functions/divide.js b/src/core_plugins/timelion/server/series_functions/divide.js
index 00264a98ab772..6b857b7bab27c 100644
--- a/src/core_plugins/timelion/server/series_functions/divide.js
+++ b/src/core_plugins/timelion/server/series_functions/divide.js
@@ -1,6 +1,5 @@
-var reduce = require('../lib/reduce.js');
-
-var Chainable = require('../lib/classes/chainable');
+import reduce from '../lib/reduce.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('divide', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/es/index.js b/src/core_plugins/timelion/server/series_functions/es/index.js
index 16b1c13fcc1bb..0075e1d22a9e2 100644
--- a/src/core_plugins/timelion/server/series_functions/es/index.js
+++ b/src/core_plugins/timelion/server/series_functions/es/index.js
@@ -1,8 +1,6 @@
-var _ = require('lodash');
-var moment = require('moment');
-var toMS = require('../../lib/to_milliseconds.js');
-var Datasource = require('../../lib/classes/datasource');
-var buildRequest = require('./lib/build_request');
+import _ from 'lodash';
+import Datasource from '../../lib/classes/datasource';
+import buildRequest from './lib/build_request';
 import toSeriesList from './lib/agg_response_to_series_list';
 
 module.exports = new Datasource('es', {
@@ -51,7 +49,7 @@ module.exports = new Datasource('es', {
   aliases: ['elasticsearch'],
   fn: function esFn(args, tlConfig) {
 
-    var config = _.defaults(_.clone(args.byName), {
+    const config = _.defaults(_.clone(args.byName), {
       q: '*',
       metric: ['count'],
       index: tlConfig.settings['timelion:es.default_index'],
@@ -61,9 +59,9 @@ module.exports = new Datasource('es', {
       fit: 'nearest'
     });
 
-    var callWithRequest = tlConfig.server.plugins.elasticsearch.callWithRequest;
+    const callWithRequest = tlConfig.server.plugins.elasticsearch.callWithRequest;
 
-    var body = buildRequest(config, tlConfig);
+    const body = buildRequest(config, tlConfig);
     return callWithRequest(tlConfig.request, 'search', body).then(function (resp) {
       if (!resp._shards.total) throw new Error('Elasticsearch index not found: ' + config.index);
       return {
diff --git a/src/core_plugins/timelion/server/series_functions/es/lib/agg_response_to_series_list.js b/src/core_plugins/timelion/server/series_functions/es/lib/agg_response_to_series_list.js
index 460f4eabe3000..c5c5c370bd976 100644
--- a/src/core_plugins/timelion/server/series_functions/es/lib/agg_response_to_series_list.js
+++ b/src/core_plugins/timelion/server/series_functions/es/lib/agg_response_to_series_list.js
@@ -1,8 +1,8 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 export function timeBucketsToPairs(buckets) {
-  var timestamps = _.pluck(buckets, 'key');
-  var series = {};
+  const timestamps = _.pluck(buckets, 'key');
+  const series = {};
   _.each(buckets, function (bucket) {
     _.forOwn(bucket, function (val, key) {
       if (_.isPlainObject(val)) {
@@ -28,7 +28,7 @@ export function flattenBucket(bucket, path, result) {
         flattenBucket(bucket, path.concat([key + ':' + bucket.key]), result);
       });
     } else if (_.get(val, 'meta.type') === 'time_buckets') {
-      var metrics = timeBucketsToPairs(val.buckets);
+      const metrics = timeBucketsToPairs(val.buckets);
       _.each(metrics, function (pairs, metricName) {
         result[path.concat([metricName]).join(' > ')] = pairs;
       });
@@ -46,4 +46,4 @@ export default function toSeriesList(aggs, config) {
       label: name
     };
   });
-};
+}
diff --git a/src/core_plugins/timelion/server/series_functions/es/lib/build_request.js b/src/core_plugins/timelion/server/series_functions/es/lib/build_request.js
index 7919f3ab7de1d..74ef045b7b4ad 100644
--- a/src/core_plugins/timelion/server/series_functions/es/lib/build_request.js
+++ b/src/core_plugins/timelion/server/series_functions/es/lib/build_request.js
@@ -1,12 +1,12 @@
-var  _ = require('lodash');
-var createDateAgg = require('./create_date_agg');
+import _ from 'lodash';
+import createDateAgg from './create_date_agg';
 
 module.exports =  function buildRequest(config, tlConfig) {
 
-  var bool = {must: [], must_not: []};
+  const bool = { must: [], must_not: [] };
 
-  var timeFilter = {range:{}};
-  timeFilter.range[config.timefield] = {gte: tlConfig.time.from, lte: tlConfig.time.to, format: 'epoch_millis'};
+  const timeFilter = { range:{} };
+  timeFilter.range[config.timefield] = { gte: tlConfig.time.from, lte: tlConfig.time.to, format: 'epoch_millis' };
   bool.must.push(timeFilter);
 
   // Use the kibana filter bar filters
@@ -14,25 +14,25 @@ module.exports =  function buildRequest(config, tlConfig) {
     bool.filter = _.get(tlConfig, 'request.payload.extended.es.filter') || {};
   }
 
-  var aggs = {
+  const aggs = {
     'q': {
-      meta: {type: 'split'},
+      meta: { type: 'split' },
       filters: {
         filters: _.chain(config.q).map(function (q) {
-          return [q, {query_string:{query: q}}];
+          return [q, { query_string:{ query: q } }];
         }).zipObject().value(),
       },
       aggs: {}
     }
   };
 
-  var aggCursor = aggs.q.aggs;
+  let aggCursor = aggs.q.aggs;
 
-  _.each(config.split, function (clause, i) {
+  _.each(config.split, function (clause) {
     clause = clause.split(':');
     if (clause[0] && clause[1]) {
       aggCursor[clause[0]] = {
-        meta: {type: 'split'},
+        meta: { type: 'split' },
         terms: {
           field: clause[0],
           size: parseInt(clause[1], 10)
diff --git a/src/core_plugins/timelion/server/series_functions/es/lib/create_date_agg.js b/src/core_plugins/timelion/server/series_functions/es/lib/create_date_agg.js
index e10d528195b85..0399b62c73f54 100644
--- a/src/core_plugins/timelion/server/series_functions/es/lib/create_date_agg.js
+++ b/src/core_plugins/timelion/server/series_functions/es/lib/create_date_agg.js
@@ -1,9 +1,9 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = function createDateAgg(config, tlConfig) {
-  var dateAgg = {
+  const dateAgg = {
     time_buckets: {
-      meta: {type: 'time_buckets'},
+      meta: { type: 'time_buckets' },
       date_histogram: {
         field: config.timefield,
         interval: config.interval,
@@ -18,7 +18,7 @@ module.exports = function createDateAgg(config, tlConfig) {
   };
 
   dateAgg.time_buckets.aggs = {};
-  _.each(config.metric, function (metric, i) {
+  _.each(config.metric, function (metric) {
     metric = metric.split(':');
     if (metric[0] === 'count') {
       // This is pretty lame, but its how the "doc_count" metric has to be implemented at the moment
@@ -26,13 +26,13 @@ module.exports = function createDateAgg(config, tlConfig) {
       dateAgg.time_buckets.aggs[metric] = {
         bucket_script: {
           buckets_path: '_count',
-          script: {inline: '_value', lang: 'expression'}
+          script: { inline: '_value', lang: 'expression' }
         }
       };
     } else if (metric[0] && metric[1]) {
-      var metricName = metric[0] + '(' + metric[1] + ')';
+      const metricName = metric[0] + '(' + metric[1] + ')';
       dateAgg.time_buckets.aggs[metricName] = {};
-      dateAgg.time_buckets.aggs[metricName][metric[0]] = {field: metric[1]};
+      dateAgg.time_buckets.aggs[metricName][metric[0]] = { field: metric[1] };
     } else {
       throw new Error ('`metric` requires metric:field or simply count');
     }
diff --git a/src/core_plugins/timelion/server/series_functions/first.js b/src/core_plugins/timelion/server/series_functions/first.js
index 8050da904dac3..3310d5354e690 100644
--- a/src/core_plugins/timelion/server/series_functions/first.js
+++ b/src/core_plugins/timelion/server/series_functions/first.js
@@ -1,5 +1,5 @@
-var alter = require('../lib/alter.js');
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('first', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/fit.js b/src/core_plugins/timelion/server/series_functions/fit.js
index c5722791f5a8d..6e2dae65ad6ea 100644
--- a/src/core_plugins/timelion/server/series_functions/fit.js
+++ b/src/core_plugins/timelion/server/series_functions/fit.js
@@ -1,9 +1,8 @@
-var alter = require('../lib/alter.js');
-var _ = require('lodash');
-var Chainable = require('../lib/classes/chainable');
-
-var loadFunctions = require('../lib/load_functions.js');
-var fitFunctions  = loadFunctions('fit_functions');
+import alter from '../lib/alter.js';
+import _ from 'lodash';
+import Chainable from '../lib/classes/chainable';
+import loadFunctions from '../lib/load_functions.js';
+const fitFunctions  = loadFunctions('fit_functions');
 
 module.exports = new Chainable('fit', {
   args: [
@@ -21,7 +20,7 @@ module.exports = new Chainable('fit', {
   fn: function absFn(args) {
     return alter(args, function (eachSeries, mode) {
 
-      var noNulls = _.filter(eachSeries.data, 1);
+      const noNulls = _.filter(eachSeries.data, 1);
 
       eachSeries.data = fitFunctions[mode](noNulls, eachSeries.data);
       return eachSeries;
diff --git a/src/core_plugins/timelion/server/series_functions/graphite.js b/src/core_plugins/timelion/server/series_functions/graphite.js
index 8315335801dd1..3de9be8b1ac34 100644
--- a/src/core_plugins/timelion/server/series_functions/graphite.js
+++ b/src/core_plugins/timelion/server/series_functions/graphite.js
@@ -1,7 +1,7 @@
-var _ = require('lodash');
-var fetch = require('node-fetch');
-var moment = require('moment');
-var Datasource = require('../lib/classes/datasource');
+import _ from 'lodash';
+import fetch from 'node-fetch';
+import moment from 'moment';
+import Datasource from '../lib/classes/datasource';
 
 
 module.exports = new Datasource ('graphite', {
@@ -12,17 +12,17 @@ module.exports = new Datasource ('graphite', {
       help: 'Graphite metric to pull, eg _test-data.users.*.data'
     }
   ],
-  help: `[experimental] Pull data from graphite. Configure your graphite server in Kibana's Advanced Settings`,
+  help: '[experimental] Pull data from graphite. Configure your graphite server in Kibana\'s Advanced Settings',
   fn: function graphite(args, tlConfig) {
 
-    var config = args.byName;
+    const config = args.byName;
 
-    var time = {
+    const time = {
       min: moment(tlConfig.time.from).format('HH:mm[_]YYYYMMDD'),
       max:  moment(tlConfig.time.to).format('HH:mm[_]YYYYMMDD')
     };
 
-    var URL = tlConfig.settings['timelion:graphite.url'] + '/render/' +
+    const URL = tlConfig.settings['timelion:graphite.url'] + '/render/' +
       '?format=json' +
       '&from=' + time.min +
       '&until=' + time.max +
@@ -31,8 +31,8 @@ module.exports = new Datasource ('graphite', {
     return fetch(URL).then(function (resp) {
       return resp.json();
     }).then(function (resp) {
-      var list = _.map(resp, function (series) {
-        var data = _.map(series.datapoints, function (point) {
+      const list = _.map(resp, function (series) {
+        const data = _.map(series.datapoints, function (point) {
           return [point[1] * 1000, point[0]];
         });
         return {
diff --git a/src/core_plugins/timelion/server/series_functions/hide.js b/src/core_plugins/timelion/server/series_functions/hide.js
index 9e556b296a561..874b3aec2d4e1 100644
--- a/src/core_plugins/timelion/server/series_functions/hide.js
+++ b/src/core_plugins/timelion/server/series_functions/hide.js
@@ -1,5 +1,5 @@
-var alter = require('../lib/alter.js');
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('hide', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/holt/index.js b/src/core_plugins/timelion/server/series_functions/holt/index.js
index d10543702e3d6..7a6f4e249912a 100644
--- a/src/core_plugins/timelion/server/series_functions/holt/index.js
+++ b/src/core_plugins/timelion/server/series_functions/holt/index.js
@@ -1,9 +1,9 @@
-var _ = require('lodash');
-var Chainable = require('../../lib/classes/chainable');
-var ses = require('./lib/ses');
-var des = require('./lib/des');
-var tes = require('./lib/tes');
-var toMilliseconds = require('../../lib/to_milliseconds');
+import _ from 'lodash';
+import Chainable from '../../lib/classes/chainable';
+import ses from './lib/ses';
+import des from './lib/des';
+import tes from './lib/tes';
+import toMilliseconds from '../../lib/to_milliseconds';
 
 module.exports = new Chainable('holt', {
   args: [
@@ -56,7 +56,7 @@ module.exports = new Chainable('holt', {
     purpose of anomaly detection. Note that nulls will be filled with forecasted values. Deal with it.`,
   fn: function expsmoothFn(args, tlConfig) {
 
-    let newSeries = _.cloneDeep(args.byName.inputSeries);
+    const newSeries = _.cloneDeep(args.byName.inputSeries);
 
     const alpha = args.byName.alpha;
     const beta = args.byName.beta;
@@ -71,8 +71,8 @@ module.exports = new Chainable('holt', {
       // points exponentially degrade relative to the alpha, eg:
       // 0.8^1, 0.8^2, 0.8^3, etc
 
-      var times = _.map(series.data, 0);
-      var points = _.map(series.data, 1);
+      const times = _.map(series.data, 0);
+      let points = _.map(series.data, 1);
 
       if (alpha != null && beta == null && gamma == null) {
         points = ses(points, alpha);
diff --git a/src/core_plugins/timelion/server/series_functions/holt/lib/des.js b/src/core_plugins/timelion/server/series_functions/holt/lib/des.js
index df01e461e2c18..671829b71951a 100644
--- a/src/core_plugins/timelion/server/series_functions/holt/lib/des.js
+++ b/src/core_plugins/timelion/server/series_functions/holt/lib/des.js
@@ -1,19 +1,17 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = function des(points, alpha, beta) {
-  var level;
-  var prevLevel;
-  var trend;
-  var prevTrend;
-  var value;
-  var origin;
-  var unknownCount = 0;
+  let level;
+  let prevLevel;
+  let trend;
+  let prevTrend;
+  let unknownCount = 0;
 
   if (points.length < 2) {
     throw new Error ('You need at least 2 points to use double exponential smoothing');
   }
 
-  var smoothedPoints = _.map(points, (point, i) => {
+  const smoothedPoints = _.map(points, (point, i) => {
     if (i === 0) {
       return point;
     }
@@ -39,5 +37,4 @@ module.exports = function des(points, alpha, beta) {
   }, []);
 
   return smoothedPoints;
-
 };
diff --git a/src/core_plugins/timelion/server/series_functions/holt/lib/ses.js b/src/core_plugins/timelion/server/series_functions/holt/lib/ses.js
index 7a85565a00f08..48f9d97ffc1a4 100644
--- a/src/core_plugins/timelion/server/series_functions/holt/lib/ses.js
+++ b/src/core_plugins/timelion/server/series_functions/holt/lib/ses.js
@@ -1,14 +1,10 @@
-/*
-  Single exponential smoothing. Assuming even interval
-*/
-
-const _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = function ses(points, alpha) {
   let origin;
   let level;
 
-  var smoothedPoints = _.reduce(points, (result, point, i) => {
+  const smoothedPoints = _.reduce(points, (result, point, i) => {
     if (i === 0) {
       origin = point;
       level = point;
diff --git a/src/core_plugins/timelion/server/series_functions/holt/lib/tes.js b/src/core_plugins/timelion/server/series_functions/holt/lib/tes.js
index 5ba68d6d97183..cfbf619b15aff 100644
--- a/src/core_plugins/timelion/server/series_functions/holt/lib/tes.js
+++ b/src/core_plugins/timelion/server/series_functions/holt/lib/tes.js
@@ -1,20 +1,10 @@
-// Frequency = number of points per season
-// Season = 1 hump
-
-/*
-Hourly data might have:
- - Daily seasonality (frequency=24)
- - Weekly seasonality (frequency=24×7=168)
- - Annual seasonality (frequency=24×365.25=8766)
-*/
-
-var _ = require('lodash');
+import _ from 'lodash';
 
 // Uh, I don't think this will work when you have nulls in the initial seasonal components
 function initSeasonalComponents(samplePoints, seasonLength) {
-  var sampledSeasonCount = samplePoints.length / seasonLength;
-  var currentSeason = [];
-  var seasonalAverages = _.reduce(samplePoints, (result, point, i) => {
+  const sampledSeasonCount = samplePoints.length / seasonLength;
+  let currentSeason = [];
+  const seasonalAverages = _.reduce(samplePoints, (result, point, i) => {
     currentSeason.push(point);
       // If this is the end of the season, add it to the result;
     if (i % seasonLength === seasonLength - 1) {
@@ -25,8 +15,8 @@ function initSeasonalComponents(samplePoints, seasonLength) {
     return result;
   }, []);
 
-  var seasonals = _.times(seasonLength, (i) => {
-    var sumOfValsOverAvg = 0;
+  const seasonals = _.times(seasonLength, (i) => {
+    let sumOfValsOverAvg = 0;
     _.times(sampledSeasonCount, (j) => {
       sumOfValsOverAvg += samplePoints[seasonLength * j + i] - seasonalAverages[j];
     });
@@ -35,12 +25,12 @@ function initSeasonalComponents(samplePoints, seasonLength) {
   });
 
   return seasonals;
-};
+}
 
 // This is different from the DES method of establishing trend because it looks for
 // the difference in points between seasons
 function initTrend(samplePoints, seasonLength) {
-  var sum = 0;
+  let sum = 0;
   _.times(seasonLength, (i) => {
     sum += (samplePoints[i + seasonLength] - samplePoints[i]) / seasonLength;
   });
@@ -49,15 +39,15 @@ function initTrend(samplePoints, seasonLength) {
 
 module.exports = function tes(points, alpha, beta, gamma, seasonLength, seasonsToSample) {
 
-  var samplePoints = points.slice(0, seasonLength * seasonsToSample);
-  var seasonals = initSeasonalComponents(samplePoints, seasonLength);
-  var level;
-  var prevLevel;
-  var trend;
-  var prevTrend;
-  var unknownCount = 0;
+  const samplePoints = points.slice(0, seasonLength * seasonsToSample);
+  const seasonals = initSeasonalComponents(samplePoints, seasonLength);
+  let level;
+  let prevLevel;
+  let trend;
+  let prevTrend;
+  let unknownCount = 0;
 
-  var result = _.map(points, (point, i) => {
+  const result = _.map(points, (point, i) => {
     const seasonalPosition = i % seasonLength;
     // For the first samplePoints.length we use the actual points
     // After that we switch to the forecast
diff --git a/src/core_plugins/timelion/server/series_functions/label.js b/src/core_plugins/timelion/server/series_functions/label.js
index cfaaf513a1815..c8c22ba040c74 100644
--- a/src/core_plugins/timelion/server/series_functions/label.js
+++ b/src/core_plugins/timelion/server/series_functions/label.js
@@ -1,7 +1,5 @@
-var alter = require('../lib/alter.js');
-var util = require('util');
-
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('label', {
   args: [
     {
@@ -21,7 +19,7 @@ module.exports = new Chainable('label', {
   ],
   help: 'Change the label of the series. Use %s reference the existing label',
   fn:  function labelFn(args) {
-    var config = args.byName;
+    const config = args.byName;
     return alter(args, function (eachSeries) {
       if (config.regex) {
         eachSeries.label = eachSeries.label.replace(new RegExp(config.regex), config.label);
diff --git a/src/core_plugins/timelion/server/series_functions/legend.js b/src/core_plugins/timelion/server/series_functions/legend.js
index c81eabb4dddb5..6350037eb4473 100644
--- a/src/core_plugins/timelion/server/series_functions/legend.js
+++ b/src/core_plugins/timelion/server/series_functions/legend.js
@@ -1,6 +1,5 @@
-var alter = require('../lib/alter.js');
-
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('legend', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/lines.js b/src/core_plugins/timelion/server/series_functions/lines.js
index 9b9a9fd5a90be..55a9efa86bf6d 100644
--- a/src/core_plugins/timelion/server/series_functions/lines.js
+++ b/src/core_plugins/timelion/server/series_functions/lines.js
@@ -1,6 +1,5 @@
-var alter = require('../lib/alter.js');
-
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('lines', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/log.js b/src/core_plugins/timelion/server/series_functions/log.js
index 9844394b31f9b..8a32513f9d579 100644
--- a/src/core_plugins/timelion/server/series_functions/log.js
+++ b/src/core_plugins/timelion/server/series_functions/log.js
@@ -1,6 +1,6 @@
-var alter = require('../lib/alter.js');
-var _ = require('lodash');
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import _ from 'lodash';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('log', {
   args: [
     {
@@ -16,9 +16,9 @@ module.exports = new Chainable('log', {
   ],
   help: 'Return the logarithm value of each value in the series list (default base: 10)',
   fn: function logFn(args) {
-    var config = args.byName;
+    const config = args.byName;
     return alter(args, function (eachSeries) {
-      var data = _.map(eachSeries.data, function (point) {
+      const data = _.map(eachSeries.data, function (point) {
         return [point[0], Math.log(point[1]) / Math.log(config.base || 10)];
       });
       eachSeries.data = data;
diff --git a/src/core_plugins/timelion/server/series_functions/max.js b/src/core_plugins/timelion/server/series_functions/max.js
index 8f5613d84c8b8..e6297bd1b9ee6 100644
--- a/src/core_plugins/timelion/server/series_functions/max.js
+++ b/src/core_plugins/timelion/server/series_functions/max.js
@@ -1,6 +1,5 @@
-var reduce = require('../lib/reduce.js');
-
-var Chainable = require('../lib/classes/chainable');
+import reduce from '../lib/reduce.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('max', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/min.js b/src/core_plugins/timelion/server/series_functions/min.js
index 7a2a14ce8b61d..47f3967f26f1d 100644
--- a/src/core_plugins/timelion/server/series_functions/min.js
+++ b/src/core_plugins/timelion/server/series_functions/min.js
@@ -1,6 +1,5 @@
-var reduce = require('../lib/reduce.js');
-
-var Chainable = require('../lib/classes/chainable');
+import reduce from '../lib/reduce.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('min', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/movingaverage.js b/src/core_plugins/timelion/server/series_functions/movingaverage.js
index 6070a4c81aed9..0608b6dab4e38 100644
--- a/src/core_plugins/timelion/server/series_functions/movingaverage.js
+++ b/src/core_plugins/timelion/server/series_functions/movingaverage.js
@@ -1,6 +1,6 @@
-var alter = require('../lib/alter.js');
-var _ = require('lodash');
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import _ from 'lodash';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('movingaverage', {
   args: [
     {
@@ -24,15 +24,15 @@ module.exports = new Chainable('movingaverage', {
     return alter(args, function (eachSeries, _window, _position) {
 
       _position = _position || 'center';
-      var validPositions = ['left', 'right', 'center'];
+      const validPositions = ['left', 'right', 'center'];
       if (!_.contains(validPositions, _position)) throw new Error('Valid positions are: ' + validPositions.join(', '));
 
-      var pairs = eachSeries.data;
-      var pairsLen = pairs.length;
+      const pairs = eachSeries.data;
+      const pairsLen = pairs.length;
       eachSeries.label = eachSeries.label + ' mvavg=' + _window;
 
       function toPoint(point, pairSlice) {
-        var average = _.chain(pairSlice)
+        const average = _.chain(pairSlice)
         .map(1).reduce(function (memo, num) {
           return (memo + num);
         }).value() / _window;
@@ -41,8 +41,8 @@ module.exports = new Chainable('movingaverage', {
       }
 
       if (_position === 'center') {
-        var windowLeft = Math.floor(_window / 2);
-        var windowRight = _window - windowLeft;
+        const windowLeft = Math.floor(_window / 2);
+        const windowRight = _window - windowLeft;
         eachSeries.data = _.map(pairs, function (point, i) {
           if (i < windowLeft || i >= pairsLen - windowRight) return [point[0], null];
           return toPoint(point, pairs.slice(i - windowLeft, i + windowRight));
diff --git a/src/core_plugins/timelion/server/series_functions/movingstd.js b/src/core_plugins/timelion/server/series_functions/movingstd.js
index 06c87f6bf2a05..534d11bdd1086 100644
--- a/src/core_plugins/timelion/server/series_functions/movingstd.js
+++ b/src/core_plugins/timelion/server/series_functions/movingstd.js
@@ -1,6 +1,6 @@
-var alter = require('../lib/alter.js');
-var _ = require('lodash');
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import _ from 'lodash';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('movingstd', {
   args: [
     {
@@ -19,19 +19,19 @@ module.exports = new Chainable('movingstd', {
   fn: function movingstdFn(args) {
     return alter(args, function (eachSeries, _window) {
 
-      var pairs = eachSeries.data;
+      const pairs = eachSeries.data;
 
       eachSeries.data = _.map(pairs, function (point, i) {
         if (i < _window) { return [point[0], null]; }
 
-        var average = _.chain(pairs.slice(i - _window, i))
+        const average = _.chain(pairs.slice(i - _window, i))
         .map(function (point) {
           return point[1];
         }).reduce(function (memo, num) {
           return (memo + num);
         }).value() / _window;
 
-        var variance = _.chain(pairs.slice(i - _window, i))
+        const variance = _.chain(pairs.slice(i - _window, i))
         .map(function (point) {
           return point[1];
         }).reduce(function (memo, num) {
diff --git a/src/core_plugins/timelion/server/series_functions/multiply.js b/src/core_plugins/timelion/server/series_functions/multiply.js
index 7f7a22f2c16e8..e8e529a39ed32 100644
--- a/src/core_plugins/timelion/server/series_functions/multiply.js
+++ b/src/core_plugins/timelion/server/series_functions/multiply.js
@@ -1,6 +1,5 @@
-var reduce = require('../lib/reduce.js');
-
-var Chainable = require('../lib/classes/chainable');
+import reduce from '../lib/reduce.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('multiply', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/points.js b/src/core_plugins/timelion/server/series_functions/points.js
index e5a25d00e59ed..691fb486ee1da 100644
--- a/src/core_plugins/timelion/server/series_functions/points.js
+++ b/src/core_plugins/timelion/server/series_functions/points.js
@@ -1,7 +1,6 @@
-var alter = require('../lib/alter.js');
-var _ = require('lodash');
-
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import _ from 'lodash';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('points', {
   args: [
     {
@@ -58,7 +57,7 @@ module.exports = new Chainable('points', {
       }
 
       symbol = symbol || 'circle';
-      var validSymbols = ['triangle', 'cross', 'square', 'diamond', 'circle'];
+      const validSymbols = ['triangle', 'cross', 'square', 'diamond', 'circle'];
       if (!_.contains(['triangle', 'cross', 'square', 'diamond', 'circle'], symbol)) {
         throw new Error('Valid symbols are: ' + validSymbols.join(', '));
       }
diff --git a/src/core_plugins/timelion/server/series_functions/precision.js b/src/core_plugins/timelion/server/series_functions/precision.js
index 20f78e8b295e4..e20e973940b1a 100644
--- a/src/core_plugins/timelion/server/series_functions/precision.js
+++ b/src/core_plugins/timelion/server/series_functions/precision.js
@@ -1,8 +1,6 @@
-var reduce = require('../lib/reduce.js');
-var alter = require('../lib/alter.js');
-
-
-var Chainable = require('../lib/classes/chainable');
+import reduce from '../lib/reduce.js';
+import alter from '../lib/alter.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('precision', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/props.js b/src/core_plugins/timelion/server/series_functions/props.js
index 15dfba27c9092..917b58bed42d6 100644
--- a/src/core_plugins/timelion/server/series_functions/props.js
+++ b/src/core_plugins/timelion/server/series_functions/props.js
@@ -1,16 +1,16 @@
-var alter = require('../lib/alter.js');
-var Chainable = require('../lib/classes/chainable');
-var _ = require('lodash');
+import alter from '../lib/alter.js';
+import Chainable from '../lib/classes/chainable';
+import _ from 'lodash';
 
 function unflatten(data) {
   if (Object(data) !== data || _.isArray(data)) return data;
 
-  var regex = new RegExp(/\.?([^.\[\]]+)|\[(\d+)\]/g);
-  var result = {};
+  const regex = new RegExp(/\.?([^.\[\]]+)|\[(\d+)\]/g);
+  const result = {};
   _.each(data, function (val, p) {
-    var cur = result;
-    var prop = '';
-    var m;
+    let cur = result;
+    let prop = '';
+    let m;
     while (m = regex.exec(p)) {
       cur = cur[prop] || (cur[prop] = (m[2] ? [] : {}));
       prop = m[2] || m[1];
@@ -19,7 +19,7 @@ function unflatten(data) {
   });
 
   return result[''] || result;
-};
+}
 
 module.exports = new Chainable('props', {
   args: [
@@ -43,7 +43,7 @@ module.exports = new Chainable('props', {
   // They will be passed as args._extended:{}
   help: 'Use at your own risk, sets arbitrary properties on the series. For example .props(label=bears!)',
   fn: function firstFn(args) {
-    var properties = unflatten(_.omit(args.byName, 'inputSeries', 'global'));
+    const properties = unflatten(_.omit(args.byName, 'inputSeries', 'global'));
 
     if (args.byName.global) {
       _.assign(args.byName.inputSeries, properties);
diff --git a/src/core_plugins/timelion/server/series_functions/quandl.js b/src/core_plugins/timelion/server/series_functions/quandl.js
index c438de17e2382..15a3806b382bc 100644
--- a/src/core_plugins/timelion/server/series_functions/quandl.js
+++ b/src/core_plugins/timelion/server/series_functions/quandl.js
@@ -1,11 +1,8 @@
-var _ = require('lodash');
-var fetch = require('node-fetch');
-var moment = require('moment');
+import _ from 'lodash';
+import fetch from 'node-fetch';
+import moment from 'moment';
 fetch.Promise = require('bluebird');
-//var parseDateMath = require('../utils/date_math.js');
-
-
-var Datasource = require('../lib/classes/datasource');
+import Datasource from '../lib/classes/datasource';
 
 
 module.exports = new Datasource ('quandl', {
@@ -27,14 +24,14 @@ module.exports = new Datasource ('quandl', {
     Pull data from quandl.com using the quandl code. Set "timelion:quandl.key" to your free API key in Kibana's
     Advanced Settings. The API has a really low rate limit without a key.`,
   fn: function quandlFn(args, tlConfig) {
-    var intervalMap = {
+    const intervalMap = {
       '1d': 'daily',
       '1w': 'weekly',
       '1M': 'monthly',
       '1y': 'annual',
     };
 
-    var config = _.defaults(args.byName, {
+    const config = _.defaults(args.byName, {
       code: 'WIKI/AAPL',
       position: 1,
       interval: intervalMap[tlConfig.time.interval],
@@ -46,7 +43,7 @@ module.exports = new Datasource ('quandl', {
       '. quandl() supports: ' + _.keys(intervalMap).join(', '));
     }
 
-    var time = {
+    const time = {
       min: moment.utc(tlConfig.time.from).format('YYYY-MM-DD'),
       max:  moment.utc(tlConfig.time.to).format('YYYY-MM-DD')
     };
@@ -58,7 +55,7 @@ module.exports = new Datasource ('quandl', {
     // 4. close
     // 5. volume
 
-    var URL = 'https://www.quandl.com/api/v1/datasets/' + config.code + '.json' +
+    const URL = 'https://www.quandl.com/api/v1/datasets/' + config.code + '.json' +
       '?sort_order=asc' +
       '&trim_start=' + time.min +
       '&trim_end=' + time.max +
@@ -66,7 +63,7 @@ module.exports = new Datasource ('quandl', {
       '&auth_token=' + config.apikey;
 
     return fetch(URL).then(function (resp) { return resp.json(); }).then(function (resp) {
-      var data = _.map(resp.data, function (bucket) {
+      const data = _.map(resp.data, function (bucket) {
         return [moment(bucket[0]).valueOf(), bucket[config.position]];
       });
 
diff --git a/src/core_plugins/timelion/server/series_functions/range.js b/src/core_plugins/timelion/server/series_functions/range.js
index 8fc1c7a078c26..f42838688d4f9 100644
--- a/src/core_plugins/timelion/server/series_functions/range.js
+++ b/src/core_plugins/timelion/server/series_functions/range.js
@@ -1,6 +1,6 @@
-var alter = require('../lib/alter.js');
-var _ = require('lodash');
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import _ from 'lodash';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('range', {
   args: [
     {
@@ -21,13 +21,13 @@ module.exports = new Chainable('range', {
   help: 'Changes the max and min of a series while keeping the same shape',
   fn: function range(args) {
     return alter(args, function (eachSeries) {
-      var values = _.map(eachSeries.data, 1);
-      var min = _.min(values);
-      var max = _.max(values);
+      const values = _.map(eachSeries.data, 1);
+      const min = _.min(values);
+      const max = _.max(values);
 
       // newvalue= (max'-min')/(max-min)*(value-min)+min'.
-      var data = _.map(eachSeries.data, function (point) {
-        var val = (args.byName.max - args.byName.min) /
+      const data = _.map(eachSeries.data, function (point) {
+        const val = (args.byName.max - args.byName.min) /
           (max - min) * (point[1] - min) + args.byName.min;
         return [point[0], val];
       });
diff --git a/src/core_plugins/timelion/server/series_functions/scale_interval.js b/src/core_plugins/timelion/server/series_functions/scale_interval.js
index f6434123af39a..21b94f852b6b1 100644
--- a/src/core_plugins/timelion/server/series_functions/scale_interval.js
+++ b/src/core_plugins/timelion/server/series_functions/scale_interval.js
@@ -1,8 +1,7 @@
-var alter = require('../lib/alter.js');
-var toMS = require('../lib/to_milliseconds.js');
-
-var _ = require('lodash');
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import toMS from '../lib/to_milliseconds.js';
+import _ from 'lodash';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('scale_interval', {
   args: [
     {
@@ -17,11 +16,11 @@ module.exports = new Chainable('scale_interval', {
   ],
   help: 'Changes scales a value (usually a sum or a count) to a new interval. For example, as a per-second rate',
   fn: function scaleIntervalFn(args, tlConfig) {
-    var currentInterval = toMS(tlConfig.time.interval);
-    var scaleInterval = toMS(args.byName.interval);
+    const currentInterval = toMS(tlConfig.time.interval);
+    const scaleInterval = toMS(args.byName.interval);
 
     return alter(args, function (eachSeries) {
-      var data = _.map(eachSeries.data, function (point) {
+      const data = _.map(eachSeries.data, function (point) {
         return [point[0], (point[1] / currentInterval) * scaleInterval];
       });
       eachSeries.data = data;
diff --git a/src/core_plugins/timelion/server/series_functions/static.js b/src/core_plugins/timelion/server/series_functions/static.js
index f4dfa4234086c..016914cf7b374 100644
--- a/src/core_plugins/timelion/server/series_functions/static.js
+++ b/src/core_plugins/timelion/server/series_functions/static.js
@@ -1,8 +1,6 @@
-var _ = require('lodash');
-var fetch = require('node-fetch');
-var moment = require('moment');
-var Datasource = require('../lib/classes/datasource');
-var Promise = require('bluebird');
+import _ from 'lodash';
+import Datasource from '../lib/classes/datasource';
+import Promise from 'bluebird';
 
 
 module.exports = new Datasource ('static', {
@@ -23,13 +21,13 @@ module.exports = new Datasource ('static', {
   help: 'Draws a single value across the chart',
   fn: function staticFn(args, tlConfig) {
 
-    var data;
-    var target = tlConfig.getTargetSeries();
+    let data;
+    const target = tlConfig.getTargetSeries();
     if (typeof args.byName.value === 'string') {
-      var points = args.byName.value.split(':');
-      var begin = _.first(target)[0];
-      var end = _.last(target)[0];
-      var step = (end - begin) / (points.length - 1);
+      const points = args.byName.value.split(':');
+      const begin = _.first(target)[0];
+      const end = _.last(target)[0];
+      const step = (end - begin) / (points.length - 1);
       data = _.map(points, function (point, i) {
         return [begin + (i * step), parseFloat(point)];
       });
diff --git a/src/core_plugins/timelion/server/series_functions/subtract.js b/src/core_plugins/timelion/server/series_functions/subtract.js
index 499a51123c3a6..d83332a9c2fc0 100644
--- a/src/core_plugins/timelion/server/series_functions/subtract.js
+++ b/src/core_plugins/timelion/server/series_functions/subtract.js
@@ -1,7 +1,5 @@
-var reduce = require('../lib/reduce.js');
-
-
-var Chainable = require('../lib/classes/chainable');
+import reduce from '../lib/reduce.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('subtract', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/sum.js b/src/core_plugins/timelion/server/series_functions/sum.js
index d85f164b19fe2..cceffc4ec9ec5 100644
--- a/src/core_plugins/timelion/server/series_functions/sum.js
+++ b/src/core_plugins/timelion/server/series_functions/sum.js
@@ -1,6 +1,5 @@
-var reduce = require('../lib/reduce.js');
-
-var Chainable = require('../lib/classes/chainable');
+import reduce from '../lib/reduce.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('sum', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/title.js b/src/core_plugins/timelion/server/series_functions/title.js
index 84dc88fba8290..d089f69dfd606 100644
--- a/src/core_plugins/timelion/server/series_functions/title.js
+++ b/src/core_plugins/timelion/server/series_functions/title.js
@@ -1,5 +1,5 @@
-var alter = require('../lib/alter.js');
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('title', {
   args: [
     {
diff --git a/src/core_plugins/timelion/server/series_functions/trend/index.js b/src/core_plugins/timelion/server/series_functions/trend/index.js
index 59de64f43b34b..715aea4c2e4d0 100644
--- a/src/core_plugins/timelion/server/series_functions/trend/index.js
+++ b/src/core_plugins/timelion/server/series_functions/trend/index.js
@@ -1,8 +1,8 @@
-var _ = require('lodash');
-var Chainable = require('../../lib/classes/chainable');
+import _ from 'lodash';
+import Chainable from '../../lib/classes/chainable';
 import * as regress from './lib/regress';
 
-var validRegressions = {
+const validRegressions = {
   linear: 'linear',
   log: 'logarithmic',
 };
@@ -33,7 +33,7 @@ module.exports = new Chainable('trend', {
   ],
   help: 'Draws a trend line using a specified regression algorithm',
   fn: function absFn(args) {
-    let newSeries = _.cloneDeep(args.byName.inputSeries);
+    const newSeries = _.cloneDeep(args.byName.inputSeries);
 
     _.each(newSeries.list, function (series) {
       const length = series.data.length;
diff --git a/src/core_plugins/timelion/server/series_functions/trend/lib/regress.js b/src/core_plugins/timelion/server/series_functions/trend/lib/regress.js
index 7bc645c360f99..6e71ef1efe0c1 100644
--- a/src/core_plugins/timelion/server/series_functions/trend/lib/regress.js
+++ b/src/core_plugins/timelion/server/series_functions/trend/lib/regress.js
@@ -1,10 +1,4 @@
-/*
-* Algorithms from
-* copyright(c) 2013 Tom Alexander
-* Licensed under the MIT license.
-*/
-
-var _ = require('lodash');
+import _ from 'lodash';
 
 function sum(data, fn) {
   return _.reduce(data, function (sum, d) {
@@ -25,34 +19,34 @@ function mapTuples(data, fn) {
 }
 
 export function linear(data) {
-  var xSum    = sum(data, (d) => {return d[0]; });
-  var ySum    = sum(data, (d) => {return d[1]; });
-  var xSqSum  = sum(data, (d) => {return d[0] * d[0]; });
-  var xySum   = sum(data, (d) => {return d[0] * d[1]; });
-  var observations = count(data);
+  const xSum    = sum(data, (d) => {return d[0]; });
+  const ySum    = sum(data, (d) => {return d[1]; });
+  const xSqSum  = sum(data, (d) => {return d[0] * d[0]; });
+  const xySum   = sum(data, (d) => {return d[0] * d[1]; });
+  const observations = count(data);
 
-  var gradient =
+  const gradient =
     ((observations * xySum)  - (xSum * ySum)) /
     ((observations * xSqSum) - (xSum * xSum));
 
-  var intercept =
+  const intercept =
     (ySum / observations) - (gradient * xSum) / observations;
 
   return mapTuples(data, (d) => { return d[0] * gradient + intercept; });
 }
 
 export function log(data) {
-  var logXSum   = sum(data, (d) => {return Math.log(d[0]); });
-  var yLogXSum  = sum(data, (d) => {return d[1] * Math.log(d[0]); });
-  var ySum      = sum(data, (d) => {return d[1]; });
-  var logXsqSum = sum(data, (d) => {return Math.pow(Math.log(d[0]), 2); });
-  var observations = count(data);
+  const logXSum   = sum(data, (d) => {return Math.log(d[0]); });
+  const yLogXSum  = sum(data, (d) => {return d[1] * Math.log(d[0]); });
+  const ySum      = sum(data, (d) => {return d[1]; });
+  const logXsqSum = sum(data, (d) => {return Math.pow(Math.log(d[0]), 2); });
+  const observations = count(data);
 
-  var b =
+  const b =
     ((observations * yLogXSum) -  (ySum * logXSum)) /
     ((observations * logXsqSum) - (logXSum * logXSum));
 
-  var a =
+  const a =
     (ySum - b * logXSum) /
     observations;
 
diff --git a/src/core_plugins/timelion/server/series_functions/trim.js b/src/core_plugins/timelion/server/series_functions/trim.js
index 8759b0a70c6ab..05c604622a32c 100644
--- a/src/core_plugins/timelion/server/series_functions/trim.js
+++ b/src/core_plugins/timelion/server/series_functions/trim.js
@@ -1,7 +1,6 @@
-var alter = require('../lib/alter.js');
-var _ = require('lodash');
-var Chainable = require('../lib/classes/chainable');
-var argType = require('../handlers/lib/arg_type.js');
+import alter from '../lib/alter.js';
+import _ from 'lodash';
+import Chainable from '../lib/classes/chainable';
 
 module.exports = new Chainable('trim', {
   args: [
@@ -22,7 +21,7 @@ module.exports = new Chainable('trim', {
   ],
   help: 'Set N buckets at the start or end of a series to null to fit the "partial bucket issue"',
   fn: function conditionFn(args) {
-    var config = args.byName;
+    const config = args.byName;
     if (config.start == null) config.start = 1;
     if (config.end == null) config.end = 1;
 
diff --git a/src/core_plugins/timelion/server/series_functions/worldbank.js b/src/core_plugins/timelion/server/series_functions/worldbank.js
index bbab3aae1baf2..d58885887dd7a 100644
--- a/src/core_plugins/timelion/server/series_functions/worldbank.js
+++ b/src/core_plugins/timelion/server/series_functions/worldbank.js
@@ -1,7 +1,7 @@
-var _ = require('lodash');
-var fetch = require('node-fetch');
-var moment = require('moment');
-var Datasource = require('../lib/classes/datasource');
+import _ from 'lodash';
+import fetch from 'node-fetch';
+import moment from 'moment';
+import Datasource from '../lib/classes/datasource';
 
 module.exports = new Datasource ('worldbank', {
   args: [
@@ -22,34 +22,34 @@ module.exports = new Datasource ('worldbank', {
   fn: function worldbank(args, tlConfig) {
     // http://api.worldbank.org/en/countries/ind;chn/indicators/DPANUSSPF?date=2000:2006&MRV=5
 
-    var config = _.defaults(args.byName, {
+    const config = _.defaults(args.byName, {
       code: 'countries/wld/indicators/SP.POP.TOTL'
     });
 
-    var time = {
+    const time = {
       min: moment(tlConfig.time.from).format('YYYY'),
       max:  moment(tlConfig.time.to).format('YYYY')
     };
 
-    var URL = 'http://api.worldbank.org/' + config.code +
+    const URL = 'http://api.worldbank.org/' + config.code +
       '?date=' + time.min + ':' + time.max +
       '&format=json' +
       '&per_page=1000';
 
     return fetch(URL).then(function (resp) { return resp.json(); }).then(function (resp) {
-      var hasData = false;
+      let hasData = false;
 
-      var respSeries = resp[1];
+      const respSeries = resp[1];
 
-      var deduped = {};
-      var description;
+      const deduped = {};
+      let description;
       _.each (respSeries, function (bucket) {
         if (bucket.value != null) hasData = true;
         description = bucket.country.value + ' ' + bucket.indicator.value;
         deduped[bucket.date] = bucket.value;
       });
 
-      var data = _.compact(_.map(deduped, function (val, date) {
+      const data = _.compact(_.map(deduped, function (val, date) {
         // Discard nulls
         if (val == null) return;
         return [moment(date, 'YYYY').valueOf(), Number(val)];
diff --git a/src/core_plugins/timelion/server/series_functions/worldbank_indicators.js b/src/core_plugins/timelion/server/series_functions/worldbank_indicators.js
index 7f87cf354a99c..c0c75bcd91c00 100644
--- a/src/core_plugins/timelion/server/series_functions/worldbank_indicators.js
+++ b/src/core_plugins/timelion/server/series_functions/worldbank_indicators.js
@@ -1,9 +1,7 @@
-var _ = require('lodash');
-var fetch = require('node-fetch');
-var moment = require('moment');
-var worldbank = require('./worldbank.js');
-var Promise = require('bluebird');
-var Datasource = require('../lib/classes/datasource');
+import _ from 'lodash';
+import worldbank from './worldbank.js';
+import Promise from 'bluebird';
+import Datasource from '../lib/classes/datasource';
 
 
 module.exports = new Datasource ('worldbank_indicators', {
@@ -27,16 +25,16 @@ module.exports = new Datasource ('worldbank_indicators', {
     mostly yearly data, and often has no data for the current year. Try offset=-1y if you get no data for recent
     time ranges.`,
   fn: function worldbankIndicators(args, tlConfig) {
-    var config = _.defaults(args.byName, {
+    const config = _.defaults(args.byName, {
       country: 'wld',
       indicator: 'SP.POP.TOTL'
     });
 
-    var countries = config.country.split(':');
-    var seriesLists = _.map(countries, function (country) {
-      var code = 'countries/' + country + '/indicators/' + config.indicator;
-      var wbArgs = [code];
-      wbArgs.byName = {code: code};
+    const countries = config.country.split(':');
+    const seriesLists = _.map(countries, function (country) {
+      const code = 'countries/' + country + '/indicators/' + config.indicator;
+      const wbArgs = [code];
+      wbArgs.byName = { code: code };
       return worldbank.timelionFn(wbArgs, tlConfig);
     });
 
diff --git a/src/core_plugins/timelion/server/series_functions/yaxis.js b/src/core_plugins/timelion/server/series_functions/yaxis.js
index 30bece32c57bc..4fe8bc297d1ce 100644
--- a/src/core_plugins/timelion/server/series_functions/yaxis.js
+++ b/src/core_plugins/timelion/server/series_functions/yaxis.js
@@ -1,6 +1,5 @@
-var alter = require('../lib/alter.js');
-
-var Chainable = require('../lib/classes/chainable');
+import alter from '../lib/alter.js';
+import Chainable from '../lib/classes/chainable';
 module.exports = new Chainable('yaxis', {
   args: [
     {
@@ -49,7 +48,7 @@ module.exports = new Chainable('yaxis', {
       eachSeries._global.yaxes = eachSeries._global.yaxes || [];
       eachSeries._global.yaxes[yaxis - 1] = eachSeries._global.yaxes[yaxis - 1] || {};
 
-      var myAxis = eachSeries._global.yaxes[yaxis - 1];
+      const myAxis = eachSeries._global.yaxes[yaxis - 1];
       myAxis.position = position || (yaxis % 2 ? 'left' : 'right');
       myAxis.min = min == null ? 0 : min;
       myAxis.max = max;
diff --git a/src/fixtures/agg_resp/date_histogram.js b/src/fixtures/agg_resp/date_histogram.js
index 3c66a87dd4bec..d163f03fb8ef5 100644
--- a/src/fixtures/agg_resp/date_histogram.js
+++ b/src/fixtures/agg_resp/date_histogram.js
@@ -1,252 +1,250 @@
-define(function () {
-  return {
-    'took': 35,
-    'timed_out': false,
-    '_shards': {
-      'total': 2,
-      'successful': 2,
-      'failed': 0
-    },
-    'hits': {
-      'total': 32899,
-      'max_score': 0,
-      'hits': []
-    },
-    'aggregations': {
-      '1': {
-        'buckets': [
-          {
-            'key_as_string': '2015-01-30T01:00:00.000Z',
-            'key': 1422579600000,
-            'doc_count': 18
-          },
-          {
-            'key_as_string': '2015-01-30T02:00:00.000Z',
-            'key': 1422583200000,
-            'doc_count': 68
-          },
-          {
-            'key_as_string': '2015-01-30T03:00:00.000Z',
-            'key': 1422586800000,
-            'doc_count': 146
-          },
-          {
-            'key_as_string': '2015-01-30T04:00:00.000Z',
-            'key': 1422590400000,
-            'doc_count': 149
-          },
-          {
-            'key_as_string': '2015-01-30T05:00:00.000Z',
-            'key': 1422594000000,
-            'doc_count': 363
-          },
-          {
-            'key_as_string': '2015-01-30T06:00:00.000Z',
-            'key': 1422597600000,
-            'doc_count': 555
-          },
-          {
-            'key_as_string': '2015-01-30T07:00:00.000Z',
-            'key': 1422601200000,
-            'doc_count': 878
-          },
-          {
-            'key_as_string': '2015-01-30T08:00:00.000Z',
-            'key': 1422604800000,
-            'doc_count': 1133
-          },
-          {
-            'key_as_string': '2015-01-30T09:00:00.000Z',
-            'key': 1422608400000,
-            'doc_count': 1438
-          },
-          {
-            'key_as_string': '2015-01-30T10:00:00.000Z',
-            'key': 1422612000000,
-            'doc_count': 1719
-          },
-          {
-            'key_as_string': '2015-01-30T11:00:00.000Z',
-            'key': 1422615600000,
-            'doc_count': 1813
-          },
-          {
-            'key_as_string': '2015-01-30T12:00:00.000Z',
-            'key': 1422619200000,
-            'doc_count': 1790
-          },
-          {
-            'key_as_string': '2015-01-30T13:00:00.000Z',
-            'key': 1422622800000,
-            'doc_count': 1582
-          },
-          {
-            'key_as_string': '2015-01-30T14:00:00.000Z',
-            'key': 1422626400000,
-            'doc_count': 1439
-          },
-          {
-            'key_as_string': '2015-01-30T15:00:00.000Z',
-            'key': 1422630000000,
-            'doc_count': 1154
-          },
-          {
-            'key_as_string': '2015-01-30T16:00:00.000Z',
-            'key': 1422633600000,
-            'doc_count': 847
-          },
-          {
-            'key_as_string': '2015-01-30T17:00:00.000Z',
-            'key': 1422637200000,
-            'doc_count': 588
-          },
-          {
-            'key_as_string': '2015-01-30T18:00:00.000Z',
-            'key': 1422640800000,
-            'doc_count': 374
-          },
-          {
-            'key_as_string': '2015-01-30T19:00:00.000Z',
-            'key': 1422644400000,
-            'doc_count': 152
-          },
-          {
-            'key_as_string': '2015-01-30T20:00:00.000Z',
-            'key': 1422648000000,
-            'doc_count': 140
-          },
-          {
-            'key_as_string': '2015-01-30T21:00:00.000Z',
-            'key': 1422651600000,
-            'doc_count': 73
-          },
-          {
-            'key_as_string': '2015-01-30T22:00:00.000Z',
-            'key': 1422655200000,
-            'doc_count': 28
-          },
-          {
-            'key_as_string': '2015-01-30T23:00:00.000Z',
-            'key': 1422658800000,
-            'doc_count': 9
-          },
-          {
-            'key_as_string': '2015-01-31T00:00:00.000Z',
-            'key': 1422662400000,
-            'doc_count': 29
-          },
-          {
-            'key_as_string': '2015-01-31T01:00:00.000Z',
-            'key': 1422666000000,
-            'doc_count': 38
-          },
-          {
-            'key_as_string': '2015-01-31T02:00:00.000Z',
-            'key': 1422669600000,
-            'doc_count': 70
-          },
-          {
-            'key_as_string': '2015-01-31T03:00:00.000Z',
-            'key': 1422673200000,
-            'doc_count': 136
-          },
-          {
-            'key_as_string': '2015-01-31T04:00:00.000Z',
-            'key': 1422676800000,
-            'doc_count': 173
-          },
-          {
-            'key_as_string': '2015-01-31T05:00:00.000Z',
-            'key': 1422680400000,
-            'doc_count': 370
-          },
-          {
-            'key_as_string': '2015-01-31T06:00:00.000Z',
-            'key': 1422684000000,
-            'doc_count': 545
-          },
-          {
-            'key_as_string': '2015-01-31T07:00:00.000Z',
-            'key': 1422687600000,
-            'doc_count': 845
-          },
-          {
-            'key_as_string': '2015-01-31T08:00:00.000Z',
-            'key': 1422691200000,
-            'doc_count': 1070
-          },
-          {
-            'key_as_string': '2015-01-31T09:00:00.000Z',
-            'key': 1422694800000,
-            'doc_count': 1419
-          },
-          {
-            'key_as_string': '2015-01-31T10:00:00.000Z',
-            'key': 1422698400000,
-            'doc_count': 1725
-          },
-          {
-            'key_as_string': '2015-01-31T11:00:00.000Z',
-            'key': 1422702000000,
-            'doc_count': 1801
-          },
-          {
-            'key_as_string': '2015-01-31T12:00:00.000Z',
-            'key': 1422705600000,
-            'doc_count': 1823
-          },
-          {
-            'key_as_string': '2015-01-31T13:00:00.000Z',
-            'key': 1422709200000,
-            'doc_count': 1657
-          },
-          {
-            'key_as_string': '2015-01-31T14:00:00.000Z',
-            'key': 1422712800000,
-            'doc_count': 1454
-          },
-          {
-            'key_as_string': '2015-01-31T15:00:00.000Z',
-            'key': 1422716400000,
-            'doc_count': 1131
-          },
-          {
-            'key_as_string': '2015-01-31T16:00:00.000Z',
-            'key': 1422720000000,
-            'doc_count': 810
-          },
-          {
-            'key_as_string': '2015-01-31T17:00:00.000Z',
-            'key': 1422723600000,
-            'doc_count': 583
-          },
-          {
-            'key_as_string': '2015-01-31T18:00:00.000Z',
-            'key': 1422727200000,
-            'doc_count': 384
-          },
-          {
-            'key_as_string': '2015-01-31T19:00:00.000Z',
-            'key': 1422730800000,
-            'doc_count': 165
-          },
-          {
-            'key_as_string': '2015-01-31T20:00:00.000Z',
-            'key': 1422734400000,
-            'doc_count': 135
-          },
-          {
-            'key_as_string': '2015-01-31T21:00:00.000Z',
-            'key': 1422738000000,
-            'doc_count': 72
-          },
-          {
-            'key_as_string': '2015-01-31T22:00:00.000Z',
-            'key': 1422741600000,
-            'doc_count': 8
-          }
-        ]
-      }
+export default {
+  'took': 35,
+  'timed_out': false,
+  '_shards': {
+    'total': 2,
+    'successful': 2,
+    'failed': 0
+  },
+  'hits': {
+    'total': 32899,
+    'max_score': 0,
+    'hits': []
+  },
+  'aggregations': {
+    '1': {
+      'buckets': [
+        {
+          'key_as_string': '2015-01-30T01:00:00.000Z',
+          'key': 1422579600000,
+          'doc_count': 18
+        },
+        {
+          'key_as_string': '2015-01-30T02:00:00.000Z',
+          'key': 1422583200000,
+          'doc_count': 68
+        },
+        {
+          'key_as_string': '2015-01-30T03:00:00.000Z',
+          'key': 1422586800000,
+          'doc_count': 146
+        },
+        {
+          'key_as_string': '2015-01-30T04:00:00.000Z',
+          'key': 1422590400000,
+          'doc_count': 149
+        },
+        {
+          'key_as_string': '2015-01-30T05:00:00.000Z',
+          'key': 1422594000000,
+          'doc_count': 363
+        },
+        {
+          'key_as_string': '2015-01-30T06:00:00.000Z',
+          'key': 1422597600000,
+          'doc_count': 555
+        },
+        {
+          'key_as_string': '2015-01-30T07:00:00.000Z',
+          'key': 1422601200000,
+          'doc_count': 878
+        },
+        {
+          'key_as_string': '2015-01-30T08:00:00.000Z',
+          'key': 1422604800000,
+          'doc_count': 1133
+        },
+        {
+          'key_as_string': '2015-01-30T09:00:00.000Z',
+          'key': 1422608400000,
+          'doc_count': 1438
+        },
+        {
+          'key_as_string': '2015-01-30T10:00:00.000Z',
+          'key': 1422612000000,
+          'doc_count': 1719
+        },
+        {
+          'key_as_string': '2015-01-30T11:00:00.000Z',
+          'key': 1422615600000,
+          'doc_count': 1813
+        },
+        {
+          'key_as_string': '2015-01-30T12:00:00.000Z',
+          'key': 1422619200000,
+          'doc_count': 1790
+        },
+        {
+          'key_as_string': '2015-01-30T13:00:00.000Z',
+          'key': 1422622800000,
+          'doc_count': 1582
+        },
+        {
+          'key_as_string': '2015-01-30T14:00:00.000Z',
+          'key': 1422626400000,
+          'doc_count': 1439
+        },
+        {
+          'key_as_string': '2015-01-30T15:00:00.000Z',
+          'key': 1422630000000,
+          'doc_count': 1154
+        },
+        {
+          'key_as_string': '2015-01-30T16:00:00.000Z',
+          'key': 1422633600000,
+          'doc_count': 847
+        },
+        {
+          'key_as_string': '2015-01-30T17:00:00.000Z',
+          'key': 1422637200000,
+          'doc_count': 588
+        },
+        {
+          'key_as_string': '2015-01-30T18:00:00.000Z',
+          'key': 1422640800000,
+          'doc_count': 374
+        },
+        {
+          'key_as_string': '2015-01-30T19:00:00.000Z',
+          'key': 1422644400000,
+          'doc_count': 152
+        },
+        {
+          'key_as_string': '2015-01-30T20:00:00.000Z',
+          'key': 1422648000000,
+          'doc_count': 140
+        },
+        {
+          'key_as_string': '2015-01-30T21:00:00.000Z',
+          'key': 1422651600000,
+          'doc_count': 73
+        },
+        {
+          'key_as_string': '2015-01-30T22:00:00.000Z',
+          'key': 1422655200000,
+          'doc_count': 28
+        },
+        {
+          'key_as_string': '2015-01-30T23:00:00.000Z',
+          'key': 1422658800000,
+          'doc_count': 9
+        },
+        {
+          'key_as_string': '2015-01-31T00:00:00.000Z',
+          'key': 1422662400000,
+          'doc_count': 29
+        },
+        {
+          'key_as_string': '2015-01-31T01:00:00.000Z',
+          'key': 1422666000000,
+          'doc_count': 38
+        },
+        {
+          'key_as_string': '2015-01-31T02:00:00.000Z',
+          'key': 1422669600000,
+          'doc_count': 70
+        },
+        {
+          'key_as_string': '2015-01-31T03:00:00.000Z',
+          'key': 1422673200000,
+          'doc_count': 136
+        },
+        {
+          'key_as_string': '2015-01-31T04:00:00.000Z',
+          'key': 1422676800000,
+          'doc_count': 173
+        },
+        {
+          'key_as_string': '2015-01-31T05:00:00.000Z',
+          'key': 1422680400000,
+          'doc_count': 370
+        },
+        {
+          'key_as_string': '2015-01-31T06:00:00.000Z',
+          'key': 1422684000000,
+          'doc_count': 545
+        },
+        {
+          'key_as_string': '2015-01-31T07:00:00.000Z',
+          'key': 1422687600000,
+          'doc_count': 845
+        },
+        {
+          'key_as_string': '2015-01-31T08:00:00.000Z',
+          'key': 1422691200000,
+          'doc_count': 1070
+        },
+        {
+          'key_as_string': '2015-01-31T09:00:00.000Z',
+          'key': 1422694800000,
+          'doc_count': 1419
+        },
+        {
+          'key_as_string': '2015-01-31T10:00:00.000Z',
+          'key': 1422698400000,
+          'doc_count': 1725
+        },
+        {
+          'key_as_string': '2015-01-31T11:00:00.000Z',
+          'key': 1422702000000,
+          'doc_count': 1801
+        },
+        {
+          'key_as_string': '2015-01-31T12:00:00.000Z',
+          'key': 1422705600000,
+          'doc_count': 1823
+        },
+        {
+          'key_as_string': '2015-01-31T13:00:00.000Z',
+          'key': 1422709200000,
+          'doc_count': 1657
+        },
+        {
+          'key_as_string': '2015-01-31T14:00:00.000Z',
+          'key': 1422712800000,
+          'doc_count': 1454
+        },
+        {
+          'key_as_string': '2015-01-31T15:00:00.000Z',
+          'key': 1422716400000,
+          'doc_count': 1131
+        },
+        {
+          'key_as_string': '2015-01-31T16:00:00.000Z',
+          'key': 1422720000000,
+          'doc_count': 810
+        },
+        {
+          'key_as_string': '2015-01-31T17:00:00.000Z',
+          'key': 1422723600000,
+          'doc_count': 583
+        },
+        {
+          'key_as_string': '2015-01-31T18:00:00.000Z',
+          'key': 1422727200000,
+          'doc_count': 384
+        },
+        {
+          'key_as_string': '2015-01-31T19:00:00.000Z',
+          'key': 1422730800000,
+          'doc_count': 165
+        },
+        {
+          'key_as_string': '2015-01-31T20:00:00.000Z',
+          'key': 1422734400000,
+          'doc_count': 135
+        },
+        {
+          'key_as_string': '2015-01-31T21:00:00.000Z',
+          'key': 1422738000000,
+          'doc_count': 72
+        },
+        {
+          'key_as_string': '2015-01-31T22:00:00.000Z',
+          'key': 1422741600000,
+          'doc_count': 8
+        }
+      ]
     }
-  };
-});
\ No newline at end of file
+  }
+};
\ No newline at end of file
diff --git a/src/fixtures/agg_resp/geohash_grid.js b/src/fixtures/agg_resp/geohash_grid.js
index 33a446ff360b2..489f77e152ae7 100644
--- a/src/fixtures/agg_resp/geohash_grid.js
+++ b/src/fixtures/agg_resp/geohash_grid.js
@@ -1,7 +1,5 @@
 import _ from 'lodash';
 export default function GeoHashGridAggResponseFixture() {
-
-
   // for vis:
   //
   // vis = new Vis(indexPattern, {
@@ -17,25 +15,22 @@ export default function GeoHashGridAggResponseFixture() {
   //   },
   // });
 
-  let geoHashCharts = _.union(
+  const geoHashCharts = _.union(
     _.range(48, 57), // 0-9
     _.range(65, 90), // A-Z
     _.range(97, 122) // a-z
   );
 
-  let totalDocCount = 0;
-
-  let tags = _.times(_.random(4, 20), function (i) {
+  const tags = _.times(_.random(4, 20), function (i) {
     // random number of tags
     let docCount = 0;
-    let buckets = _.times(_.random(40, 200), function () {
+    const buckets = _.times(_.random(40, 200), function () {
       return _.sample(geoHashCharts, 3).join('');
     })
     .sort()
     .map(function (geoHash) {
-      let count = _.random(1, 5000);
+      const count = _.random(1, 5000);
 
-      totalDocCount += count;
       docCount += count;
 
       return {
@@ -78,4 +73,4 @@ export default function GeoHashGridAggResponseFixture() {
       }
     }
   };
-};
+}
diff --git a/src/fixtures/agg_resp/range.js b/src/fixtures/agg_resp/range.js
index f857951c27051..6e1e7bf0726f0 100644
--- a/src/fixtures/agg_resp/range.js
+++ b/src/fixtures/agg_resp/range.js
@@ -1,35 +1,35 @@
 export default {
-  "took": 35,
-  "timed_out": false,
-  "_shards": {
-    "total": 7,
-    "successful": 7,
-    "failed": 0
+  'took': 35,
+  'timed_out': false,
+  '_shards': {
+    'total': 7,
+    'successful': 7,
+    'failed': 0
   },
-  "hits": {
-    "total": 218512,
-    "max_score": 0,
-    "hits": []
+  'hits': {
+    'total': 218512,
+    'max_score': 0,
+    'hits': []
   },
-  "aggregations": {
-    "1": {
-      "buckets": {
-        "*-1024.0": {
-          "to": 1024,
-          "to_as_string": "1024.0",
-          "doc_count": 20904
+  'aggregations': {
+    '1': {
+      'buckets': {
+        '*-1024.0': {
+          'to': 1024,
+          'to_as_string': '1024.0',
+          'doc_count': 20904
         },
-        "1024.0-2560.0": {
-          "from": 1024,
-          "from_as_string": "1024.0",
-          "to": 2560,
-          "to_as_string": "2560.0",
-          "doc_count": 23358
+        '1024.0-2560.0': {
+          'from': 1024,
+          'from_as_string': '1024.0',
+          'to': 2560,
+          'to_as_string': '2560.0',
+          'doc_count': 23358
         },
-        "2560.0-*": {
-          "from": 2560,
-          "from_as_string": "2560.0",
-          "doc_count": 174250
+        '2560.0-*': {
+          'from': 2560,
+          'from_as_string': '2560.0',
+          'doc_count': 174250
         }
       }
     }
diff --git a/src/fixtures/fake_chart_events.js b/src/fixtures/fake_chart_events.js
index 383a61c900815..9e4db976c64e6 100644
--- a/src/fixtures/fake_chart_events.js
+++ b/src/fixtures/fake_chart_events.js
@@ -1,4 +1,4 @@
-let results = {};
+const results = {};
 
 results.timeSeries = {
   data: {
diff --git a/src/fixtures/fake_hierarchical_data.js b/src/fixtures/fake_hierarchical_data.js
index 2b1096cc9c271..d7d734214d4fd 100644
--- a/src/fixtures/fake_hierarchical_data.js
+++ b/src/fixtures/fake_hierarchical_data.js
@@ -1,4 +1,4 @@
-let data = {  };
+const data = {  };
 
 data.metricOnly = {
   hits: { total: 1000, hits: [], max_score: 0 },
diff --git a/src/fixtures/fake_row.js b/src/fixtures/fake_row.js
index 032fe0f1a9235..1c94a5a873d09 100644
--- a/src/fixtures/fake_row.js
+++ b/src/fixtures/fake_row.js
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-let longString = Array(200).join('_');
+const longString = Array(200).join('_');
 
 export default function (id, mapping) {
   function fakeVals(type) {
@@ -17,4 +17,4 @@ export default function (id, mapping) {
     $$_partialFormatted: fakeVals('formatted'),
     $$_flattened: fakeVals('_flattened')
   };
-};
+}
diff --git a/src/fixtures/hits.js b/src/fixtures/hits.js
index dc7811c9452b6..13a62a683a369 100644
--- a/src/fixtures/hits.js
+++ b/src/fixtures/hits.js
@@ -1,16 +1,24 @@
 import _ from 'lodash';
 export default function fitsFixture() {
   return _.map([
-    {_source: {'@timestamp': 0, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 10, request: 'foo'}},
-    {_source: {'@timestamp': 1, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 20, request: 'bar'}},
-    {_source: {'@timestamp': 2, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 30, request: 'bar'}},
-    {_source: {'@timestamp': 3, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 30, request: 'baz'}},
-    {_source: {'@timestamp': 4, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 30, request: 'baz'}},
-    {_source: {'@timestamp': 5, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 30, request: 'baz'}},
-    {_source: {'@timestamp': 6, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 40.141592, request: 'bat'}},
-    {_source: {'@timestamp': 7, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 40.141592, request: 'bat'}},
-    {_source: {'@timestamp': 8, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 40.141592, request: 'bat'}},
-    {_source: {'@timestamp': 9, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 40.141592, request: 'bat'}},
+    { _source: { '@timestamp': 0, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 10, request: 'foo' } },
+    { _source: { '@timestamp': 1, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 20, request: 'bar' } },
+    { _source: { '@timestamp': 2, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 30, request: 'bar' } },
+    { _source: { '@timestamp': 3, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 30, request: 'baz' } },
+    { _source: { '@timestamp': 4, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 30, request: 'baz' } },
+    { _source: { '@timestamp': 5, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 30, request: 'baz' } },
+    {
+      _source: { '@timestamp': 6, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 40.141592, request: 'bat' }
+    },
+    {
+      _source: { '@timestamp': 7, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 40.141592, request: 'bat' }
+    },
+    {
+      _source: { '@timestamp': 8, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 40.141592, request: 'bat' }
+    },
+    {
+      _source: { '@timestamp': 9, ssl: true, ip: '192.168.0.1', extension: 'php', 'machine.os': 'Linux', bytes: 40.141592, request: 'bat' }
+    },
   ], function (p, i) {
     return _.merge({}, p, {
       _score: 1,
@@ -19,4 +27,4 @@ export default function fitsFixture() {
       _index: 'test-index'
     });
   });
-};
+}
diff --git a/src/fixtures/mock_courier.js b/src/fixtures/mock_courier.js
index ef68696693551..c95a35ea0ef99 100644
--- a/src/fixtures/mock_courier.js
+++ b/src/fixtures/mock_courier.js
@@ -1,16 +1,15 @@
-import _ from 'lodash';
 import sinon from 'auto-release-sinon';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 export default function (Private, Promise) {
-  let indexPatterns = Private(FixturesStubbedLogstashIndexPatternProvider);
-  let getIndexPatternStub = sinon.stub();
+  const indexPatterns = Private(FixturesStubbedLogstashIndexPatternProvider);
+  const getIndexPatternStub = sinon.stub();
   getIndexPatternStub.returns(Promise.resolve(indexPatterns));
 
-  let courier = {
+  const courier = {
     indexPatterns: { get: getIndexPatternStub },
     getStub: getIndexPatternStub
   };
 
   return courier;
-};
+}
diff --git a/src/fixtures/mock_ui_state.js b/src/fixtures/mock_ui_state.js
index 50d913ae337e8..7614896cceb6f 100644
--- a/src/fixtures/mock_ui_state.js
+++ b/src/fixtures/mock_ui_state.js
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-let keys = {};
+const keys = {};
 export default {
   get: function (path, def) {
     return keys[path] == null ? def : keys[path];
@@ -10,4 +10,4 @@ export default {
   },
   on: _.noop,
   off: _.noop
-}
+};
diff --git a/src/fixtures/stubbed_doc_source_response.js b/src/fixtures/stubbed_doc_source_response.js
index 5bed6d41af348..99055142e5bb1 100644
--- a/src/fixtures/stubbed_doc_source_response.js
+++ b/src/fixtures/stubbed_doc_source_response.js
@@ -1,7 +1,7 @@
 import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields';
 
 function stubbedDocSourceResponse(Private) {
-  let mockLogstashFields = Private(FixturesLogstashFieldsProvider);
+  const mockLogstashFields = Private(FixturesLogstashFieldsProvider);
 
   return function (id, index) {
     index = index || '.kibana';
diff --git a/src/fixtures/stubbed_logstash_index_pattern.js b/src/fixtures/stubbed_logstash_index_pattern.js
index 8377132b6d8ea..e5473a14e55ab 100644
--- a/src/fixtures/stubbed_logstash_index_pattern.js
+++ b/src/fixtures/stubbed_logstash_index_pattern.js
@@ -3,23 +3,23 @@ import TestUtilsStubIndexPatternProvider from 'test_utils/stub_index_pattern';
 import IndexPatternsFieldTypesProvider from 'ui/index_patterns/_field_types';
 import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields';
 export default function stubbedLogstashIndexPatternService(Private) {
-  let StubIndexPattern = Private(TestUtilsStubIndexPatternProvider);
-  let fieldTypes = Private(IndexPatternsFieldTypesProvider);
-  let mockLogstashFields = Private(FixturesLogstashFieldsProvider);
+  const StubIndexPattern = Private(TestUtilsStubIndexPatternProvider);
+  const fieldTypes = Private(IndexPatternsFieldTypesProvider);
+  const mockLogstashFields = Private(FixturesLogstashFieldsProvider);
 
 
-  let fields = mockLogstashFields.map(function (field) {
+  const fields = mockLogstashFields.map(function (field) {
     field.displayName = field.name;
-    let type = fieldTypes.byName[field.type];
+    const type = fieldTypes.byName[field.type];
     if (!type) throw new TypeError('unknown type ' + field.type);
     if (!_.has(field, 'sortable')) field.sortable = type.sortable;
     if (!_.has(field, 'filterable')) field.filterable = type.filterable;
     return field;
   });
 
-  let indexPattern = new StubIndexPattern('logstash-*', 'time', fields);
+  const indexPattern = new StubIndexPattern('logstash-*', 'time', fields);
   indexPattern.id = 'logstash-*';
 
   return indexPattern;
 
-};
+}
diff --git a/src/fixtures/stubbed_search_source.js b/src/fixtures/stubbed_search_source.js
index 118aaede15047..08b43ed7d9676 100644
--- a/src/fixtures/stubbed_search_source.js
+++ b/src/fixtures/stubbed_search_source.js
@@ -4,7 +4,7 @@ import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logsta
 
 export default function stubSearchSource(Private, $q, Promise) {
   let deferedResult = $q.defer();
-  let indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
+  const indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
 
   return {
     sort: sinon.spy(),
@@ -35,4 +35,4 @@ export default function stubSearchSource(Private, $q, Promise) {
     }
   };
 
-};
+}
diff --git a/src/fixtures/vislib/_vis_fixture.js b/src/fixtures/vislib/_vis_fixture.js
index 79a82dfe52414..3214cf0cc0747 100644
--- a/src/fixtures/vislib/_vis_fixture.js
+++ b/src/fixtures/vislib/_vis_fixture.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import $ from 'jquery';
 import VislibVisProvider from 'ui/vislib/vis';
 
-let $visCanvas = $('<div>')
+const $visCanvas = $('<div>')
   .attr('id', 'vislib-vis-fixtures')
   .css({
     height: '500px',
@@ -17,7 +17,7 @@ let $visCanvas = $('<div>')
   .appendTo('body');
 
 let count = 0;
-let visHeight = $visCanvas.height();
+const visHeight = $visCanvas.height();
 
 $visCanvas.new = function () {
   count += 1;
@@ -33,7 +33,7 @@ afterEach(function () {
 
 module.exports = function VislibFixtures(Private) {
   return function (visLibParams) {
-    let Vis = Private(VislibVisProvider);
+    const Vis = Private(VislibVisProvider);
     return new Vis($visCanvas.new(), _.defaults({}, visLibParams || {}, {
       shareYAxis: true,
       addTooltip: true,
diff --git a/src/optimize/babel_options.build.js b/src/optimize/babel_options.build.js
index 885a318ab84d1..ec3f11f6f1528 100644
--- a/src/optimize/babel_options.build.js
+++ b/src/optimize/babel_options.build.js
@@ -1,5 +1,5 @@
 import { cloneDeep } from 'lodash';
-let fromRoot = require('path').resolve.bind(null, __dirname, '../../');
+const fromRoot = require('path').resolve.bind(null, __dirname, '../../');
 
 if (!process.env.BABEL_CACHE_PATH) {
   process.env.BABEL_CACHE_PATH = fromRoot('optimize/.babelcache.json');
diff --git a/src/optimize/babel_options.js b/src/optimize/babel_options.js
index e562700da3708..903701133ae59 100644
--- a/src/optimize/babel_options.js
+++ b/src/optimize/babel_options.js
@@ -1,8 +1,8 @@
 // this file is not transpiled
 'use strict'; // eslint-disable-line strict
 
-let cloneDeep = require('lodash').cloneDeep;
-let fromRoot = require('path').resolve.bind(null, __dirname, '../../');
+const cloneDeep = require('lodash').cloneDeep;
+const fromRoot = require('path').resolve.bind(null, __dirname, '../../');
 
 if (!process.env.BABEL_CACHE_PATH) {
   process.env.BABEL_CACHE_PATH = fromRoot('optimize/.babelcache.json');
diff --git a/src/optimize/base_optimizer.js b/src/optimize/base_optimizer.js
index 5e0e79d3d72a2..e071ccc23d75f 100644
--- a/src/optimize/base_optimizer.js
+++ b/src/optimize/base_optimizer.js
@@ -8,11 +8,10 @@ import UglifyJsPlugin from 'webpack/lib/optimize/UglifyJsPlugin';
 
 import fromRoot from '../utils/from_root';
 import babelOptions from './babel_options';
-import { inherits } from 'util';
 import { defaults, transform } from 'lodash';
 import { resolve } from 'path';
 import { writeFile } from 'fs';
-let babelExclude = [/[\/\\](webpackShims|node_modules|bower_components)[\/\\]/];
+const babelExclude = [/[\/\\](webpackShims|node_modules|bower_components)[\/\\]/];
 import pkg from '../../package.json';
 
 class BaseOptimizer {
@@ -47,14 +46,14 @@ class BaseOptimizer {
   async initCompiler() {
     if (this.compiler) return this.compiler;
 
-    let compilerConfig = this.getConfig();
+    const compilerConfig = this.getConfig();
     this.compiler = webpack(compilerConfig);
 
     this.compiler.plugin('done', stats => {
       if (!this.profile) return;
 
-      let path = resolve(this.env.workingDir, 'stats.json');
-      let content = JSON.stringify(stats.toJson());
+      const path = resolve(this.env.workingDir, 'stats.json');
+      const content = JSON.stringify(stats.toJson());
       writeFile(path, content, function (err) {
         if (err) throw err;
       });
@@ -64,8 +63,8 @@ class BaseOptimizer {
   }
 
   getConfig() {
-    let mapQ = this.sourceMaps ? '?sourceMap' : '';
-    let mapQPre = mapQ ? mapQ + '&' : '?';
+    const mapQ = this.sourceMaps ? '?sourceMap' : '';
+    const mapQPre = mapQ ? mapQ + '&' : '?';
 
     return {
       context: fromRoot('.'),
@@ -177,7 +176,7 @@ class BaseOptimizer {
   }
 
   failedStatsToError(stats) {
-    let statFormatOpts = {
+    const statFormatOpts = {
       hash: false,  // add the hash of the compilation
       version: false,  // add webpack version information
       timings: false,  // add timing information
@@ -196,7 +195,7 @@ class BaseOptimizer {
       children: false,
     };
 
-    let details = stats.toString(defaults({ colors: true }, statFormatOpts));
+    const details = stats.toString(defaults({ colors: true }, statFormatOpts));
 
     return Boom.create(
       500,
diff --git a/src/optimize/fs_optimizer.js b/src/optimize/fs_optimizer.js
index 67e03c66c64a8..7251e9ba17e2a 100644
--- a/src/optimize/fs_optimizer.js
+++ b/src/optimize/fs_optimizer.js
@@ -1,8 +1,6 @@
 
 import BaseOptimizer from './base_optimizer';
-import fromRoot from '../utils/from_root';
 import { fromNode } from 'bluebird';
-import { writeFile } from 'fs';
 
 module.exports = class FsOptimizer extends BaseOptimizer {
   async init() {
@@ -12,7 +10,7 @@ module.exports = class FsOptimizer extends BaseOptimizer {
   async run() {
     if (!this.compiler) await this.init();
 
-    let stats = await fromNode(cb => {
+    await fromNode(cb => {
       this.compiler.run((err, stats) => {
         if (err || !stats) return cb(err);
 
diff --git a/src/optimize/index.js b/src/optimize/index.js
index a753ea40f8381..14ceeb30fbcec 100644
--- a/src/optimize/index.js
+++ b/src/optimize/index.js
@@ -10,29 +10,29 @@ module.exports = async (kbnServer, server, config) => {
   // on the watch setup managed by the cli. It proxies all bundles/* requests to
   // the other server. The server on 5602 is long running, in order to prevent
   // complete rebuilds of the optimize content.
-  let lazy = config.get('optimize.lazy');
+  const lazy = config.get('optimize.lazy');
   if (lazy) {
     return await kbnServer.mixin(require('./lazy/lazy'));
   }
 
-  let bundles = kbnServer.bundles;
+  const bundles = kbnServer.bundles;
   server.exposeStaticDir('/bundles/{path*}', bundles.env.workingDir);
   await bundles.writeEntryFiles();
 
   // in prod, only bundle when someing is missing or invalid
-  let invalidBundles = config.get('optimize.useBundleCache') ? await bundles.getInvalidBundles() : bundles;
+  const invalidBundles = config.get('optimize.useBundleCache') ? await bundles.getInvalidBundles() : bundles;
 
   // we might not have any work to do
   if (!invalidBundles.getIds().length) {
     server.log(
       ['debug', 'optimize'],
-      `All bundles are cached and ready to go!`
+      'All bundles are cached and ready to go!'
     );
     return;
   }
 
   // only require the FsOptimizer when we need to
-  let optimizer = new FsOptimizer({
+  const optimizer = new FsOptimizer({
     env: bundles.env,
     bundles: bundles,
     profile: config.get('optimize.profile'),
@@ -46,9 +46,9 @@ module.exports = async (kbnServer, server, config) => {
     `Optimizing and caching ${bundles.desc()}. This may take a few minutes`
   );
 
-  let start = Date.now();
+  const start = Date.now();
   await optimizer.run();
-  let seconds = ((Date.now() - start) / 1000).toFixed(2);
+  const seconds = ((Date.now() - start) / 1000).toFixed(2);
 
   server.log(['info', 'optimize'], `Optimization of ${bundles.desc()} complete in ${seconds} seconds`);
 };
diff --git a/src/optimize/lazy/lazy.js b/src/optimize/lazy/lazy.js
index c370f88c16de1..e3d20934c76dd 100644
--- a/src/optimize/lazy/lazy.js
+++ b/src/optimize/lazy/lazy.js
@@ -1,9 +1,9 @@
 import { isWorker } from 'cluster';
-module.exports = async (kbnServer, server, config) => {
+module.exports = async kbnServer => {
 
 
   if (!isWorker) {
-    throw new Error(`lazy optimization is only available in "watch" mode`);
+    throw new Error('lazy optimization is only available in "watch" mode');
   }
 
   /**
diff --git a/src/optimize/lazy/lazy_optimizer.js b/src/optimize/lazy/lazy_optimizer.js
index ca7b052e392f6..6c10926e16036 100644
--- a/src/optimize/lazy/lazy_optimizer.js
+++ b/src/optimize/lazy/lazy_optimizer.js
@@ -1,8 +1,6 @@
-import Boom from 'boom';
-
 import BaseOptimizer from '../base_optimizer';
 import WeirdControlFlow from './weird_control_flow';
-import { once, pick, size } from 'lodash';
+import { once } from 'lodash';
 import { join } from 'path';
 
 module.exports = class LazyOptimizer extends BaseOptimizer {
@@ -41,7 +39,7 @@ module.exports = class LazyOptimizer extends BaseOptimizer {
         return;
       }
 
-      let err = this.failedStatsToError(stats);
+      const err = this.failedStatsToError(stats);
       this.logRunFailure(err);
       this.build.failure(err);
       this.watching.invalidate();
@@ -54,7 +52,7 @@ module.exports = class LazyOptimizer extends BaseOptimizer {
       }
     });
 
-    let buildPromise = this.build.get();
+    const buildPromise = this.build.get();
     if (this.prebuild) await buildPromise;
 
     this.initializing = false;
@@ -75,7 +73,7 @@ module.exports = class LazyOptimizer extends BaseOptimizer {
       method: 'GET',
       handler: async (request, reply) => {
         try {
-          let path = await this.getPath(request.params.asset);
+          const path = await this.getPath(request.params.asset);
           return reply.file(path);
         } catch (error) {
           console.log(error.stack);
@@ -87,7 +85,7 @@ module.exports = class LazyOptimizer extends BaseOptimizer {
 
   logRunStart() {
     this.log(['info', 'optimize'], {
-      tmpl: `Lazy optimization started`,
+      tmpl: 'Lazy optimization started',
       bundles: this.bundles.getIds()
     });
   }
diff --git a/src/optimize/lazy/lazy_server.js b/src/optimize/lazy/lazy_server.js
index 0b6440645dec4..0061cdb6597d1 100644
--- a/src/optimize/lazy/lazy_server.js
+++ b/src/optimize/lazy/lazy_server.js
@@ -1,5 +1,4 @@
 
-import Boom from 'boom';
 import { Server } from 'hapi';
 import { fromNode } from 'bluebird';
 import registerHapiPlugins from '../../server/http/register_hapi_plugins';
diff --git a/src/optimize/lazy/optmzr_role.js b/src/optimize/lazy/optmzr_role.js
index 8c6a653fe0937..637e5be75b923 100644
--- a/src/optimize/lazy/optmzr_role.js
+++ b/src/optimize/lazy/optmzr_role.js
@@ -1,9 +1,8 @@
 import LazyServer from './lazy_server';
 import LazyOptimizer from './lazy_optimizer';
-import { fromRoot } from '../../utils';
 
 export default async (kbnServer, kibanaHapiServer, config) => {
-  let server = new LazyServer(
+  const server = new LazyServer(
     config.get('optimize.lazyHost'),
     config.get('optimize.lazyPort'),
     new LazyOptimizer({
@@ -20,7 +19,7 @@ export default async (kbnServer, kibanaHapiServer, config) => {
 
   let ready = false;
 
-  let sendReady = () => {
+  const sendReady = () => {
     if (!process.connected) return;
     process.send(['WORKER_BROADCAST', { optimizeReady: ready }]);
   };
diff --git a/src/optimize/lazy/proxy_role.js b/src/optimize/lazy/proxy_role.js
index b9b0f26ed6a63..09c3848cf769b 100644
--- a/src/optimize/lazy/proxy_role.js
+++ b/src/optimize/lazy/proxy_role.js
@@ -14,15 +14,15 @@ module.exports = (kbnServer, server, config) => {
         xforward: true
       }
     },
-    config: {auth: false}
+    config: { auth: false }
   });
 
   return fromNode(cb => {
-    let timeout = setTimeout(() => {
+    const timeout = setTimeout(() => {
       cb(new Error('Server timedout waiting for the optimizer to become ready'));
     }, config.get('optimize.lazyProxyTimeout'));
 
-    let waiting = once(() => {
+    const waiting = once(() => {
       server.log(['info', 'optimize'], 'Waiting for optimizer completion');
     });
 
diff --git a/src/optimize/lazy/weird_control_flow.js b/src/optimize/lazy/weird_control_flow.js
index ae37cce688283..335c87a387337 100644
--- a/src/optimize/lazy/weird_control_flow.js
+++ b/src/optimize/lazy/weird_control_flow.js
@@ -2,7 +2,7 @@ import { fromNode } from 'bluebird';
 
 
 module.exports = class WeirdControlFlow {
-  constructor(work) {
+  constructor() {
     this.handlers = [];
   }
 
@@ -51,7 +51,7 @@ module.exports = class WeirdControlFlow {
   }
 
   _flush(args) {
-    for (let fn of this.handlers.splice(0)) {
+    for (const fn of this.handlers.splice(0)) {
       fn.apply(null, args);
     }
   }
diff --git a/src/server/__tests__/base_path.js b/src/server/__tests__/base_path.js
index fde7ec98f128a..eb92d6769a043 100644
--- a/src/server/__tests__/base_path.js
+++ b/src/server/__tests__/base_path.js
@@ -1,5 +1,3 @@
-import { resolve } from 'path';
-import { fromNode as fn } from 'bluebird';
 import expect from 'expect.js';
 
 import * as kbnTestServer from '../../../test/utils/kbn_server';
diff --git a/src/server/config/__tests__/config.js b/src/server/config/__tests__/config.js
index 0dc60f98f6004..766942ba0245e 100644
--- a/src/server/config/__tests__/config.js
+++ b/src/server/config/__tests__/config.js
@@ -14,7 +14,7 @@ import Joi from 'joi';
  *
  */
 
-let data = {
+const data = {
   test: {
     hosts: ['host-01', 'host-02'],
     client: {
@@ -25,7 +25,7 @@ let data = {
   }
 };
 
-let schema = Joi.object({
+const schema = Joi.object({
   test: Joi.object({
     enable: Joi.boolean().default(true),
     hosts: Joi.array().items(Joi.string()),
@@ -44,39 +44,39 @@ describe('lib/config/config', function () {
     describe('constructor', function () {
 
       it('should not allow any config if the schema is not passed', function () {
-        let config = new Config();
-        let run = function () {
+        const config = new Config();
+        const run = function () {
           config.set('something.enable', true);
         };
         expect(run).to.throwException();
       });
 
       it('should allow keys in the schema', function () {
-        let config = new Config(schema);
-        let run = function () {
+        const config = new Config(schema);
+        const run = function () {
           config.set('test.client.host', 'http://localhost');
         };
         expect(run).to.not.throwException();
       });
 
       it('should not allow keys not in the schema', function () {
-        let config = new Config(schema);
-        let run = function () {
+        const config = new Config(schema);
+        const run = function () {
           config.set('paramNotDefinedInTheSchema', true);
         };
         expect(run).to.throwException();
       });
 
       it('should not allow child keys not in the schema', function () {
-        let config = new Config(schema);
-        let run = function () {
+        const config = new Config(schema);
+        const run = function () {
           config.set('test.client.paramNotDefinedInTheSchema', true);
         };
         expect(run).to.throwException();
       });
 
       it('should set defaults', function () {
-        let config = new Config(schema);
+        const config = new Config(schema);
         expect(config.get('test.enable')).to.be(true);
         expect(config.get('test.client.type')).to.be('datastore');
       });
@@ -92,7 +92,7 @@ describe('lib/config/config', function () {
 
       it('should reset the config object with new values', function () {
         config.set(data);
-        let newData = config.get();
+        const newData = config.get();
         newData.test.enable = false;
         config.resetTo(newData);
         expect(config.get()).to.eql(newData);
@@ -134,21 +134,21 @@ describe('lib/config/config', function () {
       });
 
       it('should use an object to set config values', function () {
-        let hosts = ['host-01', 'host-02'];
+        const hosts = ['host-01', 'host-02'];
         config.set({ test: { enable: false, hosts: hosts } });
         expect(config.get('test.enable')).to.be(false);
         expect(config.get('test.hosts')).to.eql(hosts);
       });
 
       it('should use a flatten object to set config values', function () {
-        let hosts = ['host-01', 'host-02'];
+        const hosts = ['host-01', 'host-02'];
         config.set({ 'test.enable': false, 'test.hosts': hosts });
         expect(config.get('test.enable')).to.be(false);
         expect(config.get('test.hosts')).to.eql(hosts);
       });
 
       it('should override values with just the values present', function () {
-        let newData = _.cloneDeep(data);
+        const newData = _.cloneDeep(data);
         config.set(data);
         newData.test.enable = false;
         config.set({ test: { enable: false } });
@@ -156,7 +156,7 @@ describe('lib/config/config', function () {
       });
 
       it('should thow an exception when setting a value with the wrong type', function (done) {
-        let run = function () {
+        const run = function () {
           config.set('test.enable', 'something');
         };
         expect(run).to.throwException(function (err) {
@@ -179,7 +179,7 @@ describe('lib/config/config', function () {
       });
 
       it('should return the whole config object when called without a key', function () {
-        let newData = _.cloneDeep(data);
+        const newData = _.cloneDeep(data);
         newData.test.enable = true;
         expect(config.get()).to.eql(newData);
       });
@@ -194,14 +194,14 @@ describe('lib/config/config', function () {
       });
 
       it('should throw exception for unknown config values', function () {
-        let run = function () {
+        const run = function () {
           config.get('test.does.not.exist');
         };
         expect(run).to.throwException(/Unknown config key: test.does.not.exist/);
       });
 
       it('should not throw exception for undefined known config values', function () {
-        let run = function getUndefValue() {
+        const run = function getUndefValue() {
           config.get('test.undefValue');
         };
         expect(run).to.not.throwException();
@@ -216,22 +216,22 @@ describe('lib/config/config', function () {
       });
 
       it('should allow you to extend the schema at the top level', function () {
-        let newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
+        const newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
         config.extendSchema('myTest', newSchema);
         expect(config.get('myTest.test')).to.be(true);
       });
 
       it('should allow you to extend the schema with a prefix', function () {
-        let newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
+        const newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
         config.extendSchema('prefix.myTest', newSchema);
-        expect(config.get('prefix')).to.eql({ myTest: { test: true }});
+        expect(config.get('prefix')).to.eql({ myTest: { test: true } });
         expect(config.get('prefix.myTest')).to.eql({ test: true });
         expect(config.get('prefix.myTest.test')).to.be(true);
       });
 
       it('should NOT allow you to extend the schema if somethign else is there', function () {
-        let newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
-        let run = function () {
+        const newSchema = Joi.object({ test: Joi.boolean().default(true) }).default();
+        const run = function () {
           config.extendSchema('test', newSchema);
         };
         expect(run).to.throwException();
@@ -241,7 +241,7 @@ describe('lib/config/config', function () {
 
     describe('#removeSchema(key)', function () {
       it('should completely remove the key', function () {
-        let config = new Config(Joi.object().keys({
+        const config = new Config(Joi.object().keys({
           a: Joi.number().default(1)
         }));
 
@@ -251,7 +251,7 @@ describe('lib/config/config', function () {
       });
 
       it('only removes existing keys', function () {
-        let config = new Config(Joi.object());
+        const config = new Config(Joi.object());
 
         expect(() => config.removeSchema('b')).to.throwException('Unknown schema');
       });
diff --git a/src/server/config/__tests__/explode_by.js b/src/server/config/__tests__/explode_by.js
index 3514413e575b6..52ab03e00d047 100644
--- a/src/server/config/__tests__/explode_by.js
+++ b/src/server/config/__tests__/explode_by.js
@@ -4,7 +4,7 @@ import expect from 'expect.js';
 describe('explode_by(dot, flatObject)', function () {
 
   it('should explode a flatten object with dots', function () {
-    let flatObject = {
+    const flatObject = {
       'test.enable': true,
       'test.hosts': ['host-01', 'host-02']
     };
@@ -17,7 +17,7 @@ describe('explode_by(dot, flatObject)', function () {
   });
 
   it('should explode a flatten object with slashes', function () {
-    let flatObject = {
+    const flatObject = {
       'test/enable': true,
       'test/hosts': ['host-01', 'host-02']
     };
diff --git a/src/server/config/__tests__/flatten_with.js b/src/server/config/__tests__/flatten_with.js
index 9dc40fc08097e..78864e490bc30 100644
--- a/src/server/config/__tests__/flatten_with.js
+++ b/src/server/config/__tests__/flatten_with.js
@@ -4,7 +4,7 @@ import expect from 'expect.js';
 describe('flatten_with(dot, nestedObj)', function () {
 
   it('should flatten object with dot', function () {
-    let nestedObj = {
+    const nestedObj = {
       test: {
         enable: true,
         hosts: ['host-01', 'host-02'],
diff --git a/src/server/config/__tests__/override.js b/src/server/config/__tests__/override.js
index 18b3117dcbe56..055e09d2f0f9f 100644
--- a/src/server/config/__tests__/override.js
+++ b/src/server/config/__tests__/override.js
@@ -4,7 +4,7 @@ import expect from 'expect.js';
 describe('override(target, source)', function () {
 
   it('should override the values form source to target', function () {
-    let target = {
+    const target = {
       test: {
         enable: true,
         host: ['host-01', 'host-02'],
@@ -13,7 +13,7 @@ describe('override(target, source)', function () {
         }
       }
     };
-    let source = { test: { client: { type: 'nosql' } } };
+    const source = { test: { client: { type: 'nosql' } } };
     expect(override(target, source)).to.eql({
       test: {
         enable: true,
diff --git a/src/server/config/__tests__/schema.js b/src/server/config/__tests__/schema.js
index ce4b262c515b3..3c0cd25536d79 100644
--- a/src/server/config/__tests__/schema.js
+++ b/src/server/config/__tests__/schema.js
@@ -13,23 +13,23 @@ describe('Config schema', function () {
   describe('server', function () {
     describe('basePath', function () {
       it('accepts empty strings', function () {
-        const { error } = validate({ server: { basePath: '' }});
+        const { error } = validate({ server: { basePath: '' } });
         expect(error == null).to.be.ok();
       });
 
       it('accepts strings with leading slashes', function () {
-        const { error } = validate({ server: { basePath: '/path' }});
+        const { error } = validate({ server: { basePath: '/path' } });
         expect(error == null).to.be.ok();
       });
 
       it('rejects strings with trailing slashes', function () {
-        const { error } = validate({ server: { basePath: '/path/' }});
+        const { error } = validate({ server: { basePath: '/path/' } });
         expect(error).to.have.property('details');
         expect(error.details[0]).to.have.property('path', 'server.basePath');
       });
 
       it('rejects strings without leading slashes', function () {
-        const { error } = validate({ server: { basePath: 'path' }});
+        const { error } = validate({ server: { basePath: 'path' } });
         expect(error).to.have.property('details');
         expect(error.details[0]).to.have.property('path', 'server.basePath');
       });
diff --git a/src/server/config/complete.js b/src/server/config/complete.js
index be44448733782..a76edae6f9a95 100644
--- a/src/server/config/complete.js
+++ b/src/server/config/complete.js
@@ -4,8 +4,8 @@ export default function (kbnServer, server, config) {
     return kbnServer.config;
   });
 
-  let tmpl = 'Settings for "<%= key %>" were not applied, check for spelling errors and ensure the plugin is loaded.';
-  for (let [key, val] of config.getPendingSets()) {
+  const tmpl = 'Settings for "<%= key %>" were not applied, check for spelling errors and ensure the plugin is loaded.';
+  for (const [key, val] of config.getPendingSets()) {
     server.log(['warning', 'config'], { key, val, tmpl });
   }
-};
+}
diff --git a/src/server/config/config.js b/src/server/config/config.js
index 28c8ea4158138..db6b3520b776c 100644
--- a/src/server/config/config.js
+++ b/src/server/config/config.js
@@ -42,7 +42,7 @@ module.exports = class Config {
     _.set(this[schemaExts], key, extension);
     this[schema] = null;
 
-    let initialVals = _.get(this[pendingSets], key);
+    const initialVals = _.get(this[pendingSets], key);
     if (initialVals) {
       this.set(key, initialVals);
       unset(this[pendingSets], key);
@@ -86,11 +86,11 @@ module.exports = class Config {
     if (_.isObject(env)) env = env.name;
     if (!env) env = process.env.NODE_ENV || 'production';
 
-    let dev = env === 'development';
-    let prod = env === 'production';
+    const dev = env === 'development';
+    const prod = env === 'production';
 
     // pass the environment as context so that it can be refed in config
-    let context = {
+    const context = {
       env: env,
       prod: prod,
       dev: dev,
@@ -107,7 +107,7 @@ module.exports = class Config {
       );
     }
 
-    let results = Joi.validate(newVals, this.getSchema(), { context });
+    const results = Joi.validate(newVals, this.getSchema(), { context });
 
     if (results.error) {
       throw results.error;
@@ -121,7 +121,7 @@ module.exports = class Config {
       return clone(this[vals]);
     }
 
-    let value = _.get(this[vals], key);
+    const value = _.get(this[vals], key);
     if (value === undefined) {
       if (!this.has(key)) {
         throw new Error('Unknown config key: ' + key);
@@ -138,7 +138,7 @@ module.exports = class Config {
       // Only go deep on inner objects with children
       if (_.size(schema._inner.children)) {
         for (let i = 0; i < schema._inner.children.length; i++) {
-          let child = schema._inner.children[i];
+          const child = schema._inner.children[i];
           // If the child is an object recurse through it's children and return
           // true if there's a match
           if (child.schema._type === 'object') {
diff --git a/src/server/config/deep_clone_with_buffers.js b/src/server/config/deep_clone_with_buffers.js
index 1b11dbd96557f..b61296b2b81ae 100644
--- a/src/server/config/deep_clone_with_buffers.js
+++ b/src/server/config/deep_clone_with_buffers.js
@@ -8,4 +8,4 @@ function cloneBuffersCustomizer(val) {
 
 export default function (vals) {
   return cloneDeep(vals, cloneBuffersCustomizer);
-};
+}
diff --git a/src/server/config/explode_by.js b/src/server/config/explode_by.js
index 50e2b2e82615f..a2e632ddf2a68 100644
--- a/src/server/config/explode_by.js
+++ b/src/server/config/explode_by.js
@@ -1,10 +1,10 @@
 import _ from 'lodash';
 module.exports = function (dot, flatObject) {
-  let fullObject = {};
+  const fullObject = {};
   _.each(flatObject, function (value, key) {
-    let keys = key.split(dot);
+    const keys = key.split(dot);
     (function walk(memo, keys, value) {
-      let _key = keys.shift();
+      const _key = keys.shift();
       if (keys.length === 0) {
         memo[_key] = value;
       } else {
diff --git a/src/server/config/flatten_with.js b/src/server/config/flatten_with.js
index 1401e12f0fb85..ede084f56a3fc 100644
--- a/src/server/config/flatten_with.js
+++ b/src/server/config/flatten_with.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 module.exports = function (dot, nestedObj, flattenArrays) {
-  let stack = []; // track key stack
-  let flatObj = {};
+  const stack = []; // track key stack
+  const flatObj = {};
   (function flattenObj(obj) {
     _.keys(obj).forEach(function (key) {
       stack.push(key);
diff --git a/src/server/config/override.js b/src/server/config/override.js
index ef850a32754ae..3354fd5956fe7 100644
--- a/src/server/config/override.js
+++ b/src/server/config/override.js
@@ -3,8 +3,8 @@ import flattenWith from './flatten_with';
 import explodeBy from './explode_by';
 
 module.exports = function (target, source) {
-  let _target = flattenWith('.', target);
-  let _source = flattenWith('.', source);
+  const _target = flattenWith('.', target);
+  const _source = flattenWith('.', source);
   return explodeBy('.', _.defaults(_source, _target));
 };
 
diff --git a/src/server/config/schema.js b/src/server/config/schema.js
index 959c2653454ad..c9343b08dc0b2 100644
--- a/src/server/config/schema.js
+++ b/src/server/config/schema.js
@@ -1,6 +1,4 @@
 import Joi from 'joi';
-import { get } from 'lodash';
-import { randomBytes } from 'crypto';
 import os from 'os';
 
 import { fromRoot } from '../../utils';
@@ -38,8 +36,8 @@ module.exports = () => Joi.object({
     port: Joi.number().default(5601),
     maxPayloadBytes: Joi.number().default(1048576),
     autoListen: Joi.boolean().default(true),
-    defaultRoute: Joi.string().default('/app/kibana').regex(/^\//, `start with a slash`),
-    basePath: Joi.string().default('').allow('').regex(/(^$|^\/.*[^\/]$)/, `start with a slash, don't end with one`),
+    defaultRoute: Joi.string().default('/app/kibana').regex(/^\//, 'start with a slash'),
+    basePath: Joi.string().default('').allow('').regex(/(^$|^\/.*[^\/]$)/, 'start with a slash, don\'t end with one'),
     ssl: Joi.object({
       cert: Joi.string(),
       key: Joi.string()
diff --git a/src/server/http/__tests__/short_url_assert_valid.js b/src/server/http/__tests__/short_url_assert_valid.js
index 5bedf0959a790..5a225a6fe5aaf 100644
--- a/src/server/http/__tests__/short_url_assert_valid.js
+++ b/src/server/http/__tests__/short_url_assert_valid.js
@@ -1,5 +1,3 @@
-import Boom from 'boom';
-
 import { shortUrlAssertValid } from '../short_url_assert_valid';
 
 
@@ -22,7 +20,7 @@ describe('shortUrlAssertValid()', () => {
     it(`fails when url has ${desc}`, () => {
       try {
         shortUrlAssertValid(url);
-        throw new Error(`expected assertion to throw`);
+        throw new Error('expected assertion to throw');
       } catch (err) {
         if (!err || !err.isBoom) {
           throw err;
diff --git a/src/server/http/__tests__/version_check.js b/src/server/http/__tests__/version_check.js
index 389d07cd4bf6b..445db7f4ec45b 100644
--- a/src/server/http/__tests__/version_check.js
+++ b/src/server/http/__tests__/version_check.js
@@ -31,7 +31,7 @@ describe('version_check request filter', function () {
     });
 
     return kbnServer;
-  };
+  }
 
   let kbnServer;
   beforeEach(async () => kbnServer = await makeServer());
diff --git a/src/server/http/get_default_route.js b/src/server/http/get_default_route.js
index 09d525bbb006a..afdcbc9a44eb9 100644
--- a/src/server/http/get_default_route.js
+++ b/src/server/http/get_default_route.js
@@ -1,6 +1,8 @@
 import _ from 'lodash';
 
 module.exports = _.once(function (kbnServer) {
-  const { uiExports, config } = kbnServer;
+  const {
+    config
+  } = kbnServer;
   return `${config.get('server.basePath')}${config.get('server.defaultRoute')}`;
 });
diff --git a/src/server/http/index.js b/src/server/http/index.js
index 2f84533923d9d..a4d29360b8571 100644
--- a/src/server/http/index.js
+++ b/src/server/http/index.js
@@ -1,12 +1,7 @@
-import { parse } from 'url';
 import { format } from 'url';
 import _ from 'lodash';
-import fs from 'fs';
 import Boom from 'boom';
 import Hapi from 'hapi';
-import HapiTemplates from 'vision';
-import HapiStaticFiles from 'inert';
-import HapiProxy from 'h2o2';
 import getDefaultRoute from './get_default_route';
 import versionCheckMixin from './version_check';
 import { shortUrlAssertValid } from './short_url_assert_valid';
@@ -31,7 +26,7 @@ module.exports = async function (kbnServer, server, config) {
           lookupCompressed: true
         }
       },
-      config: {auth: false}
+      config: { auth: false }
     });
   });
 
@@ -43,7 +38,7 @@ module.exports = async function (kbnServer, server, config) {
       handler: {
         file: filePath
       },
-      config: {auth: false}
+      config: { auth: false }
     });
   });
 
@@ -71,7 +66,7 @@ module.exports = async function (kbnServer, server, config) {
 
   // attach the app name to the server, so we can be sure we are actually talking to kibana
   server.ext('onPreResponse', function (req, reply) {
-    let response = req.response;
+    const response = req.response;
 
     if (response.isBoom) {
       response.output.headers['kbn-name'] = kbnServer.name;
@@ -99,7 +94,7 @@ module.exports = async function (kbnServer, server, config) {
     method: 'GET',
     path: '/{p*}',
     handler: function (req, reply) {
-      let path = req.path;
+      const path = req.path;
       if (path === '/' || path.charAt(path.length - 1) !== '/') {
         return reply(Boom.notFound());
       }
diff --git a/src/server/http/register_hapi_plugins.js b/src/server/http/register_hapi_plugins.js
index 395beb0d37a6c..5d990cf77dc1a 100644
--- a/src/server/http/register_hapi_plugins.js
+++ b/src/server/http/register_hapi_plugins.js
@@ -11,6 +11,6 @@ async function registerPlugins(server) {
   });
 }
 
-export default function (kbnServer, server, config) {
+export default function (kbnServer, server) {
   registerPlugins(server);
 }
diff --git a/src/server/http/short_url_lookup.js b/src/server/http/short_url_lookup.js
index 2f0d3b3764486..bd947863d2877 100644
--- a/src/server/http/short_url_lookup.js
+++ b/src/server/http/short_url_lookup.js
@@ -24,7 +24,7 @@ export default function (server) {
   }
 
   async function getUrlDoc(urlId) {
-    const urlDoc = await new Promise((resolve, reject) => {
+    const urlDoc = await new Promise(resolve => {
       const client = server.plugins.elasticsearch.client;
       const kibanaIndex = server.config().get('kibana.index');
 
@@ -36,7 +36,7 @@ export default function (server) {
       .then(response => {
         resolve(response);
       })
-      .catch(err => {
+      .catch(() => {
         resolve();
       });
     });
@@ -100,4 +100,4 @@ export default function (server) {
       }
     }
   };
-};
+}
diff --git a/src/server/kbn_server.js b/src/server/kbn_server.js
index dd4088c0b4421..1fd7422d8dce4 100644
--- a/src/server/kbn_server.js
+++ b/src/server/kbn_server.js
@@ -1,11 +1,11 @@
 import { constant, once, compact, flatten } from 'lodash';
-import { promisify, resolve, fromNode } from 'bluebird';
+import { resolve, fromNode } from 'bluebird';
 import { isWorker } from 'cluster';
 import { fromRoot, pkg } from '../utils';
 import Config from './config/config';
 import loggingConfiguration from './logging/configuration';
 
-let rootDir = fromRoot('.');
+const rootDir = fromRoot('.');
 
 module.exports = class KbnServer {
   constructor(settings) {
@@ -72,7 +72,7 @@ module.exports = class KbnServer {
    * @return {Promise} - promise that is resolved when the final mixin completes.
    */
   async mixin(...fns) {
-    for (let fn of compact(flatten(fns))) {
+    for (const fn of compact(flatten(fns))) {
       await fn.call(this, this, this.server, this.config);
     }
   }
@@ -84,7 +84,9 @@ module.exports = class KbnServer {
    * @return undefined
    */
   async listen() {
-    let { server, config } = this;
+    const {
+      server
+    } = this;
 
     await this.ready();
     await fromNode(cb => server.start(cb));
diff --git a/src/server/lib/commander_extensions.js b/src/server/lib/commander_extensions.js
index abbd76e3be85d..a7e26c3dd5954 100644
--- a/src/server/lib/commander_extensions.js
+++ b/src/server/lib/commander_extensions.js
@@ -6,4 +6,4 @@ export default function (program) {
   program.isCommandSpecified = function () {
     return program.args.some(isCommand);
   };
-};
+}
diff --git a/src/server/logging/__tests__/apply_filters_to_keys.js b/src/server/logging/__tests__/apply_filters_to_keys.js
index 0175b90ff221b..02c3efab19b43 100644
--- a/src/server/logging/__tests__/apply_filters_to_keys.js
+++ b/src/server/logging/__tests__/apply_filters_to_keys.js
@@ -3,7 +3,7 @@ import expect from 'expect.js';
 
 describe('applyFiltersToKeys(obj, actionsByKey)', function () {
   it('applies for each key+prop in actionsByKey', function () {
-    let data = applyFiltersToKeys({
+    const data = applyFiltersToKeys({
       a: {
         b: {
           c: 1
diff --git a/src/server/logging/apply_filters_to_keys.js b/src/server/logging/apply_filters_to_keys.js
index bc85f2fd1f555..19dc6e5d154d8 100644
--- a/src/server/logging/apply_filters_to_keys.js
+++ b/src/server/logging/apply_filters_to_keys.js
@@ -7,7 +7,7 @@ function replacer(match, group) {
 }
 
 function apply(obj, key, action) {
-  for (let k in obj)  {
+  for (const k in obj)  {
     if (obj.hasOwnProperty(k)) {
       let val = obj[k];
       if (k === key) {
@@ -21,9 +21,9 @@ function apply(obj, key, action) {
           obj[k] = ('' + val).replace(/./g, 'X');
         }
         else if (/\/.+\//.test(action)) {
-          let matches = action.match(/\/(.+)\//);
+          const matches = action.match(/\/(.+)\//);
           if (matches) {
-            let regex = new RegExp(matches[1]);
+            const regex = new RegExp(matches[1]);
             obj[k] = ('' + val).replace(regex, replacer);
           }
         }
diff --git a/src/server/logging/configuration.js b/src/server/logging/configuration.js
index 2a894a0d97e44..be66a2e738c8b 100644
--- a/src/server/logging/configuration.js
+++ b/src/server/logging/configuration.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import logReporter from './log_reporter';
 
 export default function loggingConfiguration(config) {
-  let events = config.get('logging.events');
+  const events = config.get('logging.events');
 
   if (config.get('logging.silent')) {
     _.defaults(events, {});
diff --git a/src/server/logging/index.js b/src/server/logging/index.js
index 8f4640aadfe03..b58a41e528e41 100644
--- a/src/server/logging/index.js
+++ b/src/server/logging/index.js
@@ -12,4 +12,4 @@ export default function (kbnServer, server, config) {
       options: loggingConfiguration(config)
     }, cb);
   });
-};
+}
diff --git a/src/server/logging/log_format.js b/src/server/logging/log_format.js
index 7d11c59abd265..7a077ecdd5c27 100644
--- a/src/server/logging/log_format.js
+++ b/src/server/logging/log_format.js
@@ -18,7 +18,7 @@ function serializeError(err) {
   };
 }
 
-let levelColor = function (code) {
+const levelColor = function (code) {
   if (code < 299) return ansicolors.green(code);
   if (code < 399) return ansicolors.yellow(code);
   if (code < 499) return ansicolors.magenta(code);
@@ -41,13 +41,13 @@ module.exports = class TransformObjStream extends Stream.Transform {
   }
 
   _transform(event, enc, next) {
-    let data = this.filter(this.readEvent(event));
+    const data = this.filter(this.readEvent(event));
     this.push(this.format(data) + '\n');
     next();
   }
 
   readEvent(event) {
-    let data = {
+    const data = {
       type: event.event,
       '@timestamp': moment.utc(event.timestamp).format(),
       tags: [].concat(event.tags || []),
@@ -82,7 +82,7 @@ module.exports = class TransformObjStream extends Stream.Transform {
         contentLength: contentLength
       };
 
-      let query = querystring.stringify(event.query);
+      const query = querystring.stringify(event.query);
       if (query) data.req.url += '?' + query;
 
 
diff --git a/src/server/logging/log_format_json.js b/src/server/logging/log_format_json.js
index 7df528ab968bb..440982bbd3ea7 100644
--- a/src/server/logging/log_format_json.js
+++ b/src/server/logging/log_format_json.js
@@ -1,7 +1,7 @@
 import LogFormat from './log_format';
 import stringify from 'json-stringify-safe';
 
-let stripColors = function (string) {
+const stripColors = function (string) {
   return string.replace(/\u001b[^m]+m/g, '');
 };
 
diff --git a/src/server/logging/log_format_string.js b/src/server/logging/log_format_string.js
index ea1c2f3b4b3d3..ab8154995702c 100644
--- a/src/server/logging/log_format_string.js
+++ b/src/server/logging/log_format_string.js
@@ -4,7 +4,7 @@ import moment from 'moment';
 
 import LogFormat from './log_format';
 
-let statuses = [
+const statuses = [
   'err',
   'info',
   'error',
@@ -14,7 +14,7 @@ let statuses = [
   'debug'
 ];
 
-let typeColors = {
+const typeColors = {
   log: 'blue',
   req: 'green',
   res: 'green',
@@ -34,22 +34,22 @@ let typeColors = {
   listening: 'magenta'
 };
 
-let color = _.memoize(function (name) {
+const color = _.memoize(function (name) {
   return ansicolors[typeColors[name]] || _.identity;
 });
 
-let type = _.memoize(function (t) {
+const type = _.memoize(function (t) {
   return color(t)(_.pad(t, 7).slice(0, 7));
 });
 
-let workerType = process.env.kbnWorkerType ? `${type(process.env.kbnWorkerType)} ` : '';
+const workerType = process.env.kbnWorkerType ? `${type(process.env.kbnWorkerType)} ` : '';
 
 module.exports = class KbnLoggerJsonFormat extends LogFormat {
   format(data) {
-    let time = color('time')(moment(data.timestamp).utc().format('HH:mm:ss.SSS'));
-    let msg = data.error ? color('error')(data.error.stack) : color('message')(data.message);
+    const time = color('time')(moment(data.timestamp).utc().format('HH:mm:ss.SSS'));
+    const msg = data.error ? color('error')(data.error.stack) : color('message')(data.message);
 
-    let tags = _(data.tags)
+    const tags = _(data.tags)
     .sortBy(function (tag) {
       if (color(tag) === _.identity) return `2${tag}`;
       if (_.includes(statuses, tag)) return `0${tag}`;
diff --git a/src/server/logging/log_interceptor.js b/src/server/logging/log_interceptor.js
index 7a86d87dd4aa5..8eba9a1a66824 100644
--- a/src/server/logging/log_interceptor.js
+++ b/src/server/logging/log_interceptor.js
@@ -44,4 +44,4 @@ export class LogInterceptor extends Stream.Transform {
     this.push(downgraded || event);
     next();
   }
-};
+}
diff --git a/src/server/logging/log_reporter.js b/src/server/logging/log_reporter.js
index 999d1e69f5682..b5e25b5f5cf65 100644
--- a/src/server/logging/log_reporter.js
+++ b/src/server/logging/log_reporter.js
@@ -1,5 +1,3 @@
-import _ from 'lodash';
-
 import { Squeeze } from 'good-squeeze';
 import { createWriteStream as writeStr } from 'fs';
 
diff --git a/src/server/path/__tests__/index.js b/src/server/path/__tests__/index.js
index c709df29dc0e3..261b0d535d48d 100644
--- a/src/server/path/__tests__/index.js
+++ b/src/server/path/__tests__/index.js
@@ -1,6 +1,6 @@
 import expect from 'expect.js';
 import path from '../';
-import { accessSync, R_OK} from 'fs';
+import { accessSync, R_OK } from 'fs';
 
 describe('Default path finder', function () {
   it('should find a kibana.yml', () => {
diff --git a/src/server/path/index.js b/src/server/path/index.js
index 76f01e1535b0b..8c6b44bf6ec66 100644
--- a/src/server/path/index.js
+++ b/src/server/path/index.js
@@ -1,4 +1,4 @@
-import { accessSync, R_OK} from 'fs';
+import { accessSync, R_OK } from 'fs';
 import { find } from 'lodash';
 import { fromRoot } from '../../utils';
 
diff --git a/src/server/pid/index.js b/src/server/pid/index.js
index 7d7c1dbdea0fb..d1e1610679d6f 100644
--- a/src/server/pid/index.js
+++ b/src/server/pid/index.js
@@ -2,19 +2,19 @@ import _ from 'lodash';
 import Boom from 'boom';
 import Promise from 'bluebird';
 import { unlinkSync as unlink } from 'fs';
-let writeFile = Promise.promisify(require('fs').writeFile);
+const writeFile = Promise.promisify(require('fs').writeFile);
 
 module.exports = Promise.method(function (kbnServer, server, config) {
-  let path = config.get('pid.file');
+  const path = config.get('pid.file');
   if (!path) return;
 
-  let pid = String(process.pid);
+  const pid = String(process.pid);
 
   return writeFile(path, pid, { flag: 'wx' })
   .catch(function (err) {
     if (err.code !== 'EEXIST') throw err;
 
-    let log = {
+    const log = {
       tmpl: 'pid file already exists at <%= path %>',
       path: path,
       pid: pid
@@ -36,7 +36,7 @@ module.exports = Promise.method(function (kbnServer, server, config) {
       pid: pid
     });
 
-    let clean = _.once(function (code) {
+    const clean = _.once(function () {
       unlink(path);
     });
 
@@ -48,7 +48,7 @@ module.exports = Promise.method(function (kbnServer, server, config) {
       process.kill(process.pid, 'SIGINT');
     });
 
-    process.on('unhandledRejection', function (reason, promise) {
+    process.on('unhandledRejection', function (reason) {
       server.log(['warning'], `Detected an unhandled Promise rejection.\n${reason}`);
     });
   });
diff --git a/src/server/plugins/__tests__/plugin_init.js b/src/server/plugins/__tests__/plugin_init.js
index 1a38d334969ec..37dfba4ee4ffb 100644
--- a/src/server/plugins/__tests__/plugin_init.js
+++ b/src/server/plugins/__tests__/plugin_init.js
@@ -1,4 +1,4 @@
-import {values} from 'lodash';
+import { values } from 'lodash';
 import expect from 'expect.js';
 import sinon from 'auto-release-sinon';
 import pluginInit from '../plugin_init';
diff --git a/src/server/plugins/check_enabled.js b/src/server/plugins/check_enabled.js
index 7953165d88007..846716ad37477 100644
--- a/src/server/plugins/check_enabled.js
+++ b/src/server/plugins/check_enabled.js
@@ -3,7 +3,7 @@ import toPath from 'lodash/internal/toPath';
 export default async function (kbnServer, server, config) {
   const { plugins } = kbnServer;
 
-  for (let plugin of plugins) {
+  for (const plugin of plugins) {
     const enabledInConfig = config.get([...toPath(plugin.configPrefix), 'enabled']);
 
     if (!enabledInConfig) {
diff --git a/src/server/plugins/check_version.js b/src/server/plugins/check_version.js
index bb50b8daac06f..0438ea1c70d2f 100644
--- a/src/server/plugins/check_version.js
+++ b/src/server/plugins/check_version.js
@@ -11,13 +11,13 @@ function compatibleWithKibana(kbnServer, plugin) {
   return versionSatisfies(pluginKibanaVersion, kibanaVersion);
 }
 
-export default async function (kbnServer, server, config) {
+export default async function(kbnServer, server) {
   //because a plugin pack can contain more than one actual plugin, (for example x-pack)
   //we make sure that the warning messages are unique
   const warningMessages = new Set();
   const plugins = kbnServer.plugins;
 
-  for (let plugin of plugins) {
+  for (const plugin of plugins) {
     const version = plugin.kibanaVersion;
     const name = get(plugin, 'pkg.name');
 
@@ -28,7 +28,7 @@ export default async function (kbnServer, server, config) {
     }
   }
 
-  for (let message of warningMessages) {
+  for (const message of warningMessages) {
     server.log(['warning'], message);
   }
 
diff --git a/src/server/plugins/initialize.js b/src/server/plugins/initialize.js
index 402b750fbcc03..262c2a9d0b6d2 100644
--- a/src/server/plugins/initialize.js
+++ b/src/server/plugins/initialize.js
@@ -7,7 +7,7 @@ module.exports = async function (kbnServer, server, config) {
     return [];
   }
 
-  let { plugins } = kbnServer;
+  const { plugins } = kbnServer;
 
   // extend plugin apis with additional context
   plugins.getPluginApis().forEach(api => {
diff --git a/src/server/plugins/plugin.js b/src/server/plugins/plugin.js
index 976cf41e3b216..1aae1df4bdd38 100644
--- a/src/server/plugins/plugin.js
+++ b/src/server/plugins/plugin.js
@@ -2,7 +2,6 @@ import _ from 'lodash';
 import Joi from 'joi';
 import Bluebird, { attempt, fromNode } from 'bluebird';
 import { basename, resolve } from 'path';
-import { inherits } from 'util';
 
 const extendInitFns = Symbol('extend plugin initialization');
 
@@ -95,7 +94,7 @@ module.exports = class Plugin {
   }
 
   async getConfigSchema() {
-    let schema = await this.getExternalConfigSchema(Joi);
+    const schema = await this.getExternalConfigSchema(Joi);
     return schema || defaultConfigSchema;
   }
 
@@ -104,8 +103,8 @@ module.exports = class Plugin {
   }
 
   async init() {
-    let { id, version, kbnServer, configPrefix } = this;
-    let { config } = kbnServer;
+    const { id, version, kbnServer, configPrefix } = this;
+    const { config } = kbnServer;
 
     // setup the hapi register function and get on with it
     const asyncRegister = async (server, options) => {
diff --git a/src/server/plugins/plugin_api.js b/src/server/plugins/plugin_api.js
index bda666f81d543..7883004ac2a31 100644
--- a/src/server/plugins/plugin_api.js
+++ b/src/server/plugins/plugin_api.js
@@ -1,6 +1,5 @@
-import _ from 'lodash';
 import Plugin from './plugin';
-import { basename, join } from 'path';
+import { join } from 'path';
 
 module.exports = class PluginApi {
   constructor(kibana, pluginPath) {
diff --git a/src/server/plugins/plugin_collection.js b/src/server/plugins/plugin_collection.js
index 62fdd3e90d786..103c7251baabb 100644
--- a/src/server/plugins/plugin_collection.js
+++ b/src/server/plugins/plugin_collection.js
@@ -1,21 +1,20 @@
 
 import PluginApi from './plugin_api';
 import { inspect } from 'util';
-import { get, indexBy } from 'lodash';
-import toPath from 'lodash/internal/toPath';
+import { indexBy } from 'lodash';
 import Collection from '../../utils/collection';
 
-let byIdCache = Symbol('byIdCache');
-let pluginApis = Symbol('pluginApis');
+const byIdCache = Symbol('byIdCache');
+const pluginApis = Symbol('pluginApis');
 
 async function addPluginConfig(pluginCollection, plugin) {
   const configSchema = await plugin.getConfigSchema();
-  let { config } = pluginCollection.kbnServer;
+  const { config } = pluginCollection.kbnServer;
   config.extendSchema(plugin.configPrefix, configSchema);
 }
 
 function removePluginConfig(pluginCollection, plugin) {
-  let { config } = pluginCollection.kbnServer;
+  const { config } = pluginCollection.kbnServer;
   config.removeSchema(plugin.configPrefix);
 }
 
@@ -28,18 +27,17 @@ module.exports = class Plugins extends Collection {
   }
 
   async new(path) {
-    let api = new PluginApi(this.kbnServer, path);
+    const api = new PluginApi(this.kbnServer, path);
     this[pluginApis].add(api);
 
-    let output = [].concat(require(path)(api) || []);
-    let config = this.kbnServer.config;
+    const output = [].concat(require(path)(api) || []);
 
     if (!output.length) return;
 
     // clear the byIdCache
     this[byIdCache] = null;
 
-    for (let plugin of output) {
+    for (const plugin of output) {
       if (!plugin instanceof api.Plugin) {
         throw new TypeError('unexpected plugin export ' + inspect(plugin));
       }
diff --git a/src/server/plugins/plugin_init.js b/src/server/plugins/plugin_init.js
index 8f5e9e3184478..9a04e9d8f4d7d 100644
--- a/src/server/plugins/plugin_init.js
+++ b/src/server/plugins/plugin_init.js
@@ -1,10 +1,10 @@
 import { includes } from 'lodash';
 
 export default async (plugins) => {
-  let path = [];
+  const path = [];
 
   const initialize = async function (id, fn) {
-    let plugin = plugins.byId[id];
+    const plugin = plugins.byId[id];
 
     if (includes(path, id)) {
       throw new Error(`circular dependencies found: "${path.concat(id).join(' -> ')}"`);
@@ -12,7 +12,7 @@ export default async (plugins) => {
 
     path.push(id);
 
-    for (let reqId of plugin.requiredIds) {
+    for (const reqId of plugin.requiredIds) {
       if (!plugins.byId[reqId]) {
         throw new Error(`Unmet requirement "${reqId}" for plugin "${id}"`);
       }
@@ -25,11 +25,11 @@ export default async (plugins) => {
   };
 
   const collection = plugins.toArray();
-  for (let {id} of collection) {
+  for (const { id } of collection) {
     await initialize(id, 'preInit');
   }
 
-  for (let {id} of collection) {
+  for (const { id } of collection) {
     await initialize(id, 'init');
   }
 };
diff --git a/src/server/plugins/scan.js b/src/server/plugins/scan.js
index baa5147e44530..4ac6b3e5563ff 100644
--- a/src/server/plugins/scan.js
+++ b/src/server/plugins/scan.js
@@ -6,13 +6,13 @@ import { each } from 'bluebird';
 import PluginCollection from './plugin_collection';
 module.exports = async (kbnServer, server, config) => {
 
-  let plugins = kbnServer.plugins = new PluginCollection(kbnServer);
+  const plugins = kbnServer.plugins = new PluginCollection(kbnServer);
 
-  let scanDirs = [].concat(config.get('plugins.scanDirs') || []);
-  let pluginPaths = [].concat(config.get('plugins.paths') || []);
+  const scanDirs = [].concat(config.get('plugins.scanDirs') || []);
+  const pluginPaths = [].concat(config.get('plugins.paths') || []);
 
-  let debug = _.bindKey(server, 'log', ['plugins', 'debug']);
-  let warning = _.bindKey(server, 'log', ['plugins', 'warning']);
+  const debug = _.bindKey(server, 'log', ['plugins', 'debug']);
+  const warning = _.bindKey(server, 'log', ['plugins', 'warning']);
 
   // scan all scanDirs to find pluginPaths
   await each(scanDirs, async dir => {
@@ -36,15 +36,15 @@ module.exports = async (kbnServer, server, config) => {
     await each(filenames, async name => {
       if (name[0] === '.') return;
 
-      let path = resolve(dir, name);
-      let stats = await fromNode(cb => stat(path, cb));
+      const path = resolve(dir, name);
+      const stats = await fromNode(cb => stat(path, cb));
       if (stats.isDirectory()) {
         pluginPaths.push(path);
       }
     });
   });
 
-  for (let path of pluginPaths) {
+  for (const path of pluginPaths) {
     let modulePath;
     try {
       modulePath = require.resolve(path);
diff --git a/src/server/status/__tests__/server_status.js b/src/server/status/__tests__/server_status.js
index 3d08250fbf81f..aea1babffb6c6 100644
--- a/src/server/status/__tests__/server_status.js
+++ b/src/server/status/__tests__/server_status.js
@@ -7,7 +7,7 @@ import Status from '../status';
 import ServerStatus from '../server_status';
 
 describe('ServerStatus class', function () {
-  const plugin = {id: 'name', version: '1.2.3'};
+  const plugin = { id: 'name', version: '1.2.3' };
 
   let server;
   let serverStatus;
@@ -26,7 +26,7 @@ describe('ServerStatus class', function () {
 
   describe('#createForPlugin(plugin)', function () {
     it('should create a new status by plugin', function () {
-      let status = serverStatus.createForPlugin(plugin);
+      const status = serverStatus.createForPlugin(plugin);
       expect(status).to.be.a(Status);
     });
   });
@@ -45,7 +45,7 @@ describe('ServerStatus class', function () {
 
   describe('#getForPluginId(plugin)', function () {
     it('exposes plugin status for the plugin', function () {
-      let status = serverStatus.createForPlugin(plugin);
+      const status = serverStatus.createForPlugin(plugin);
       expect(serverStatus.getForPluginId(plugin.id)).to.be(status);
     });
 
@@ -57,7 +57,7 @@ describe('ServerStatus class', function () {
 
   describe('#getState(id)', function () {
     it('should expose the state of a status by id', function () {
-      let status = serverStatus.create('someid');
+      const status = serverStatus.create('someid');
       status.green();
       expect(serverStatus.getState('someid')).to.be('green');
     });
@@ -65,7 +65,7 @@ describe('ServerStatus class', function () {
 
   describe('#getStateForPluginId(plugin)', function () {
     it('should expose the state of a plugin by id', function () {
-      let status = serverStatus.createForPlugin(plugin);
+      const status = serverStatus.createForPlugin(plugin);
       status.green();
       expect(serverStatus.getStateForPluginId(plugin.id)).to.be('green');
     });
@@ -73,11 +73,11 @@ describe('ServerStatus class', function () {
 
   describe('#overall()', function () {
     it('considers each status to produce a summary', function () {
-      let status = serverStatus.createForPlugin(plugin);
+      const status = serverStatus.createForPlugin(plugin);
 
       expect(serverStatus.overall().state).to.be('uninitialized');
 
-      let match = function (overall, state) {
+      const match = function (overall, state) {
         expect(overall).to.have.property('state', state.id);
         expect(overall).to.have.property('title', state.title);
         expect(overall).to.have.property('icon', state.icon);
@@ -99,18 +99,18 @@ describe('ServerStatus class', function () {
 
   describe('#toJSON()', function () {
     it('serializes to overall status and individuals', function () {
-      const pluginOne = {id: 'one', version: '1.0.0'};
-      const pluginTwo = {id: 'two', version: '2.0.0'};
+      const pluginOne = { id: 'one', version: '1.0.0' };
+      const pluginTwo = { id: 'two', version: '2.0.0' };
 
-      let service = serverStatus.create('some service');
-      let p1 = serverStatus.createForPlugin(pluginOne);
-      let p2 = serverStatus.createForPlugin(pluginTwo);
+      const service = serverStatus.create('some service');
+      const p1 = serverStatus.createForPlugin(pluginOne);
+      const p2 = serverStatus.createForPlugin(pluginTwo);
 
       service.green();
       p1.yellow();
       p2.red();
 
-      let json = JSON.parse(JSON.stringify(serverStatus));
+      const json = JSON.parse(JSON.stringify(serverStatus));
       expect(json).to.have.property('overall');
       expect(json.overall.state).to.eql(serverStatus.overall().state);
       expect(json.statuses).to.have.length(3);
diff --git a/src/server/status/__tests__/status.js b/src/server/status/__tests__/status.js
index 2dfe037791027..1b9e92a3b66d7 100644
--- a/src/server/status/__tests__/status.js
+++ b/src/server/status/__tests__/status.js
@@ -1,10 +1,9 @@
 import expect from 'expect.js';
 import sinon from 'sinon';
-import Status from '../status';
 import ServerStatus from '../server_status';
 
 describe('Status class', function () {
-  const plugin = {id: 'test', version: '1.2.3'};
+  const plugin = { id: 'test', version: '1.2.3' };
 
   let server;
   let serverStatus;
@@ -19,7 +18,7 @@ describe('Status class', function () {
   });
 
   it('emits change when the status is set', function (done) {
-    let status = serverStatus.createForPlugin(plugin);
+    const status = serverStatus.createForPlugin(plugin);
 
     status.once('change', function (prevState, prevMsg, newState, newMsg) {
       expect(newState).to.be('green');
@@ -42,8 +41,8 @@ describe('Status class', function () {
   });
 
   it('should only trigger the change listener when something changes', function () {
-    let status = serverStatus.createForPlugin(plugin);
-    let stub = sinon.stub();
+    const status = serverStatus.createForPlugin(plugin);
+    const stub = sinon.stub();
     status.on('change', stub);
     status.green('Ready');
     status.green('Ready');
@@ -52,18 +51,18 @@ describe('Status class', function () {
   });
 
   it('should create a JSON representation of the status', function () {
-    let status = serverStatus.createForPlugin(plugin);
+    const status = serverStatus.createForPlugin(plugin);
     status.green('Ready');
 
-    let json = status.toJSON();
+    const json = status.toJSON();
     expect(json.id).to.eql(status.id);
     expect(json.state).to.eql('green');
     expect(json.message).to.eql('Ready');
   });
 
   it('should call on handler if status is already matched', function (done) {
-    let status = serverStatus.createForPlugin(plugin);
-    let msg = 'Test Ready';
+    const status = serverStatus.createForPlugin(plugin);
+    const msg = 'Test Ready';
     status.green(msg);
 
     status.on('green', function (prev, prevMsg) {
@@ -76,8 +75,8 @@ describe('Status class', function () {
   });
 
   it('should call once handler if status is already matched', function (done) {
-    let status = serverStatus.createForPlugin(plugin);
-    let msg = 'Test Ready';
+    const status = serverStatus.createForPlugin(plugin);
+    const msg = 'Test Ready';
     status.green(msg);
 
     status.once('green', function (prev, prevMsg) {
@@ -91,16 +90,16 @@ describe('Status class', function () {
 
   function testState(color) {
     it(`should change the state to ${color} when #${color}() is called`, function () {
-      let status = serverStatus.createForPlugin(plugin);
-      let message = 'testing ' + color;
+      const status = serverStatus.createForPlugin(plugin);
+      const message = 'testing ' + color;
       status[color](message);
       expect(status).to.have.property('state', color);
       expect(status).to.have.property('message', message);
     });
 
     it(`should trigger the "change" listner when #${color}() is called`, function (done) {
-      let status = serverStatus.createForPlugin(plugin);
-      let message = 'testing ' + color;
+      const status = serverStatus.createForPlugin(plugin);
+      const message = 'testing ' + color;
       status.on('change', function (prev, prevMsg) {
         expect(status.state).to.be(color);
         expect(status.message).to.be(message);
@@ -113,9 +112,9 @@ describe('Status class', function () {
     });
 
     it(`should trigger the "${color}" listner when #${color}() is called`, function (done) {
-      let status = serverStatus.createForPlugin(plugin);
-      let message = 'testing ' + color;
-      status.on(color, function (prev, prevMsg) {
+      const status = serverStatus.createForPlugin(plugin);
+      const message = 'testing ' + color;
+      status.on(color, function () {
         expect(status.state).to.be(color);
         expect(status.message).to.be(message);
         done();
diff --git a/src/server/status/index.js b/src/server/status/index.js
index 487621ba6a768..2c4149ed53a67 100644
--- a/src/server/status/index.js
+++ b/src/server/status/index.js
@@ -1,7 +1,5 @@
-import _ from 'lodash';
 import ServerStatus from './server_status';
 import wrapAuthConfig from './wrap_auth_config';
-import { join } from 'path';
 
 export default function (kbnServer, server, config) {
   kbnServer.status = new ServerStatus(kbnServer.server);
@@ -46,4 +44,4 @@ export default function (kbnServer, server, config) {
       return reply.renderStatusPage();
     }
   }));
-};
+}
diff --git a/src/server/status/metrics.js b/src/server/status/metrics.js
index 28b99011bc988..d00a8eb540d04 100644
--- a/src/server/status/metrics.js
+++ b/src/server/status/metrics.js
@@ -6,13 +6,13 @@ module.exports = function (kbnServer, server, config) {
   kbnServer.metrics = new Samples(12);
 
   server.plugins['even-better'].monitor.on('ops', function (event) {
-    let now = Date.now();
-    let secSinceLast = (now - lastReport) / 1000;
+    const now = Date.now();
+    const secSinceLast = (now - lastReport) / 1000;
     lastReport = now;
 
-    let port = config.get('server.port');
-    let requests = _.get(event, ['requests', port, 'total'], 0);
-    let requestsPerSecond = requests / secSinceLast;
+    const port = config.get('server.port');
+    const requests = _.get(event, ['requests', port, 'total'], 0);
+    const requestsPerSecond = requests / secSinceLast;
 
     kbnServer.metrics.add({
       heapTotal: _.get(event, 'psmem.heapTotal'),
diff --git a/src/server/status/samples.js b/src/server/status/samples.js
index fd2bc4aa27c84..20164c07b7834 100644
--- a/src/server/status/samples.js
+++ b/src/server/status/samples.js
@@ -7,8 +7,8 @@ function Samples(max) {
 }
 
 Samples.prototype.add = function (sample) {
-  let vals = this.vals;
-  let length = this.length = Math.min(this.length + 1, this.max);
+  const vals = this.vals;
+  const length = this.length = Math.min(this.length + 1, this.max);
 
   _.forOwn(sample, function (val, name) {
     if (val == null) val = null;
diff --git a/src/server/status/server_status.js b/src/server/status/server_status.js
index 88c44354f2e71..d89af280a57e3 100644
--- a/src/server/status/server_status.js
+++ b/src/server/status/server_status.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 
 import states from './states';
 import Status from './status';
-import {version} from '../../../package.json';
+import { version } from '../../../package.json';
 
 module.exports = class ServerStatus {
   constructor(server) {
@@ -24,7 +24,7 @@ module.exports = class ServerStatus {
   }
 
   each(fn) {
-    let self = this;
+    const self = this;
     _.forOwn(self._created, function (status, i, list) {
       if (status.state !== 'disabled') {
         fn.call(self, status, i, list);
@@ -55,15 +55,15 @@ module.exports = class ServerStatus {
   }
 
   overall() {
-    let state = _(this._created)
+    const state = _(this._created)
     .map(function (status) {
       return states.get(status.state);
     })
     .sortBy('severity')
     .pop();
 
-    let statuses = _.where(this._created, { state: state.id });
-    let since = _.get(_.sortBy(statuses, 'since'), [0, 'since']);
+    const statuses = _.where(this._created, { state: state.id });
+    const since = _.get(_.sortBy(statuses, 'since'), [0, 'since']);
 
     return {
       state: state.id,
@@ -83,7 +83,7 @@ module.exports = class ServerStatus {
   }
 
   toString() {
-    let overall = this.overall();
+    const overall = this.overall();
     return `${overall.title} – ${overall.nickname}`;
   }
 
diff --git a/src/server/status/status.js b/src/server/status/status.js
index 573eb041a2a6b..b876c42a9e9a4 100644
--- a/src/server/status/status.js
+++ b/src/server/status/status.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import states from './states';
 import { EventEmitter } from 'events';
 
@@ -65,8 +64,8 @@ states.all.forEach(function (state) {
   Status.prototype[state.id] = function (message) {
     if (this.state === 'disabled') return;
 
-    let previous = this.state;
-    let previousMsg = this.message;
+    const previous = this.state;
+    const previousMsg = this.message;
 
     this.error = null;
     this.message = message || state.title;
diff --git a/src/server/status/wrap_auth_config.js b/src/server/status/wrap_auth_config.js
index f9530987f24d4..0a5b0d7917c6d 100644
--- a/src/server/status/wrap_auth_config.js
+++ b/src/server/status/wrap_auth_config.js
@@ -1,6 +1,6 @@
-import {assign, identity} from 'lodash';
+import { assign, identity } from 'lodash';
 
 export default (allowAnonymous) => {
-  if (allowAnonymous) return options => assign(options, {config: {auth: false}});
+  if (allowAnonymous) return options => assign(options, { config: { auth: false } });
   return identity;
 };
diff --git a/src/server/warnings/index.js b/src/server/warnings/index.js
index 99fcadb6eeb5e..2e2a9348835d8 100644
--- a/src/server/warnings/index.js
+++ b/src/server/warnings/index.js
@@ -1,4 +1,4 @@
-export default function (kbnServer, server, config) {
+export default function (kbnServer, server) {
   process.on('warning', (warning) => {
     server.log(['warning', 'process'], warning);
   });
diff --git a/src/test_utils/simulate_keys.js b/src/test_utils/simulate_keys.js
index 8282d8e5cc9e3..5d2aac2f7e812 100644
--- a/src/test_utils/simulate_keys.js
+++ b/src/test_utils/simulate_keys.js
@@ -2,8 +2,7 @@ import $ from 'jquery';
 import _ from 'lodash';
 import Promise from 'bluebird';
 import keyMap from 'ui/utils/key_map';
-let reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1));
-let KeyboardEvent = window.KeyboardEvent;
+const reverseKeyMap = _.mapValues(_.invert(keyMap), _.ary(_.parseInt, 1));
 
 /**
  * Simulate keyboard events in an element. This allows testing the way that
@@ -35,7 +34,7 @@ let KeyboardEvent = window.KeyboardEvent;
  * @async
  */
 export default function ($el, sequence) {
-  let modifierState = {
+  const modifierState = {
     ctrlKey: false,
     shiftKey: false,
     altKey: false,
@@ -45,7 +44,7 @@ export default function ($el, sequence) {
   return doList(_.clone(sequence));
 
   function setModifier(key, state) {
-    let name = key + 'Key';
+    const name = key + 'Key';
     if (modifierState.hasOwnProperty(name)) {
       modifierState[name] = !!state;
     }
@@ -90,15 +89,15 @@ export default function ($el, sequence) {
     });
   }
 
-  function fire(type, key, repeat) {
-    let keyCode = reverseKeyMap[key];
+  function fire(type, key) {
+    const keyCode = reverseKeyMap[key];
     if (!keyCode) throw new TypeError('invalid key "' + key + '"');
 
     if (type === 'keydown') setModifier(key, true);
     if (type === 'keyup') setModifier(key, false);
 
-    let $target = _.isFunction($el) ? $el() : $el;
-    let $event = new $.Event(type, _.defaults({ keyCode: keyCode }, modifierState));
+    const $target = _.isFunction($el) ? $el() : $el;
+    const $event = new $.Event(type, _.defaults({ keyCode: keyCode }, modifierState));
     $target.trigger($event);
   }
-};
+}
diff --git a/src/test_utils/stub_browser_storage.js b/src/test_utils/stub_browser_storage.js
index e601e78bfe813..3e3c4d0867f30 100644
--- a/src/test_utils/stub_browser_storage.js
+++ b/src/test_utils/stub_browser_storage.js
@@ -67,7 +67,7 @@ export default class StubBrowserStorage {
   setStubbedSizeLimit(sizeLimit) {
     // We can't reconcile a size limit with the "stored" items, if the stored items size exceeds it.
     if (sizeLimit < this._size) {
-      throw new Error(`You can't set a size limit smaller than the current size.`);
+      throw new Error('You can\'t set a size limit smaller than the current size.');
     }
 
     this._sizeLimit = sizeLimit;
diff --git a/src/test_utils/stub_index_pattern.js b/src/test_utils/stub_index_pattern.js
index c3be4bcbd87e8..64ff63c3d6d5c 100644
--- a/src/test_utils/stub_index_pattern.js
+++ b/src/test_utils/stub_index_pattern.js
@@ -9,10 +9,10 @@ import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 import IndexPatternsFlattenHitProvider from 'ui/index_patterns/_flatten_hit';
 import IndexPatternsFieldProvider from 'ui/index_patterns/_field';
 export default function (Private) {
-  let fieldFormats = Private(RegistryFieldFormatsProvider);
-  let flattenHit = Private(IndexPatternsFlattenHitProvider);
+  const fieldFormats = Private(RegistryFieldFormatsProvider);
+  const flattenHit = Private(IndexPatternsFlattenHitProvider);
 
-  let Field = Private(IndexPatternsFieldProvider);
+  const Field = Private(IndexPatternsFieldProvider);
 
   function StubIndexPattern(pattern, timeField, fields) {
     this.id = pattern;
@@ -52,4 +52,4 @@ export default function (Private) {
   }
 
   return StubIndexPattern;
-};
+}
diff --git a/src/ui/__tests__/ui_exports.js b/src/ui/__tests__/ui_exports.js
index e5f6996af5fee..dcc87ccacb0a5 100644
--- a/src/ui/__tests__/ui_exports.js
+++ b/src/ui/__tests__/ui_exports.js
@@ -7,7 +7,7 @@ import * as kbnTestServer from '../../../test/utils/kbn_server';
 describe('UiExports', function () {
   describe('#find()', function () {
     it('finds exports based on the passed export names', function () {
-      let uiExports = new UiExports({});
+      const uiExports = new UiExports({});
       uiExports.aliases.foo = ['a', 'b', 'c'];
       uiExports.aliases.bar = ['d', 'e', 'f'];
 
@@ -17,7 +17,7 @@ describe('UiExports', function () {
     });
 
     it('allows query types that match nothing', function () {
-      let uiExports = new UiExports({});
+      const uiExports = new UiExports({});
       uiExports.aliases.foo = ['a', 'b', 'c'];
 
       expect(uiExports.find(['foo'])).to.eql(['a', 'b', 'c']);
diff --git a/src/ui/app_entry_template.js b/src/ui/app_entry_template.js
index 2367d04276d83..2c7cc82cb9dc7 100644
--- a/src/ui/app_entry_template.js
+++ b/src/ui/app_entry_template.js
@@ -1,4 +1,4 @@
-module.exports = function ({env, bundle}) {
+module.exports = function ({ env, bundle }) {
 
   const pluginSlug = env.pluginInfo.sort()
   .map(p => ' *  - ' + p)
diff --git a/src/ui/index.js b/src/ui/index.js
index 2edcea8a305ae..a248ed738874e 100644
--- a/src/ui/index.js
+++ b/src/ui/index.js
@@ -1,4 +1,3 @@
-import { format as formatUrl } from 'url';
 import { readFileSync as readFile } from 'fs';
 import { defaults } from 'lodash';
 import Boom from 'boom';
@@ -11,7 +10,7 @@ import UiBundlerEnv from './ui_bundler_env';
 
 export default async (kbnServer, server, config) => {
 
-  const loadingGif = readFile(fromRoot('src/ui/public/loading.gif'), { encoding: 'base64'});
+  const loadingGif = readFile(fromRoot('src/ui/public/loading.gif'), { encoding: 'base64' });
 
   const uiExports = kbnServer.uiExports = new UiExports({
     urlBasePath: config.get('server.basePath')
@@ -25,17 +24,17 @@ export default async (kbnServer, server, config) => {
   bundlerEnv.addContext('buildNum', config.get('pkg.buildNum'));
   uiExports.addConsumer(bundlerEnv);
 
-  for (let plugin of kbnServer.plugins) {
+  for (const plugin of kbnServer.plugins) {
     uiExports.consumePlugin(plugin);
   }
 
   const bundles = kbnServer.bundles = new UiBundleCollection(bundlerEnv, config.get('optimize.bundleFilter'));
 
-  for (let app of uiExports.getAllApps()) {
+  for (const app of uiExports.getAllApps()) {
     bundles.addApp(app);
   }
 
-  for (let gen of uiExports.getBundleProviders()) {
+  for (const gen of uiExports.getBundleProviders()) {
     const bundle = await gen(UiBundle, bundlerEnv, uiExports.getAllApps(), kbnServer.plugins);
     if (bundle) bundles.add(bundle);
   }
diff --git a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
index 94bb16a66cb98..0d7b18f02abea 100644
--- a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
+++ b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
@@ -17,8 +17,8 @@ describe('GeoJson Agg Response Converter', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    let Vis = Private(VisProvider);
-    let indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
+    const Vis = Private(VisProvider);
+    const indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
 
     esResponse = Private(FixturesAggRespGeohashGridProvider);
     tabify = Private(AggResponseTabifyTabifyProvider);
@@ -60,8 +60,8 @@ describe('GeoJson Agg Response Converter', function () {
 
     describe('with table ' + JSON.stringify(tableOpts), function () {
       it('outputs a chart', function () {
-        let table = makeTable();
-        let chart = makeSingleChart(table);
+        const table = makeTable();
+        const chart = makeSingleChart(table);
         expect(chart).to.only.have.keys(
           'title',
           'tooltipFormatter',
@@ -78,9 +78,9 @@ describe('GeoJson Agg Response Converter', function () {
       });
 
       it('outputs geohash points as features in a feature collection', function () {
-        let table = makeTable();
-        let chart = makeSingleChart(table);
-        let geoJson = chart.geoJson;
+        const table = makeTable();
+        const chart = makeSingleChart(table);
+        const geoJson = chart.geoJson;
 
         expect(geoJson.type).to.be('FeatureCollection');
         expect(geoJson.features).to.be.an('array');
@@ -88,8 +88,8 @@ describe('GeoJson Agg Response Converter', function () {
       });
 
       it('exports a bunch of properties about the geo hash grid', function () {
-        let geoJson = makeGeoJson();
-        let props = geoJson.properties;
+        const geoJson = makeGeoJson();
+        const props = geoJson.properties;
 
         // props
         expect(props).to.be.an('object');
@@ -122,7 +122,7 @@ describe('GeoJson Agg Response Converter', function () {
 
           it('should be geoJson format', function () {
             table.rows.forEach(function (row, i) {
-              let feature = chart.geoJson.features[i];
+              const feature = chart.geoJson.features[i];
               expect(feature).to.have.property('geometry');
               expect(feature.geometry).to.be.an('object');
               expect(feature).to.have.property('properties');
@@ -132,7 +132,7 @@ describe('GeoJson Agg Response Converter', function () {
 
           it('should have valid geometry data', function () {
             table.rows.forEach(function (row, i) {
-              let geometry = chart.geoJson.features[i].geometry;
+              const geometry = chart.geoJson.features[i].geometry;
               expect(geometry.type).to.be('Point');
               expect(geometry).to.have.property('coordinates');
               expect(geometry.coordinates).to.be.an('array');
@@ -144,8 +144,8 @@ describe('GeoJson Agg Response Converter', function () {
 
           it('should have value properties data', function () {
             table.rows.forEach(function (row, i) {
-              let props = chart.geoJson.features[i].properties;
-              let keys = ['value', 'geohash', 'aggConfigResult', 'rectangle', 'center'];
+              const props = chart.geoJson.features[i].properties;
+              const keys = ['value', 'geohash', 'aggConfigResult', 'rectangle', 'center'];
               expect(props).to.be.an('object');
               expect(props).to.only.have.keys(keys);
               expect(props.geohash).to.be.a('string');
@@ -155,15 +155,15 @@ describe('GeoJson Agg Response Converter', function () {
 
           it('should use latLng in properties and lngLat in geometry', function () {
             table.rows.forEach(function (row, i) {
-              let geometry = chart.geoJson.features[i].geometry;
-              let props = chart.geoJson.features[i].properties;
+              const geometry = chart.geoJson.features[i].geometry;
+              const props = chart.geoJson.features[i].properties;
               expect(props.center).to.eql(geometry.coordinates.slice(0).reverse());
             });
           });
 
           it('should handle both AggConfig and non-AggConfig results', function () {
             table.rows.forEach(function (row, i) {
-              let props = chart.geoJson.features[i].properties;
+              const props = chart.geoJson.features[i].properties;
               if (tableOpts.asAggConfigResults) {
                 expect(props.aggConfigResult).to.be(row[metricColI]);
                 expect(props.value).to.be(row[metricColI].value);
diff --git a/src/ui/public/agg_response/geo_json/_tooltip_formatter.js b/src/ui/public/agg_response/geo_json/_tooltip_formatter.js
index f444d5b27d0d5..3f1ba02775f13 100644
--- a/src/ui/public/agg_response/geo_json/_tooltip_formatter.js
+++ b/src/ui/public/agg_response/geo_json/_tooltip_formatter.js
@@ -3,19 +3,19 @@ import _ from 'lodash';
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 export default function TileMapTooltipFormatter($compile, $rootScope, Private) {
 
-  let fieldFormats = Private(RegistryFieldFormatsProvider);
-  let $tooltipScope = $rootScope.$new();
-  let $el = $('<div>').html(require('ui/agg_response/geo_json/_tooltip.html'));
+  const fieldFormats = Private(RegistryFieldFormatsProvider);
+  const $tooltipScope = $rootScope.$new();
+  const $el = $('<div>').html(require('ui/agg_response/geo_json/_tooltip.html'));
   $compile($el)($tooltipScope);
 
   return function tooltipFormatter(feature) {
     if (!feature) return '';
 
-    let value = feature.properties.value;
-    let acr = feature.properties.aggConfigResult;
-    let vis = acr.aggConfig.vis;
+    const value = feature.properties.value;
+    const acr = feature.properties.aggConfigResult;
+    const vis = acr.aggConfig.vis;
 
-    let metricAgg = acr.aggConfig;
+    const metricAgg = acr.aggConfig;
     let geoFormat = _.get(vis.aggs, 'byTypeName.geohash_grid[0].format');
     if (!geoFormat) geoFormat = fieldFormats.getDefaultInstance('geo_point');
 
@@ -37,4 +37,4 @@ export default function TileMapTooltipFormatter($compile, $rootScope, Private) {
 
     return $el.html();
   };
-};
+}
diff --git a/src/ui/public/agg_response/geo_json/geo_json.js b/src/ui/public/agg_response/geo_json/geo_json.js
index aac0fba222985..2bb6fbafdb81f 100644
--- a/src/ui/public/agg_response/geo_json/geo_json.js
+++ b/src/ui/public/agg_response/geo_json/geo_json.js
@@ -1,9 +1,9 @@
 import _ from 'lodash';
 import rowsToFeatures from 'ui/agg_response/geo_json/rows_to_features';
 import AggResponseGeoJsonTooltipFormatterProvider from 'ui/agg_response/geo_json/_tooltip_formatter';
-export default function TileMapConverterFn(Private, timefilter, $compile, $rootScope) {
+export default function TileMapConverterFn(Private) {
 
-  let tooltipFormatter = Private(AggResponseGeoJsonTooltipFormatterProvider);
+  const tooltipFormatter = Private(AggResponseGeoJsonTooltipFormatterProvider);
 
   return function (vis, table) {
 
@@ -13,13 +13,13 @@ export default function TileMapConverterFn(Private, timefilter, $compile, $rootS
       });
     }
 
-    let geoI = columnIndex('segment');
-    let metricI = columnIndex('metric');
-    let geoAgg = _.get(table.columns, [geoI, 'aggConfig']);
-    let metricAgg = _.get(table.columns, [metricI, 'aggConfig']);
+    const geoI = columnIndex('segment');
+    const metricI = columnIndex('metric');
+    const geoAgg = _.get(table.columns, [geoI, 'aggConfig']);
+    const metricAgg = _.get(table.columns, [metricI, 'aggConfig']);
 
-    let features = rowsToFeatures(table, geoI, metricI);
-    let values = features.map(function (feature) {
+    const features = rowsToFeatures(table, geoI, metricI);
+    const values = features.map(function (feature) {
       return feature.properties.value;
     });
 
@@ -40,4 +40,4 @@ export default function TileMapConverterFn(Private, timefilter, $compile, $rootS
       }
     };
   };
-};
+}
diff --git a/src/ui/public/agg_response/geo_json/rows_to_features.js b/src/ui/public/agg_response/geo_json/rows_to_features.js
index 634bfd26b5335..38e2757a50466 100644
--- a/src/ui/public/agg_response/geo_json/rows_to_features.js
+++ b/src/ui/public/agg_response/geo_json/rows_to_features.js
@@ -12,19 +12,19 @@ function unwrap(val) {
 
 function convertRowsToFeatures(table, geoI, metricI) {
   return _.transform(table.rows, function (features, row) {
-    let geohash = unwrap(row[geoI]);
+    const geohash = unwrap(row[geoI]);
     if (!geohash) return;
 
     // fetch latLn of northwest and southeast corners, and center point
-    let location = decodeGeoHash(geohash);
+    const location = decodeGeoHash(geohash);
 
-    let centerLatLng = [
+    const centerLatLng = [
       location.latitude[2],
       location.longitude[2]
     ];
 
     // order is nw, ne, se, sw
-    let rectangle = [
+    const rectangle = [
       [location.latitude[0], location.longitude[0]],
       [location.latitude[0], location.longitude[1]],
       [location.latitude[1], location.longitude[1]],
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
index a5e5555c81243..cfa80058289d9 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
@@ -5,13 +5,11 @@ import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import VisProvider from 'ui/vis';
-import VisAggConfigsProvider from 'ui/vis/agg_configs';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import AggResponseHierarchicalBuildHierarchicalDataProvider from 'ui/agg_response/hierarchical/build_hierarchical_data';
 
 let Vis;
 let Notifier;
-let AggConfigs;
 let indexPattern;
 let buildHierarchicalData;
 
@@ -24,7 +22,6 @@ describe('buildHierarchicalData', function () {
     sinon.stub(Notifier.prototype, 'error');
 
     Vis = Private(VisProvider);
-    AggConfigs = Private(VisAggConfigsProvider);
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
     buildHierarchicalData = Private(AggResponseHierarchicalBuildHierarchicalDataProvider);
   }));
@@ -35,7 +32,6 @@ describe('buildHierarchicalData', function () {
     let results;
 
     beforeEach(function () {
-      let id = 1;
       vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
@@ -44,11 +40,10 @@ describe('buildHierarchicalData', function () {
       });
       vis.aggs[0].id = 'agg_1';
       results = buildHierarchicalData(vis, fixtures.metricOnly);
-
     });
 
     it('should set the slices with one child to a consistent label', function () {
-      let checkLabel = 'Count';
+      const checkLabel = 'Count';
       expect(results).to.have.property('slices');
       expect(results.slices).to.have.property('children');
       expect(results.slices.children).to.have.length(1);
@@ -68,35 +63,35 @@ describe('buildHierarchicalData', function () {
 
     it('should set the rows', function () {
       let id = 1;
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
           { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-          { type: 'terms', schema: 'split', params: { field: 'extension', row: true }},
-          { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-          { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+          { type: 'terms', schema: 'split', params: { field: 'extension', row: true } },
+          { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
+          { type: 'terms', schema: 'segment', params: { field: 'geo.src' } }
         ]
       });
       // We need to set the aggs to a known value.
       _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-      let results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
+      const results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
       expect(results).to.have.property('rows');
     });
 
     it('should set the columns', function () {
       let id = 1;
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
           { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-          { type: 'terms', schema: 'split', params: { field: 'extension', row: false }},
-          { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-          { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+          { type: 'terms', schema: 'split', params: { field: 'extension', row: false } },
+          { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
+          { type: 'terms', schema: 'segment', params: { field: 'geo.src' } }
         ]
       });
       // We need to set the aggs to a known value.
       _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
-      let results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
+      const results = buildHierarchicalData(vis, fixtures.threeTermBuckets);
       expect(results).to.have.property('columns');
     });
 
@@ -112,9 +107,9 @@ describe('buildHierarchicalData', function () {
         type: 'pie',
         aggs: [
           { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-          { type: 'terms', schema: 'split', params: { field: 'extension' }},
-          { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-          { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+          { type: 'terms', schema: 'split', params: { field: 'extension' } },
+          { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
+          { type: 'terms', schema: 'segment', params: { field: 'geo.src' } }
         ]
       });
       // We need to set the aggs to a known value.
@@ -157,7 +152,7 @@ describe('buildHierarchicalData', function () {
             type: 'count',
             schema: 'metric'
           },
-          { type: 'histogram', schema: 'segment', params: { field: 'bytes', interval: 8192 }}
+          { type: 'histogram', schema: 'segment', params: { field: 'bytes', interval: 8192 } }
         ]
       });
       // We need to set the aggs to a known value.
@@ -281,7 +276,7 @@ describe('buildHierarchicalData', function () {
     });
 
     it('should set the hits attribute for the results', function () {
-      let errCall = Notifier.prototype.error.getCall(0);
+      const errCall = Notifier.prototype.error.getCall(0);
       expect(errCall).to.be.ok();
       expect(errCall.args[0]).to.contain('not supported');
 
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js b/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js
index f8afc426647ac..6aa310e87aba5 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/collect_branch.js
@@ -4,7 +4,7 @@ import collectBranch from 'ui/agg_response/hierarchical/_collect_branch';
 import expect from 'expect.js';
 describe('collectBranch()', function () {
   let results;
-  let convert = function (name) {
+  const convert = function (name) {
     return 'converted:' + name;
   };
 
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
index f42e4442c4fd1..c7c386700421b 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
@@ -6,10 +6,8 @@ import arrayToLinkedList from 'ui/agg_response/hierarchical/_array_to_linked_lis
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import VisProvider from 'ui/vis';
-import VisAggConfigsProvider from 'ui/vis/agg_configs';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
-let AggConfigs;
 let Vis;
 let indexPattern;
 
@@ -22,7 +20,6 @@ describe('buildHierarchicalData()', function () {
 
     beforeEach(ngMock.inject(function (Private) {
       Vis = Private(VisProvider);
-      AggConfigs = Private(VisAggConfigsProvider);
       indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
     }));
 
@@ -32,12 +29,12 @@ describe('buildHierarchicalData()', function () {
         type: 'pie',
         aggs: [
           { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-          { type: 'terms', schema: 'split', params: { field: 'extension' }},
-          { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-          { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+          { type: 'terms', schema: 'split', params: { field: 'extension' } },
+          { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
+          { type: 'terms', schema: 'segment', params: { field: 'geo.src' } }
         ]
       });
-      let buckets = arrayToLinkedList(vis.aggs.bySchemaGroup.buckets);
+      arrayToLinkedList(vis.aggs.bySchemaGroup.buckets);
       // We need to set the aggs to a known value.
       _.each(vis.aggs, function (agg) { agg.id = 'agg_' + id++; });
       results = createRawData(vis, fixtures.threeTermBuckets);
@@ -48,7 +45,7 @@ describe('buildHierarchicalData()', function () {
       expect(results.columns).to.have.length(6);
       _.each(results.columns, function (column) {
         expect(column).to.have.property('aggConfig');
-        let agg = column.aggConfig;
+        const agg = column.aggConfig;
         expect(column).to.have.property('categoryName', agg.schema.name);
         expect(column).to.have.property('id', agg.id);
         expect(column).to.have.property('aggType', agg.type);
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/extract_buckets.js b/src/ui/public/agg_response/hierarchical/__tests__/extract_buckets.js
index 8d2a45c3a1f45..59c20a8e518df 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/extract_buckets.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/extract_buckets.js
@@ -7,14 +7,14 @@ describe('buildHierarchicalData()', function () {
 
     it('should normalize a bucket object into an array', function () {
 
-      let bucket = {
+      const bucket = {
         buckets: {
           foo: { doc_count: 1 },
           bar: { doc_count: 2 }
         }
       };
 
-      let buckets = extractBuckets(bucket);
+      const buckets = extractBuckets(bucket);
       expect(buckets).to.be.an(Array);
       expect(buckets).to.have.length(2);
       expect(buckets[0]).to.have.property('key', 'foo');
@@ -24,19 +24,19 @@ describe('buildHierarchicalData()', function () {
     });
 
     it('should return an empty array for undefined buckets', function () {
-      let buckets = extractBuckets();
+      const buckets = extractBuckets();
       expect(buckets).to.be.an(Array);
       expect(buckets).to.have.length(0);
     });
 
     it('should return the bucket array', function () {
-      let bucket =  {
+      const bucket =  {
         buckets: [
           { key: 'foo', doc_count: 1 },
           { key: 'bar', doc_count: 2 }
         ]
       };
-      let buckets = extractBuckets(bucket);
+      const buckets = extractBuckets(bucket);
       expect(buckets).to.be.an(Array);
       expect(buckets).to.be(bucket.buckets);
     });
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js
index 97adf8ea4073b..d83b9a1939efe 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js
@@ -34,25 +34,25 @@ describe('buildHierarchicalData()', function () {
 
       fixture.aggData = {
         buckets: [
-          { key: 'foo', doc_count: 2, agg_3: { buckets: [ { key: 'win', doc_count: 1 }, { key: 'mac', doc_count: 1 }]}},
-          { key: 'bar', doc_count: 4, agg_3: {  buckets: [ { key: 'win', doc_count: 2 }, { key: 'mac', doc_count: 2 }]}}
+          { key: 'foo', doc_count: 2, agg_3: { buckets: [ { key: 'win', doc_count: 1 }, { key: 'mac', doc_count: 1 }] } },
+          { key: 'bar', doc_count: 4, agg_3: {  buckets: [ { key: 'win', doc_count: 2 }, { key: 'mac', doc_count: 2 }] } }
         ]
       };
 
     });
 
     it('relies on metricAgg#getValue() for the size of the children', function () {
-      let aggData = {
+      const aggData = {
         buckets: [
           { key: 'foo' },
           { key: 'bar' }
         ]
       };
 
-      let football = {};
+      const football = {};
       fixture.metric.getValue = _.constant(football);
 
-      let children = transform(fixture.agg, fixture.metric, aggData);
+      const children = transform(fixture.agg, fixture.metric, aggData);
       expect(children).to.be.an(Array);
       expect(children).to.have.length(2);
       expect(children[0]).to.have.property('size', football);
@@ -60,7 +60,7 @@ describe('buildHierarchicalData()', function () {
     });
 
     it('should create two levels of metrics', function () {
-      let children = transform(fixture.agg, fixture.metric, fixture.aggData);
+      const children = transform(fixture.agg, fixture.metric, fixture.aggData);
       fixture.metric.getValue = function (b) { return b.doc_count; };
 
       expect(children).to.be.an(Array);
diff --git a/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js b/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js
index 9a2d58f4ecb4d..bddde7b13eb90 100644
--- a/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js
+++ b/src/ui/public/agg_response/hierarchical/_array_to_linked_list.js
@@ -9,4 +9,4 @@ export default function (buckets) {
     previous = bucket;
   });
   return buckets;
-};
+}
diff --git a/src/ui/public/agg_response/hierarchical/_build_split.js b/src/ui/public/agg_response/hierarchical/_build_split.js
index f4eb0fdf764ab..5efb684cd3ced 100644
--- a/src/ui/public/agg_response/hierarchical/_build_split.js
+++ b/src/ui/public/agg_response/hierarchical/_build_split.js
@@ -1,10 +1,10 @@
 import collectKeys from 'ui/agg_response/hierarchical/_collect_keys';
 import AggResponseHierarchicalTransformAggregationProvider from 'ui/agg_response/hierarchical/_transform_aggregation';
 export default function biuldSplitProvider(Private) {
-  let transformer = Private(AggResponseHierarchicalTransformAggregationProvider);
+  const transformer = Private(AggResponseHierarchicalTransformAggregationProvider);
   return function (agg, metric, aggData) {
     // Ceate the split structure
-    let split = { label: '', slices: { children: [] } };
+    const split = { label: '', slices: { children: [] } };
 
     // Transform the aggData into splits
     split.slices.children = transformer(agg, metric, aggData);
@@ -13,4 +13,4 @@ export default function biuldSplitProvider(Private) {
     split.names = collectKeys(split.slices.children);
     return split;
   };
-};
+}
diff --git a/src/ui/public/agg_response/hierarchical/_collect_branch.js b/src/ui/public/agg_response/hierarchical/_collect_branch.js
index eccaed50402d0..1640096c43502 100644
--- a/src/ui/public/agg_response/hierarchical/_collect_branch.js
+++ b/src/ui/public/agg_response/hierarchical/_collect_branch.js
@@ -1,37 +1,35 @@
-define(function () {
-  return function (leaf) {
-    // walk up the branch for each parent
-    function walk(item, memo) {
-      // record the the depth
-      let depth = item.depth - 1;
+export default function (leaf) {
+  // walk up the branch for each parent
+  function walk(item, memo) {
+    // record the the depth
+    const depth = item.depth - 1;
 
-      // Using the aggConfig determine what the field name is. If the aggConfig
-      // doesn't exist (which means it's an _all agg) then use the level for
-      // the field name
-      const { aggConfig } = item;
-      let field = (aggConfig && aggConfig.getFieldDisplayName())
-        || (aggConfig && aggConfig.label)
-        || ('level ' + item.depth);
+    // Using the aggConfig determine what the field name is. If the aggConfig
+    // doesn't exist (which means it's an _all agg) then use the level for
+    // the field name
+    const { aggConfig } = item;
+    const field = (aggConfig && aggConfig.getFieldDisplayName())
+      || (aggConfig && aggConfig.label)
+      || ('level ' + item.depth);
 
-      // Add the row to the tooltipScope.rows
-      memo.unshift({
-        aggConfig,
-        depth: depth,
-        field: field,
-        bucket: item.name,
-        metric: item.size,
-        item: item
-      });
+    // Add the row to the tooltipScope.rows
+    memo.unshift({
+      aggConfig,
+      depth: depth,
+      field: field,
+      bucket: item.name,
+      metric: item.size,
+      item: item
+    });
 
-      // If the item has a parent and it's also a child then continue walking
-      // up the branch
-      if (item.parent && item.parent.parent) {
-        return walk(item.parent, memo);
-      } else {
-        return memo;
-      }
+    // If the item has a parent and it's also a child then continue walking
+    // up the branch
+    if (item.parent && item.parent.parent) {
+      return walk(item.parent, memo);
+    } else {
+      return memo;
     }
+  }
 
-    return walk(leaf, []);
-  };
-});
+  return walk(leaf, []);
+}
diff --git a/src/ui/public/agg_response/hierarchical/_collect_keys.js b/src/ui/public/agg_response/hierarchical/_collect_keys.js
index 1b9a542462c75..7c719c07af6ca 100644
--- a/src/ui/public/agg_response/hierarchical/_collect_keys.js
+++ b/src/ui/public/agg_response/hierarchical/_collect_keys.js
@@ -1,10 +1,10 @@
 import _ from 'lodash';
 export default function collectKeys(children) {
-  let nextChildren = _.pluck(children, 'children');
-  let keys = _.pluck(children, 'name');
+  const nextChildren = _.pluck(children, 'children');
+  const keys = _.pluck(children, 'name');
   return _(nextChildren)
   .map(collectKeys)
   .flattenDeep()
   .union(keys)
   .value();
-};
+}
diff --git a/src/ui/public/agg_response/hierarchical/_create_raw_data.js b/src/ui/public/agg_response/hierarchical/_create_raw_data.js
index 93b9c1b519bfe..9b786fe2b0a45 100644
--- a/src/ui/public/agg_response/hierarchical/_create_raw_data.js
+++ b/src/ui/public/agg_response/hierarchical/_create_raw_data.js
@@ -3,12 +3,12 @@ import extractBuckets from 'ui/agg_response/hierarchical/_extract_buckets';
 export default function (vis, resp) {
 
   // Create the initial results structure
-  let results = { rows: [] };
+  const results = { rows: [] };
 
   // Create a reference to the buckets and metrics
-  let metrics = vis.aggs.bySchemaGroup.metrics;
-  let buckets = vis.aggs.bySchemaGroup.buckets;
-  let aggs = [];
+  const metrics = vis.aggs.bySchemaGroup.metrics;
+  const buckets = vis.aggs.bySchemaGroup.buckets;
+  const aggs = [];
 
   if (buckets) {
     _.each(buckets, function (bucket) {
@@ -37,7 +37,7 @@ export default function (vis, resp) {
 
   // if there are no buckets then we need to just set the value and return
   if (!buckets) {
-    let value = resp.aggregations
+    const value = resp.aggregations
       && resp.aggregations[metrics[0].id]
       && resp.aggregations[metrics[0].id].value
       || resp.hits.total;
@@ -60,7 +60,7 @@ export default function (vis, resp) {
     // iterate through all the buckets
     _.each(extractBuckets(data[agg.id], agg), function (bucket) {
 
-      let _record = _.flattenDeep([record, bucket.key]);
+      const _record = _.flattenDeep([record, bucket.key]);
       _.each(metrics, function (metric) {
         let value = bucket.doc_count;
         if (bucket[metric.id] && !_.isUndefined(bucket[metric.id].value)) {
@@ -73,7 +73,7 @@ export default function (vis, resp) {
       // buckets. If it does then we need to keep on walking the tree.
       // This is where the recursion happens.
       if (agg._next) {
-        let nextBucket = bucket[agg._next.id];
+        const nextBucket = bucket[agg._next.id];
         if (nextBucket && nextBucket.buckets) {
           walkBuckets(agg._next, bucket, _record);
         }
@@ -89,4 +89,4 @@ export default function (vis, resp) {
   walkBuckets(buckets[0], resp.aggregations);
 
   return results;
-};
+}
diff --git a/src/ui/public/agg_response/hierarchical/_extract_buckets.js b/src/ui/public/agg_response/hierarchical/_extract_buckets.js
index e80f408664535..c10bfc9eb1587 100644
--- a/src/ui/public/agg_response/hierarchical/_extract_buckets.js
+++ b/src/ui/public/agg_response/hierarchical/_extract_buckets.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 export default function (bucket, agg) {
   if (bucket && _.isPlainObject(bucket.buckets)) {
     return _.map(bucket.buckets, function (value, key) {
-      let item = _.cloneDeep(value);
+      const item = _.cloneDeep(value);
       item.key = agg ? agg.getKey(value, key) : key;
       return item;
     });
@@ -10,4 +10,4 @@ export default function (bucket, agg) {
   } else {
     return bucket && bucket.buckets || [];
   }
-};
+}
diff --git a/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js b/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js
index f4acab3927a57..504602dd36826 100644
--- a/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js
+++ b/src/ui/public/agg_response/hierarchical/_hierarchical_tooltip_formatter.js
@@ -3,22 +3,22 @@ import $ from 'jquery';
 import collectBranch from 'ui/agg_response/hierarchical/_collect_branch';
 import numeral from 'numeral';
 export default function HierarchicalTooltipFormaterProvider($rootScope, $compile, $sce) {
-  let $tooltip = $(require('ui/agg_response/hierarchical/_tooltip.html'));
-  let $tooltipScope = $rootScope.$new();
+  const $tooltip = $(require('ui/agg_response/hierarchical/_tooltip.html'));
+  const $tooltipScope = $rootScope.$new();
 
   $compile($tooltip)($tooltipScope);
 
   return function (columns) {
     return function (event) {
-      let datum = event.datum;
+      const datum = event.datum;
 
       // Collect the current leaf and parents into an array of values
       $tooltipScope.rows = collectBranch(datum);
 
-      let metricCol = $tooltipScope.metricCol = _.find(columns, { categoryName: 'metric' });
+      const metricCol = $tooltipScope.metricCol = _.find(columns, { categoryName: 'metric' });
 
       // Map those values to what the tooltipSource.rows format.
-      _.forEachRight($tooltipScope.rows, function (row, i, rows) {
+      _.forEachRight($tooltipScope.rows, function (row) {
         row.spacer = $sce.trustAsHtml(_.repeat('&nbsp;', row.depth));
 
         let percent;
@@ -41,4 +41,4 @@ export default function HierarchicalTooltipFormaterProvider($rootScope, $compile
 
   };
 
-};
+}
diff --git a/src/ui/public/agg_response/hierarchical/_transform_aggregation.js b/src/ui/public/agg_response/hierarchical/_transform_aggregation.js
index a176f2d3e0154..abc28e98b96e9 100644
--- a/src/ui/public/agg_response/hierarchical/_transform_aggregation.js
+++ b/src/ui/public/agg_response/hierarchical/_transform_aggregation.js
@@ -1,17 +1,17 @@
 import _ from 'lodash';
 import extractBuckets from 'ui/agg_response/hierarchical/_extract_buckets';
 import AggConfigResult from 'ui/vis/agg_config_result';
-export default function transformAggregationProvider(Private) {
+export default function transformAggregationProvider() {
   return function transformAggregation(agg, metric, aggData, parent) {
     return _.map(extractBuckets(aggData, agg), function (bucket) {
-      let aggConfigResult = new AggConfigResult(
+      const aggConfigResult = new AggConfigResult(
         agg,
         parent && parent.aggConfigResult,
         metric.getValue(bucket),
         agg.getKey(bucket)
       );
 
-      let branch = {
+      const branch = {
         name: agg.fieldFormatter()(bucket.key),
         size: aggConfigResult.value,
         aggConfig: agg,
@@ -27,7 +27,7 @@ export default function transformAggregationProvider(Private) {
       // If the next bucket exists and it has children the we need to
       // transform it as well. This is where the recursion happens.
       if (agg._next) {
-        let nextBucket = bucket[agg._next.id];
+        const nextBucket = bucket[agg._next.id];
         if (nextBucket && nextBucket.buckets) {
           branch.children = transformAggregation(agg._next, metric, nextBucket, branch);
         }
@@ -36,4 +36,4 @@ export default function transformAggregationProvider(Private) {
       return branch;
     });
   };
-};
+}
diff --git a/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js
index a5cb53784c256..820b32db26580 100644
--- a/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js
+++ b/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js
@@ -6,11 +6,11 @@ import AggConfigResult from 'ui/vis/agg_config_result';
 import AggResponseHierarchicalBuildSplitProvider from 'ui/agg_response/hierarchical/_build_split';
 import AggResponseHierarchicalHierarchicalTooltipFormatterProvider from 'ui/agg_response/hierarchical/_hierarchical_tooltip_formatter';
 export default function buildHierarchicalDataProvider(Private, Notifier) {
-  let buildSplit = Private(AggResponseHierarchicalBuildSplitProvider);
-  let tooltipFormatter = Private(AggResponseHierarchicalHierarchicalTooltipFormatterProvider);
+  const buildSplit = Private(AggResponseHierarchicalBuildSplitProvider);
+  const tooltipFormatter = Private(AggResponseHierarchicalHierarchicalTooltipFormatterProvider);
 
 
-  let notify = new Notifier({
+  const notify = new Notifier({
     location: 'Pie chart response converter'
   });
 
@@ -21,19 +21,19 @@ export default function buildHierarchicalDataProvider(Private, Notifier) {
 
     // Find the metric so it's easier to reference.
     // TODO: Change this to support multiple metrics.
-    let metric = vis.aggs.bySchemaGroup.metrics[0];
+    const metric = vis.aggs.bySchemaGroup.metrics[0];
 
     // Link each agg to the next agg. This will be
     // to identify the next bucket aggregation
     buckets = arrayToLinkedList(buckets);
 
     // Create the raw data to be used in the spy panel
-    let raw = createRawData(vis, resp);
+    const raw = createRawData(vis, resp);
 
     // If buckets is falsy then we should just return the aggs
     if (!buckets) {
-      let label = 'Count';
-      let value = resp.aggregations
+      const label = 'Count';
+      const value = resp.aggregations
         && resp.aggregations[metric.id]
         && resp.aggregations[metric.id].value
         || resp.hits.total;
@@ -50,8 +50,8 @@ export default function buildHierarchicalDataProvider(Private, Notifier) {
       };
     }
 
-    let firstAgg = buckets[0];
-    let aggData = resp.aggregations[firstAgg.id];
+    const firstAgg = buckets[0];
+    const aggData = resp.aggregations[firstAgg.id];
 
     if (!firstAgg._next && firstAgg.schema.name === 'split') {
       notify.error('Splitting charts without splitting slices is not supported. Pretending that we are just splitting slices.');
@@ -59,7 +59,7 @@ export default function buildHierarchicalDataProvider(Private, Notifier) {
 
     // start with splitting slices
     if (!firstAgg._next || firstAgg.schema.name === 'segment') {
-      let split = buildSplit(firstAgg, metric, aggData);
+      const split = buildSplit(firstAgg, metric, aggData);
       split.hits = resp.hits.total;
       split.raw = raw;
       split.tooltipFormatter = tooltipFormatter(raw.columns);
@@ -67,17 +67,17 @@ export default function buildHierarchicalDataProvider(Private, Notifier) {
     }
 
     // map the split aggregations into rows.
-    let rows = _.map(extractBuckets(aggData, firstAgg), function (bucket) {
-      let agg = firstAgg._next;
-      let split = buildSplit(agg, metric, bucket[agg.id]);
+    const rows = _.map(extractBuckets(aggData, firstAgg), function (bucket) {
+      const agg = firstAgg._next;
+      const split = buildSplit(agg, metric, bucket[agg.id]);
       // Since splits display labels we need to set it.
       split.label = firstAgg.fieldFormatter()(agg.getKey(bucket));
 
-      let displayName = firstAgg.getFieldDisplayName();
+      const displayName = firstAgg.getFieldDisplayName();
       if (!_.isEmpty(displayName)) split.label += ': ' + displayName;
 
       split.tooltipFormatter = tooltipFormatter(raw.columns);
-      let aggConfigResult = new AggConfigResult(firstAgg, null, null, firstAgg.getKey(bucket));
+      const aggConfigResult = new AggConfigResult(firstAgg, null, null, firstAgg.getKey(bucket));
       split.split = { aggConfig: firstAgg, aggConfigResult: aggConfigResult, key: bucket.key };
       _.each(split.slices.children, function (child) {
         child.aggConfigResult.$parent = aggConfigResult;
@@ -85,7 +85,7 @@ export default function buildHierarchicalDataProvider(Private, Notifier) {
       return split;
     });
 
-    let result = { hits: resp.hits.total, raw: raw };
+    const result = { hits: resp.hits.total, raw: raw };
     if (firstAgg.params.row) {
       result.rows = rows;
     } else {
@@ -94,4 +94,4 @@ export default function buildHierarchicalDataProvider(Private, Notifier) {
 
     return result;
   };
-};
+}
diff --git a/src/ui/public/agg_response/index.js b/src/ui/public/agg_response/index.js
index ae098a8cb8536..1644831ef06eb 100644
--- a/src/ui/public/agg_response/index.js
+++ b/src/ui/public/agg_response/index.js
@@ -10,4 +10,4 @@ export default function NormalizeChartDataFactory(Private) {
     tabify: Private(AggResponseTabifyTabifyProvider),
     geoJson: Private(AggResponseGeoJsonGeoJsonProvider)
   };
-};
+}
diff --git a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js
index 4e9c563f78dbf..c07780bfbf0a2 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js
@@ -10,9 +10,9 @@ describe('addToSiri', function () {
   }));
 
   it('creates a new series the first time it sees an id', function () {
-    let series = new Map();
-    let point = {};
-    let id = 'id';
+    const series = new Map();
+    const point = {};
+    const id = 'id';
     addToSiri(series, point, id);
 
     expect(series.has(id)).to.be(true);
@@ -23,13 +23,13 @@ describe('addToSiri', function () {
   });
 
   it('adds points to existing series if id has been seen', function () {
-    let series = new Map();
-    let id = 'id';
+    const series = new Map();
+    const id = 'id';
 
-    let point = {};
+    const point = {};
     addToSiri(series, point, id);
 
-    let point2 = {};
+    const point2 = {};
     addToSiri(series, point2, id);
 
     expect(series.has(id)).to.be(true);
@@ -41,10 +41,10 @@ describe('addToSiri', function () {
   });
 
   it('allows overriding the series label', function () {
-    let series = new Map();
-    let id = 'id';
-    let label = 'label';
-    let point = {};
+    const series = new Map();
+    const id = 'id';
+    const label = 'label';
+    const point = {};
     addToSiri(series, point, id, label);
 
     expect(series.has(id)).to.be(true);
diff --git a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
index 501631e1c921a..1b1661186b2be 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
@@ -22,8 +22,8 @@ describe('makeFakeXAspect', function () {
   }));
 
   it('creates an object that looks like an aspect', function () {
-    let vis = new Vis(indexPattern, { type: 'histogram' });
-    let aspect = makeFakeXAspect(vis);
+    const vis = new Vis(indexPattern, { type: 'histogram' });
+    const aspect = makeFakeXAspect(vis);
 
     expect(aspect)
       .to.have.property('i', -1)
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
index e1bf5ce07a702..4fa581bcc2c6d 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
@@ -3,14 +3,11 @@ import moment from 'moment';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import VisProvider from 'ui/vis';
-import AggResponsePointSeriesAddToSiriProvider from 'ui/agg_response/point_series/_add_to_siri';
 import VisAggConfigProvider from 'ui/vis/agg_config';
 import AggResponsePointSeriesGetAspectsProvider from 'ui/agg_response/point_series/_get_aspects';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 describe('getAspects', function () {
-
   let Vis;
-  let Table;
   let AggConfig;
   let indexPattern;
   let getAspects;
@@ -18,7 +15,6 @@ describe('getAspects', function () {
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     Vis = Private(VisProvider);
-    Table = Private(AggResponsePointSeriesAddToSiriProvider);
     AggConfig = Private(VisAggConfigProvider);
     getAspects = Private(AggResponsePointSeriesGetAspectsProvider);
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
@@ -27,7 +23,7 @@ describe('getAspects', function () {
   let vis;
   let table;
 
-  let date = _.memoize(function (n) {
+  const date = _.memoize(function (n) {
     return moment().startOf('day').add(n, 'hour').valueOf();
   });
 
@@ -50,7 +46,7 @@ describe('getAspects', function () {
 
   function init(group, x, y) {
     // map args to indicies that should be removed
-    let filter = filterByIndex([
+    const filter = filterByIndex([
       x > 0,
       x > 1,
       group > 0,
@@ -92,7 +88,7 @@ describe('getAspects', function () {
       ].map(filter)
     };
 
-    let aggs = vis.aggs.splice(0, vis.aggs.length);
+    const aggs = vis.aggs.splice(0, vis.aggs.length);
     filter(aggs).forEach(function (filter) {
       vis.aggs.push(filter);
     });
@@ -101,7 +97,7 @@ describe('getAspects', function () {
   it('produces an aspect object for each of the aspect types found in the columns', function () {
     init(1, 1, 1);
 
-    let aspects = getAspects(vis, table);
+    const aspects = getAspects(vis, table);
     validate(aspects.x, 0);
     validate(aspects.series, 1);
     validate(aspects.y, 2);
@@ -110,7 +106,7 @@ describe('getAspects', function () {
   it('uses arrays only when there are more than one aspect of a specific type', function () {
     init(0, 1, 2);
 
-    let aspects = getAspects(vis, table);
+    const aspects = getAspects(vis, table);
 
     validate(aspects.x, 0);
     expect(aspects.series == null).to.be(true);
@@ -139,7 +135,7 @@ describe('getAspects', function () {
   it('creates a fake x aspect if the column does not exist', function () {
     init(0, 0, 1);
 
-    let aspects = getAspects(vis, table);
+    const aspects = getAspects(vis, table);
 
     expect(aspects.x)
       .to.be.an('object')
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_point.js b/src/ui/public/agg_response/point_series/__tests__/_get_point.js
index 93462f6f50a71..50fb0be947b77 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_get_point.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_point.js
@@ -7,8 +7,8 @@ describe('getPoint', function () {
 
   let getPoint;
 
-  let truthFormatted = { fieldFormatter: _.constant(_.constant(true)) };
-  let identFormatted = { fieldFormatter: _.constant(_.identity) };
+  const truthFormatted = { fieldFormatter: _.constant(_.constant(true)) };
+  const identFormatted = { fieldFormatter: _.constant(_.identity) };
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -31,9 +31,9 @@ describe('getPoint', function () {
     });
 
     it('properly unwraps and scales values', function () {
-      let row = [ { value: 1 }, { value: 2 }, { value: 3 } ];
-      let zAspect = { i: 2 };
-      let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect, zAspect);
+      const row = [ { value: 1 }, { value: 2 }, { value: 3 } ];
+      const zAspect = { i: 2 };
+      const point = getPoint(xAspect, seriesAspect, yScale, row, yAspect, zAspect);
 
       expect(point)
         .to.have.property('x', 1)
@@ -44,8 +44,8 @@ describe('getPoint', function () {
     });
 
     it('ignores points with a y value of NaN', function () {
-      let row = [ { value: 1 }, { value: 'NaN' }];
-      let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
+      const row = [ { value: 1 }, { value: 'NaN' }];
+      const point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
       expect(point).to.be(void 0);
     });
   });
@@ -64,8 +64,8 @@ describe('getPoint', function () {
     });
 
     it('properly unwraps and scales values', function () {
-      let seriesAspect = { i: 1, agg: identFormatted };
-      let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
+      const seriesAspect = { i: 1, agg: identFormatted };
+      const point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
 
       expect(point)
         .to.have.property('x', 1)
@@ -75,8 +75,8 @@ describe('getPoint', function () {
     });
 
     it('properly formats series values', function () {
-      let seriesAspect = { i: 1, agg: truthFormatted };
-      let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
+      const seriesAspect = { i: 1, agg: truthFormatted };
+      const point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
 
       expect(point)
         .to.have.property('x', 1)
@@ -86,8 +86,8 @@ describe('getPoint', function () {
     });
 
     it ('adds the aggConfig to the points', function () {
-      let seriesAspect = { i: 1, agg:  truthFormatted};
-      let point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
+      const seriesAspect = { i: 1, agg:  truthFormatted };
+      const point = getPoint(xAspect, seriesAspect, yScale, row, yAspect);
 
       expect(point).to.have.property('aggConfig', truthFormatted);
     });
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_series.js b/src/ui/public/agg_response/point_series/__tests__/_get_series.js
index fdaa7d7107071..5c1ac921ce870 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_get_series.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_series.js
@@ -5,7 +5,7 @@ import AggResponsePointSeriesGetSeriesProvider from 'ui/agg_response/point_serie
 describe('getSeries', function () {
   let getSeries;
 
-  let agg = { fieldFormatter: _.constant(_.identity) };
+  const agg = { fieldFormatter: _.constant(_.identity) };
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
@@ -19,7 +19,7 @@ describe('getSeries', function () {
   }
 
   it('produces a single series with points for each row', function () {
-    let rows = [
+    const rows = [
       [1, 2, 3],
       [1, 2, 3],
       [1, 2, 3],
@@ -28,7 +28,7 @@ describe('getSeries', function () {
     ].map(wrapRows);
 
     const yCol = { aggConfig: {}, title: 'y' };
-    let chart = {
+    const chart = {
       aspects: {
         x: { i: 0 },
         y: { i: 1, col: yCol },
@@ -36,13 +36,13 @@ describe('getSeries', function () {
       }
     };
 
-    let series = getSeries(rows, chart);
+    const series = getSeries(rows, chart);
 
     expect(series)
       .to.be.an('array')
       .and.to.have.length(1);
 
-    let siri = series[0];
+    const siri = series[0];
     expect(siri)
       .to.be.an('object')
       .and.have.property('label', yCol.title)
@@ -61,7 +61,7 @@ describe('getSeries', function () {
   });
 
   it('produces multiple series if there are multiple y aspects', function () {
-    let rows = [
+    const rows = [
       [1, 2, 3],
       [1, 2, 3],
       [1, 2, 3],
@@ -69,7 +69,7 @@ describe('getSeries', function () {
       [1, 2, 3]
     ].map(wrapRows);
 
-    let chart = {
+    const chart = {
       aspects: {
         x: { i: 0 },
         y: [
@@ -79,7 +79,7 @@ describe('getSeries', function () {
       }
     };
 
-    let series = getSeries(rows, chart);
+    const series = getSeries(rows, chart);
 
     expect(series)
       .to.be.an('array')
@@ -104,7 +104,7 @@ describe('getSeries', function () {
   });
 
   it('produces multiple series if there is a series aspect', function () {
-    let rows = [
+    const rows = [
       ['0', 3],
       ['1', 3],
       ['1', 'NaN'],
@@ -115,7 +115,7 @@ describe('getSeries', function () {
       ['1', 3]
     ].map(wrapRows);
 
-    let chart = {
+    const chart = {
       aspects: {
         x: { i: -1 },
         series: { i: 0, agg: agg },
@@ -123,7 +123,7 @@ describe('getSeries', function () {
       }
     };
 
-    let series = getSeries(rows, chart);
+    const series = getSeries(rows, chart);
 
     expect(series)
       .to.be.an('array')
@@ -148,7 +148,7 @@ describe('getSeries', function () {
   });
 
   it('produces multiple series if there is a series aspect and multipl y aspects', function () {
-    let rows = [
+    const rows = [
       ['0', 3, 4],
       ['1', 3, 4],
       ['0', 3, 4],
@@ -157,7 +157,7 @@ describe('getSeries', function () {
       ['1', 3, 4]
     ].map(wrapRows);
 
-    let chart = {
+    const chart = {
       aspects: {
         x: { i: -1 },
         series: { i: 0, agg: agg },
@@ -168,7 +168,7 @@ describe('getSeries', function () {
       }
     };
 
-    let series = getSeries(rows, chart);
+    const series = getSeries(rows, chart);
 
     expect(series)
       .to.be.an('array')
@@ -198,7 +198,7 @@ describe('getSeries', function () {
   });
 
   it('produces a series list in the same order as its corresponding metric column', function () {
-    let rows = [
+    const rows = [
       ['0', 3, 4],
       ['1', 3, 4],
       ['0', 3, 4],
@@ -207,7 +207,7 @@ describe('getSeries', function () {
       ['1', 3, 4]
     ].map(wrapRows);
 
-    let chart = {
+    const chart = {
       aspects: {
         x: { i: -1 },
         series: { i: 0, agg: agg },
@@ -218,7 +218,7 @@ describe('getSeries', function () {
       }
     };
 
-    let series = getSeries(rows, chart);
+    const series = getSeries(rows, chart);
     expect(series[0]).to.have.property('label', '0: 0');
     expect(series[1]).to.have.property('label', '0: 1');
     expect(series[2]).to.have.property('label', '1: 0');
@@ -231,7 +231,7 @@ describe('getSeries', function () {
       y.i = i;
     });
 
-    let series2 = getSeries(rows, chart);
+    const series2 = getSeries(rows, chart);
     expect(series2[0]).to.have.property('label', '0: 1');
     expect(series2[1]).to.have.property('label', '0: 0');
     expect(series2[2]).to.have.property('label', '1: 1');
diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
index 974afab294831..9c2cfb9ef0890 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
@@ -11,7 +11,7 @@ describe('initXAxis', function () {
     initXAxis = Private(AggResponsePointSeriesInitXAxisProvider);
   }));
 
-  let baseChart = {
+  const baseChart = {
     aspects: {
       x: {
         agg: {
@@ -27,7 +27,7 @@ describe('initXAxis', function () {
   };
 
   it('sets the xAxisFormatter if the agg is not ordered', function () {
-    let chart = _.cloneDeep(baseChart);
+    const chart = _.cloneDeep(baseChart);
     initXAxis(chart);
     expect(chart)
       .to.have.property('xAxisLabel', 'label')
@@ -35,7 +35,7 @@ describe('initXAxis', function () {
   });
 
   it('makes the chart ordered if the agg is ordered', function () {
-    let chart = _.cloneDeep(baseChart);
+    const chart = _.cloneDeep(baseChart);
     chart.aspects.x.agg.type.ordered = true;
 
     initXAxis(chart);
@@ -50,7 +50,7 @@ describe('initXAxis', function () {
   });
 
   it('reads the interval param from the x agg', function () {
-    let chart = _.cloneDeep(baseChart);
+    const chart = _.cloneDeep(baseChart);
     chart.aspects.x.agg.type.ordered = true;
     chart.aspects.x.agg.write = _.constant({ params: { interval: 10 } });
 
diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js
index 97f1c98e12487..f545e3db6e0f5 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js
@@ -19,7 +19,7 @@ describe('initYAxis', function () {
     };
   }
 
-  let baseChart = {
+  const baseChart = {
     aspects: {
       y: [
         { agg: agg(), col: { title: 'y1' } },
@@ -33,17 +33,17 @@ describe('initYAxis', function () {
   };
 
   describe('with a single y aspect', function () {
-    let singleYBaseChart = _.cloneDeep(baseChart);
+    const singleYBaseChart = _.cloneDeep(baseChart);
     singleYBaseChart.aspects.y = singleYBaseChart.aspects.y[0];
 
     it('sets the yAxisFormatter the the field formats convert fn', function () {
-      let chart = _.cloneDeep(singleYBaseChart);
+      const chart = _.cloneDeep(singleYBaseChart);
       initYAxis(chart);
       expect(chart).to.have.property('yAxisFormatter', chart.aspects.y.agg.fieldFormatter());
     });
 
     it('sets the yAxisLabel', function () {
-      let chart = _.cloneDeep(singleYBaseChart);
+      const chart = _.cloneDeep(singleYBaseChart);
       initYAxis(chart);
       expect(chart).to.have.property('yAxisLabel', 'y1');
     });
@@ -51,7 +51,7 @@ describe('initYAxis', function () {
 
   describe('with mutliple y aspects', function () {
     it('sets the yAxisFormatter the the field formats convert fn for the first y aspect', function () {
-      let chart = _.cloneDeep(baseChart);
+      const chart = _.cloneDeep(baseChart);
       initYAxis(chart);
 
       expect(chart).to.have.property('yAxisFormatter');
@@ -61,7 +61,7 @@ describe('initYAxis', function () {
     });
 
     it('does not set the yAxisLabel, it does not make sense to put multiple labels on the same axis', function () {
-      let chart = _.cloneDeep(baseChart);
+      const chart = _.cloneDeep(baseChart);
       initYAxis(chart);
       expect(chart).to.have.property('yAxisLabel', '');
     });
diff --git a/src/ui/public/agg_response/point_series/__tests__/_main.js b/src/ui/public/agg_response/point_series/__tests__/_main.js
index 9d077175a77e7..ed018a2ce0efc 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_main.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_main.js
@@ -25,20 +25,20 @@ describe('pointSeriesChartDataFromTable', function () {
   }));
 
   it('handles a table with just a count', function () {
-    let vis = new Vis(indexPattern, { type: 'histogram' });
-    let agg = vis.aggs[0];
-    let result = new AggConfigResult(vis.aggs[0], void 0, 100, 100);
+    const vis = new Vis(indexPattern, { type: 'histogram' });
+    const agg = vis.aggs[0];
+    const result = new AggConfigResult(vis.aggs[0], void 0, 100, 100);
 
-    let table = new Table();
+    const table = new Table();
     table.columns = [ { aggConfig: agg } ];
     table.rows.push([ result ]);
 
-    let chartData = pointSeriesChartDataFromTable(vis, table);
+    const chartData = pointSeriesChartDataFromTable(vis, table);
 
     expect(chartData).to.be.an('object');
     expect(chartData.series).to.be.an('array');
     expect(chartData.series).to.have.length(1);
-    let series = chartData.series[0];
+    const series = chartData.series[0];
     expect(series.values).to.have.length(1);
     expect(series.values[0])
       .to.have.property('x', '_all')
@@ -47,7 +47,7 @@ describe('pointSeriesChartDataFromTable', function () {
   });
 
   it('handles a table with x and y column', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         { type: 'count', schema: 'metric' },
@@ -55,32 +55,32 @@ describe('pointSeriesChartDataFromTable', function () {
       ]
     });
 
-    let y = {
+    const y = {
       agg: vis.aggs[0],
       col: { aggConfig: vis.aggs[0], title: vis.aggs[0].makeLabel() },
       at: function (i) { return 100 * i; }
     };
 
-    let x = {
+    const x = {
       agg: vis.aggs[1],
       col: { aggConfig: vis.aggs[1] },
       at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
     };
 
-    let rowCount = 3;
-    let table = new Table();
+    const rowCount = 3;
+    const table = new Table();
     table.columns = [ x.col, y.col ];
     _.times(rowCount, function (i) {
-      let date = new AggConfigResult(x.agg, void 0, x.at(i));
+      const date = new AggConfigResult(x.agg, void 0, x.at(i));
       table.rows.push([date, new AggConfigResult(y.agg, date, y.at(i))]);
     });
 
-    let chartData = pointSeriesChartDataFromTable(vis, table);
+    const chartData = pointSeriesChartDataFromTable(vis, table);
 
     expect(chartData).to.be.an('object');
     expect(chartData.series).to.be.an('array');
     expect(chartData.series).to.have.length(1);
-    let series = chartData.series[0];
+    const series = chartData.series[0];
     expect(series).to.have.property('label', y.col.title);
     expect(series.values).to.have.length(rowCount);
     series.values.forEach(function (point, i) {
@@ -101,7 +101,7 @@ describe('pointSeriesChartDataFromTable', function () {
   });
 
   it('handles a table with an x and two y aspects', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@@ -110,44 +110,44 @@ describe('pointSeriesChartDataFromTable', function () {
       ]
     });
 
-    let avg = {
+    const avg = {
       agg: vis.aggs[0],
       col: { title: 'average', aggConfig: vis.aggs[0] },
       at: function (i) { return 75.444 * (i + 1); }
     };
 
-    let date = {
+    const date = {
       agg: vis.aggs[1],
       col: { title: 'date', aggConfig: vis.aggs[1] },
       at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
     };
 
-    let max = {
+    const max = {
       agg: vis.aggs[2],
       col: { title: 'maximum', aggConfig: vis.aggs[2] },
       at: function (i) { return 100 * (i + 1); }
     };
 
-    let rowCount = 3;
-    let table = new Table();
+    const rowCount = 3;
+    const table = new Table();
     table.columns = [ date.col, avg.col, max.col ];
     _.times(rowCount, function (i) {
-      let dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
-      let avgResult = new AggConfigResult(avg.agg, dateResult, avg.at(i));
-      let maxResult = new AggConfigResult(max.agg, dateResult, max.at(i));
+      const dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
+      const avgResult = new AggConfigResult(avg.agg, dateResult, avg.at(i));
+      const maxResult = new AggConfigResult(max.agg, dateResult, max.at(i));
       table.rows.push([dateResult, avgResult, maxResult]);
     });
 
-    let chartData = pointSeriesChartDataFromTable(vis, table);
+    const chartData = pointSeriesChartDataFromTable(vis, table);
     expect(chartData).to.be.an('object');
     expect(chartData.series).to.be.an('array');
     expect(chartData.series).to.have.length(2);
     chartData.series.forEach(function (siri, i) {
-      let metric = i === 0 ? avg : max;
+      const metric = i === 0 ? avg : max;
 
       expect(siri).to.have.property('label', metric.col.label);
       expect(siri.values).to.have.length(rowCount);
-      siri.values.forEach(function (point, i) {
+      siri.values.forEach(function (point) {
         expect(point).to.have.property('x');
         expect(point.x).to.be.a('number');
 
@@ -170,7 +170,7 @@ describe('pointSeriesChartDataFromTable', function () {
   });
 
   it('handles a table with an x, a series, and two y aspects', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         { type: 'terms', schema: 'group', params: { field: 'extension' } },
@@ -180,53 +180,53 @@ describe('pointSeriesChartDataFromTable', function () {
       ]
     });
 
-    let extensions = ['php', 'jpg', 'gif', 'css'];
-    let term = {
+    const extensions = ['php', 'jpg', 'gif', 'css'];
+    const term = {
       agg: vis.aggs[0],
       col: { title: 'extensions', aggConfig: vis.aggs[0] },
       at: function (i) { return extensions[i % extensions.length]; }
     };
 
-    let avg = {
+    const avg = {
       agg: vis.aggs[1],
       col: { title: 'average', aggConfig: vis.aggs[1] },
       at: function (i) { return 75.444 * (i + 1); }
     };
 
-    let date = {
+    const date = {
       agg: vis.aggs[2],
       col: { title: 'date', aggConfig: vis.aggs[2] },
       at: function (i) { return moment().startOf('day').add(i, 'day').valueOf(); }
     };
 
-    let max = {
+    const max = {
       agg: vis.aggs[3],
       col: { title: 'maximum', aggConfig: vis.aggs[3] },
       at: function (i) { return 100 * (i + 1); }
     };
 
-    let metricCount = 2;
-    let rowsPerSegment = 2;
-    let rowCount = extensions.length * rowsPerSegment;
-    let table = new Table();
+    const metricCount = 2;
+    const rowsPerSegment = 2;
+    const rowCount = extensions.length * rowsPerSegment;
+    const table = new Table();
     table.columns = [ date.col, term.col, avg.col, max.col ];
     _.times(rowCount, function (i) {
-      let dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
-      let termResult = new AggConfigResult(term.agg, dateResult, term.at(i));
-      let avgResult = new AggConfigResult(avg.agg, termResult, avg.at(i));
-      let maxResult = new AggConfigResult(max.agg, termResult, max.at(i));
+      const dateResult = new AggConfigResult(date.agg, void 0, date.at(i));
+      const termResult = new AggConfigResult(term.agg, dateResult, term.at(i));
+      const avgResult = new AggConfigResult(avg.agg, termResult, avg.at(i));
+      const maxResult = new AggConfigResult(max.agg, termResult, max.at(i));
       table.rows.push([dateResult, termResult, avgResult, maxResult]);
     });
 
-    let chartData = pointSeriesChartDataFromTable(vis, table);
+    const chartData = pointSeriesChartDataFromTable(vis, table);
     expect(chartData).to.be.an('object');
     expect(chartData.series).to.be.an('array');
     // one series for each extension, and then one for each metric inside
     expect(chartData.series).to.have.length(extensions.length * metricCount);
-    chartData.series.forEach(function (siri, i) {
+    chartData.series.forEach(function (siri) {
       // figure out the metric used to create this series
-      let metricAgg = siri.values[0].aggConfigResult.aggConfig;
-      let metric = avg.agg === metricAgg ? avg : max;
+      const metricAgg = siri.values[0].aggConfigResult.aggConfig;
+      const metric = avg.agg === metricAgg ? avg : max;
 
       expect(siri.values).to.have.length(rowsPerSegment);
       siri.values.forEach(function (point) {
diff --git a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js
index db7763ca82772..1c3dc596f9fe5 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js
@@ -6,7 +6,7 @@ import ngMock from 'ng_mock';
 import AggResponsePointSeriesOrderedDateAxisProvider from 'ui/agg_response/point_series/_ordered_date_axis';
 describe('orderedDateAxis', function () {
 
-  let baseArgs = {
+  const baseArgs = {
     vis: {
       indexPattern: {
         timeFieldName: '@timestamp'
@@ -37,7 +37,7 @@ describe('orderedDateAxis', function () {
 
   describe('xAxisFormatter', function () {
     it('sets the xAxisFormatter', function () {
-      let args = _.cloneDeep(baseArgs);
+      const args = _.cloneDeep(baseArgs);
       orderedDateAxis(args.vis, args.chart);
 
       expect(args.chart).to.have.property('xAxisFormatter');
@@ -45,10 +45,10 @@ describe('orderedDateAxis', function () {
     });
 
     it('formats values using moment, and returns strings', function () {
-      let args = _.cloneDeep(baseArgs);
+      const args = _.cloneDeep(baseArgs);
       orderedDateAxis(args.vis, args.chart);
 
-      let val = '2014-08-06T12:34:01';
+      const val = '2014-08-06T12:34:01';
       expect(args.chart.xAxisFormatter(val))
         .to.be(moment(val).format('hh:mm:ss'));
     });
@@ -56,7 +56,7 @@ describe('orderedDateAxis', function () {
 
   describe('ordered object', function () {
     it('sets date: true', function () {
-      let args = _.cloneDeep(baseArgs);
+      const args = _.cloneDeep(baseArgs);
       orderedDateAxis(args.vis, args.chart);
 
       expect(args.chart)
@@ -67,21 +67,21 @@ describe('orderedDateAxis', function () {
     });
 
     it('relies on agg.buckets for the interval', function () {
-      let args = _.cloneDeep(baseArgs);
-      let spy = sinon.spy(args.chart.aspects.x.agg.buckets, 'getInterval');
+      const args = _.cloneDeep(baseArgs);
+      const spy = sinon.spy(args.chart.aspects.x.agg.buckets, 'getInterval');
       orderedDateAxis(args.vis, args.chart);
       expect(spy).to.have.property('callCount', 1);
     });
 
     it('sets the min/max when the buckets are bounded', function () {
-      let args = _.cloneDeep(baseArgs);
+      const args = _.cloneDeep(baseArgs);
       orderedDateAxis(args.vis, args.chart);
       expect(moment.isMoment(args.chart.ordered.min)).to.be(true);
       expect(moment.isMoment(args.chart.ordered.max)).to.be(true);
     });
 
     it('does not set the min/max when the buckets are unbounded', function () {
-      let args = _.cloneDeep(baseArgs);
+      const args = _.cloneDeep(baseArgs);
       args.chart.aspects.x.agg.buckets.getBounds = _.constant();
       orderedDateAxis(args.vis, args.chart);
       expect(args.chart.ordered).to.not.have.property('min');
diff --git a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js
index 73c9e796f252b..5a54de473e578 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js
@@ -23,7 +23,7 @@ describe('tooltipFormatter', function () {
     return $row.eq(i).text().trim();
   }
 
-  let baseEvent = {
+  const baseEvent = {
     datum: {
       aggConfigResult: {
         aggConfig: agg('inner'),
@@ -42,20 +42,20 @@ describe('tooltipFormatter', function () {
   };
 
   it('returns html based on the mouse event', function () {
-    let event = _.cloneDeep(baseEvent);
-    let $el = $(tooltipFormatter(event));
-    let $rows = $el.find('tr');
+    const event = _.cloneDeep(baseEvent);
+    const $el = $(tooltipFormatter(event));
+    const $rows = $el.find('tr');
     expect($rows.size()).to.be(3);
 
-    let $row1 = $rows.eq(0).find('td');
+    const $row1 = $rows.eq(0).find('td');
     expect(cell($row1, 0)).to.be('inner');
     expect(cell($row1, 1)).to.be('(3)');
 
-    let $row2 = $rows.eq(1).find('td');
+    const $row2 = $rows.eq(1).find('td');
     expect(cell($row2, 0)).to.be('middle');
     expect(cell($row2, 1)).to.be('(2)');
 
-    let $row3 = $rows.eq(2).find('td');
+    const $row3 = $rows.eq(2).find('td');
     expect(cell($row3, 0)).to.be('top');
     expect(cell($row3, 1)).to.be('(1)');
   });
diff --git a/src/ui/public/agg_response/point_series/_add_to_siri.js b/src/ui/public/agg_response/point_series/_add_to_siri.js
index d5ad8a84530d9..1ed56b53c3557 100644
--- a/src/ui/public/agg_response/point_series/_add_to_siri.js
+++ b/src/ui/public/agg_response/point_series/_add_to_siri.js
@@ -12,4 +12,4 @@ export default function PointSeriesAddToSiri() {
       values: [point]
     });
   };
-};
+}
diff --git a/src/ui/public/agg_response/point_series/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/_fake_x_aspect.js
index 5f9516a421cc2..856c9df87b6bb 100644
--- a/src/ui/public/agg_response/point_series/_fake_x_aspect.js
+++ b/src/ui/public/agg_response/point_series/_fake_x_aspect.js
@@ -2,10 +2,10 @@ import VisAggConfigProvider from 'ui/vis/agg_config';
 import AggTypesAggTypeProvider from 'ui/agg_types/agg_type';
 
 export default function PointSeriesFakeXAxis(Private) {
-  let AggConfig = Private(VisAggConfigProvider);
-  let AggType = Private(AggTypesAggTypeProvider);
+  const AggConfig = Private(VisAggConfigProvider);
+  const AggType = Private(AggTypesAggTypeProvider);
 
-  let allAgg = new AggType({
+  const allAgg = new AggType({
     name: 'all',
     title: 'All docs',
     ordered: false,
@@ -13,7 +13,7 @@ export default function PointSeriesFakeXAxis(Private) {
   });
 
   return function makeFakeXAxis(vis) {
-    let fake = new AggConfig(vis, {
+    const fake = new AggConfig(vis, {
       type: allAgg,
       schema: vis.type.schemas.all.byName.segment
     });
@@ -27,4 +27,4 @@ export default function PointSeriesFakeXAxis(Private) {
       }
     };
   };
-};
+}
diff --git a/src/ui/public/agg_response/point_series/_get_aspects.js b/src/ui/public/agg_response/point_series/_get_aspects.js
index f4978de298858..329b1cb54fcb4 100644
--- a/src/ui/public/agg_response/point_series/_get_aspects.js
+++ b/src/ui/public/agg_response/point_series/_get_aspects.js
@@ -1,9 +1,9 @@
 import _ from 'lodash';
 import AggResponsePointSeriesFakeXAspectProvider from 'ui/agg_response/point_series/_fake_x_aspect';
 export default function PointSeriesGetAspects(Private) {
-  let fakeXAspect = Private(AggResponsePointSeriesFakeXAspectProvider);
+  const fakeXAspect = Private(AggResponsePointSeriesFakeXAspectProvider);
 
-  let map = {
+  const map = {
     segment: 'x',
     metric: 'y',
     radius: 'z',
@@ -12,12 +12,12 @@ export default function PointSeriesGetAspects(Private) {
   };
 
   function columnToAspect(aspects, col, i) {
-    let schema = col.aggConfig.schema.name;
+    const schema = col.aggConfig.schema.name;
 
-    let name = map[schema];
+    const name = map[schema];
     if (!name) throw new TypeError('unknown schema name "' + schema + '"');
 
-    let aspect = {
+    const aspect = {
       i: i,
       col: col,
       agg: col.aggConfig
@@ -36,7 +36,7 @@ export default function PointSeriesGetAspects(Private) {
    *                    may be undefined, a single aspect, or an array of aspects.
    */
   return function getAspects(vis, table) {
-    let aspects = _(table.columns)
+    const aspects = _(table.columns)
     // write each column into the aspects under it's group
     .transform(columnToAspect, {})
     // unwrap groups that only have one value, and validate groups that have more
@@ -55,4 +55,4 @@ export default function PointSeriesGetAspects(Private) {
 
     return aspects;
   };
-};
+}
diff --git a/src/ui/public/agg_response/point_series/_get_point.js b/src/ui/public/agg_response/point_series/_get_point.js
index 5e72304a66f3c..dc0710025de78 100644
--- a/src/ui/public/agg_response/point_series/_get_point.js
+++ b/src/ui/public/agg_response/point_series/_get_point.js
@@ -5,10 +5,10 @@ export default function PointSeriesGetPoint() {
   }
 
   return function getPoint(x, series, yScale, row, y, z) {
-    let zRow = z && row[z.i];
-    let xRow = row[x.i];
+    const zRow = z && row[z.i];
+    const xRow = row[x.i];
 
-    let point = {
+    const point = {
       x: unwrap(xRow, '_all'),
       xi: xRow && xRow.$order,
       y: unwrap(row[y.i]),
@@ -40,4 +40,4 @@ export default function PointSeriesGetPoint() {
 
     return point;
   };
-};
+}
diff --git a/src/ui/public/agg_response/point_series/_get_series.js b/src/ui/public/agg_response/point_series/_get_series.js
index ed27cc386446b..20a1fc9fa1e27 100644
--- a/src/ui/public/agg_response/point_series/_get_series.js
+++ b/src/ui/public/agg_response/point_series/_get_series.js
@@ -2,25 +2,25 @@ import _ from 'lodash';
 import AggResponsePointSeriesGetPointProvider from 'ui/agg_response/point_series/_get_point';
 import AggResponsePointSeriesAddToSiriProvider from 'ui/agg_response/point_series/_add_to_siri';
 export default function PointSeriesGetSeries(Private) {
-  let getPoint = Private(AggResponsePointSeriesGetPointProvider);
-  let addToSiri = Private(AggResponsePointSeriesAddToSiriProvider);
+  const getPoint = Private(AggResponsePointSeriesGetPointProvider);
+  const addToSiri = Private(AggResponsePointSeriesAddToSiriProvider);
 
   return function getSeries(rows, chart) {
-    let aspects = chart.aspects;
-    let multiY = _.isArray(aspects.y);
-    let yScale = chart.yScale;
-    let partGetPoint = _.partial(getPoint, aspects.x, aspects.series, yScale);
+    const aspects = chart.aspects;
+    const multiY = _.isArray(aspects.y);
+    const yScale = chart.yScale;
+    const partGetPoint = _.partial(getPoint, aspects.x, aspects.series, yScale);
 
     let series = _(rows)
     .transform(function (series, row) {
       if (!multiY) {
-        let point = partGetPoint(row, aspects.y, aspects.z);
+        const point = partGetPoint(row, aspects.y, aspects.z);
         if (point) addToSiri(series, point, point.series);
         return;
       }
 
       aspects.y.forEach(function (y) {
-        let point = partGetPoint(row, y, aspects.z);
+        const point = partGetPoint(row, y, aspects.z);
         if (!point) return;
 
         // use the point's y-axis as it's series by default,
@@ -44,11 +44,11 @@ export default function PointSeriesGetSeries(Private) {
 
     if (multiY) {
       series = _.sortBy(series, function (siri) {
-        let firstVal = siri.values[0];
+        const firstVal = siri.values[0];
         let y;
 
         if (firstVal) {
-          let agg = firstVal.aggConfigResult.aggConfig;
+          const agg = firstVal.aggConfigResult.aggConfig;
           y = _.find(aspects.y, function (y) {
             return y.agg === agg;
           });
@@ -60,4 +60,4 @@ export default function PointSeriesGetSeries(Private) {
 
     return series;
   };
-};
+}
diff --git a/src/ui/public/agg_response/point_series/_init_x_axis.js b/src/ui/public/agg_response/point_series/_init_x_axis.js
index 2a3584c3834f7..5aa78fab277ff 100644
--- a/src/ui/public/agg_response/point_series/_init_x_axis.js
+++ b/src/ui/public/agg_response/point_series/_init_x_axis.js
@@ -1,17 +1,15 @@
-define(function () {
-  return function PointSeriesInitX() {
-    return function initXAxis(chart) {
-      let x = chart.aspects.x;
-      chart.xAxisFormatter = x.agg ? x.agg.fieldFormatter() : String;
-      chart.xAxisLabel = x.col.title;
+export default function PointSeriesInitX() {
+  return function initXAxis(chart) {
+    const x = chart.aspects.x;
+    chart.xAxisFormatter = x.agg ? x.agg.fieldFormatter() : String;
+    chart.xAxisLabel = x.col.title;
 
-      if (!x.agg || !x.agg.type.ordered) return;
+    if (!x.agg || !x.agg.type.ordered) return;
 
-      chart.ordered = {};
-      let xAggOutput = x.agg.write();
-      if (xAggOutput.params.interval) {
-        chart.ordered.interval = xAggOutput.params.interval;
-      }
-    };
+    chart.ordered = {};
+    const xAggOutput = x.agg.write();
+    if (xAggOutput.params.interval) {
+      chart.ordered.interval = xAggOutput.params.interval;
+    }
   };
-});
+}
diff --git a/src/ui/public/agg_response/point_series/_init_y_axis.js b/src/ui/public/agg_response/point_series/_init_y_axis.js
index edd3060fc85c2..9633e045b42c1 100644
--- a/src/ui/public/agg_response/point_series/_init_y_axis.js
+++ b/src/ui/public/agg_response/point_series/_init_y_axis.js
@@ -2,8 +2,8 @@ import _ from 'lodash';
 export default function PointSeriesInitYAxis() {
 
   return function initYAxis(chart) {
-    let y = chart.aspects.y;
-    let x = chart.aspects.x;
+    const y = chart.aspects.y;
+    const x = chart.aspects.x;
 
     if (_.isArray(y)) {
       // TODO: vis option should allow choosing this format
@@ -14,7 +14,7 @@ export default function PointSeriesInitYAxis() {
       chart.yAxisLabel = y.col.title;
     }
 
-    let xAggOutput = x.agg.write();
+    const xAggOutput = x.agg.write();
     chart.yScale = xAggOutput.metricScale || null;
   };
-};
+}
diff --git a/src/ui/public/agg_response/point_series/_ordered_date_axis.js b/src/ui/public/agg_response/point_series/_ordered_date_axis.js
index 08b1d962252f2..83f6c07e22cc2 100644
--- a/src/ui/public/agg_response/point_series/_ordered_date_axis.js
+++ b/src/ui/public/agg_response/point_series/_ordered_date_axis.js
@@ -1,10 +1,10 @@
 import moment from 'moment';
-export default function PointSeriesOrderedDateAxis(timefilter) {
+export default function PointSeriesOrderedDateAxis() {
 
   return function orderedDateAxis(vis, chart) {
-    let xAgg = chart.aspects.x.agg;
-    let buckets = xAgg.buckets;
-    let format = buckets.getScaledDateFormat();
+    const xAgg = chart.aspects.x.agg;
+    const buckets = xAgg.buckets;
+    const format = buckets.getScaledDateFormat();
 
     chart.xAxisFormatter = function (val) {
       return moment(val).format(format);
@@ -15,8 +15,8 @@ export default function PointSeriesOrderedDateAxis(timefilter) {
       interval: buckets.getInterval(),
     };
 
-    let axisOnTimeField = xAgg.fieldIsTimeField();
-    let bounds = buckets.getBounds();
+    const axisOnTimeField = xAgg.fieldIsTimeField();
+    const bounds = buckets.getBounds();
     if (bounds && axisOnTimeField) {
       chart.ordered.min = bounds.min;
       chart.ordered.max = bounds.max;
@@ -24,4 +24,4 @@ export default function PointSeriesOrderedDateAxis(timefilter) {
       chart.ordered.endzones = false;
     }
   };
-};
+}
diff --git a/src/ui/public/agg_response/point_series/_tooltip_formatter.js b/src/ui/public/agg_response/point_series/_tooltip_formatter.js
index 715d692127d1e..7907352ac9b94 100644
--- a/src/ui/public/agg_response/point_series/_tooltip_formatter.js
+++ b/src/ui/public/agg_response/point_series/_tooltip_formatter.js
@@ -1,22 +1,22 @@
 import $ from 'jquery';
 export default function PointSeriesTooltipFormatter($compile, $rootScope) {
 
-  let $tooltipScope = $rootScope.$new();
-  let $tooltip = $(require('ui/agg_response/point_series/_tooltip.html'));
+  const $tooltipScope = $rootScope.$new();
+  const $tooltip = $(require('ui/agg_response/point_series/_tooltip.html'));
   $compile($tooltip)($tooltipScope);
 
   return function tooltipFormatter(event) {
-    let datum = event.datum;
+    const datum = event.datum;
     if (!datum || !datum.aggConfigResult) return '';
 
-    let details = $tooltipScope.details = [];
+    const details = $tooltipScope.details = [];
     let result = { $parent: datum.aggConfigResult };
 
     function addDetail(result) {
-      let agg = result.aggConfig;
-      let value = result.value;
+      const agg = result.aggConfig;
+      const value = result.value;
 
-      let detail = {
+      const detail = {
         value: agg.fieldFormatter()(value),
         label: agg.makeLabel()
       };
@@ -40,4 +40,4 @@ export default function PointSeriesTooltipFormatter($compile, $rootScope) {
     $tooltipScope.$apply();
     return $tooltip[0].outerHTML;
   };
-};
+}
diff --git a/src/ui/public/agg_response/point_series/point_series.js b/src/ui/public/agg_response/point_series/point_series.js
index 0a2ccd90729c4..1c4ae59a7cad6 100644
--- a/src/ui/public/agg_response/point_series/point_series.js
+++ b/src/ui/public/agg_response/point_series/point_series.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import AggResponsePointSeriesGetSeriesProvider from 'ui/agg_response/point_series/_get_series';
 import AggResponsePointSeriesGetAspectsProvider from 'ui/agg_response/point_series/_get_aspects';
 import AggResponsePointSeriesInitYAxisProvider from 'ui/agg_response/point_series/_init_y_axis';
@@ -7,23 +6,23 @@ import AggResponsePointSeriesOrderedDateAxisProvider from 'ui/agg_response/point
 import AggResponsePointSeriesTooltipFormatterProvider from 'ui/agg_response/point_series/_tooltip_formatter';
 export default function PointSeriesProvider(Private) {
 
-  let getSeries = Private(AggResponsePointSeriesGetSeriesProvider);
-  let getAspects = Private(AggResponsePointSeriesGetAspectsProvider);
-  let initYAxis = Private(AggResponsePointSeriesInitYAxisProvider);
-  let initXAxis = Private(AggResponsePointSeriesInitXAxisProvider);
-  let setupOrderedDateXAxis = Private(AggResponsePointSeriesOrderedDateAxisProvider);
-  let tooltipFormatter = Private(AggResponsePointSeriesTooltipFormatterProvider);
+  const getSeries = Private(AggResponsePointSeriesGetSeriesProvider);
+  const getAspects = Private(AggResponsePointSeriesGetAspectsProvider);
+  const initYAxis = Private(AggResponsePointSeriesInitYAxisProvider);
+  const initXAxis = Private(AggResponsePointSeriesInitXAxisProvider);
+  const setupOrderedDateXAxis = Private(AggResponsePointSeriesOrderedDateAxisProvider);
+  const tooltipFormatter = Private(AggResponsePointSeriesTooltipFormatterProvider);
 
   return function pointSeriesChartDataFromTable(vis, table) {
-    let chart = {};
-    let aspects = chart.aspects = getAspects(vis, table);
+    const chart = {};
+    const aspects = chart.aspects = getAspects(vis, table);
 
     chart.tooltipFormatter = tooltipFormatter;
 
     initXAxis(chart);
     initYAxis(chart);
 
-    let datedX = aspects.x.agg.type.ordered && aspects.x.agg.type.ordered.date;
+    const datedX = aspects.x.agg.type.ordered && aspects.x.agg.type.ordered.date;
     if (datedX) {
       setupOrderedDateXAxis(vis, chart);
     }
@@ -33,4 +32,4 @@ export default function PointSeriesProvider(Private) {
     delete chart.aspects;
     return chart;
   };
-};
+}
diff --git a/src/ui/public/agg_response/tabify/__tests__/_buckets.js b/src/ui/public/agg_response/tabify/__tests__/_buckets.js
index e2ecc8e75d55d..7bf3f33178d59 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_buckets.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_buckets.js
@@ -5,20 +5,20 @@ describe('Buckets wrapper', function () {
   let Buckets;
 
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private, $injector) {
+  beforeEach(ngMock.inject(function (Private) {
     Buckets = Private(AggResponseTabifyBucketsProvider);
   }));
 
 
   function test(aggResp, count, keys) {
     it('reads the length', function () {
-      let buckets = new Buckets(aggResp);
+      const buckets = new Buckets(aggResp);
       expect(buckets).to.have.length(count);
     });
 
     it('itterates properly, passing in the key', function () {
-      let buckets = new Buckets(aggResp);
-      let keysSent = [];
+      const buckets = new Buckets(aggResp);
+      const keysSent = [];
       buckets.forEach(function (bucket, key) {
         keysSent.push(key);
       });
@@ -29,7 +29,7 @@ describe('Buckets wrapper', function () {
   }
 
   describe('with object style buckets', function () {
-    let aggResp = {
+    const aggResp = {
       buckets: {
         '0-100': {},
         '100-200': {},
@@ -37,14 +37,14 @@ describe('Buckets wrapper', function () {
       }
     };
 
-    let count = 3;
-    let keys = ['0-100', '100-200', '200-300'];
+    const count = 3;
+    const keys = ['0-100', '100-200', '200-300'];
 
     test(aggResp, count, keys);
   });
 
   describe('with array style buckets', function () {
-    let aggResp = {
+    const aggResp = {
       buckets: [
         { key: '0-100', value: {} },
         { key: '100-200', value: {} },
@@ -52,8 +52,8 @@ describe('Buckets wrapper', function () {
       ]
     };
 
-    let count = 3;
-    let keys = ['0-100', '100-200', '200-300'];
+    const count = 3;
+    const keys = ['0-100', '100-200', '200-300'];
 
     test(aggResp, count, keys);
   });
diff --git a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
index d8db8717c2dc0..c29545ec3e371 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
@@ -9,18 +9,18 @@ describe('get columns', function () {
   let indexPattern;
 
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private, $injector) {
+  beforeEach(ngMock.inject(function (Private) {
     getColumns = Private(AggResponseTabifyGetColumnsProvider);
     Vis = Private(VisProvider);
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
   }));
 
   it('should inject a count metric if no aggs exist', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'pie'
     });
     while (vis.aggs.length) vis.aggs.pop();
-    let columns = getColumns(vis);
+    const columns = getColumns(vis);
 
     expect(columns).to.have.length(1);
     expect(columns[0]).to.have.property('aggConfig');
@@ -28,14 +28,14 @@ describe('get columns', function () {
   });
 
   it('should inject a count metric if only buckets exist', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'pie',
       aggs: [
         { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } }
       ]
     });
 
-    let columns = getColumns(vis);
+    const columns = getColumns(vis);
 
     expect(columns).to.have.length(2);
     expect(columns[1]).to.have.property('aggConfig');
@@ -43,7 +43,7 @@ describe('get columns', function () {
   });
 
   it('should inject the metric after each bucket if the vis is hierarchical', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'pie',
       aggs: [
         { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
@@ -53,7 +53,7 @@ describe('get columns', function () {
       ]
     });
 
-    let columns = getColumns(vis);
+    const columns = getColumns(vis);
 
     expect(columns).to.have.length(8);
     columns.forEach(function (column, i) {
@@ -63,7 +63,7 @@ describe('get columns', function () {
   });
 
   it('should inject the multiple metrics after each bucket if the vis is hierarchical', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'pie',
       aggs: [
         { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
@@ -75,7 +75,7 @@ describe('get columns', function () {
       ]
     });
 
-    let columns = getColumns(vis);
+    const columns = getColumns(vis);
 
     function checkColumns(column, i) {
       expect(column).to.have.property('aggConfig');
@@ -94,13 +94,12 @@ describe('get columns', function () {
 
     expect(columns).to.have.length(12);
     for (let i = 0; i < columns.length; i += 3) {
-      let counts = { buckets: 0, metrics: 0 };
       columns.slice(i, i + 3).forEach(checkColumns);
     }
   });
 
   it('should put all metrics at the end of the columns if the vis is not hierarchical', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         { type: 'date_histogram', schema: 'segment',  params: { field: '@timestamp' } },
@@ -112,7 +111,7 @@ describe('get columns', function () {
       ]
     });
 
-    let columns = getColumns(vis);
+    const columns = getColumns(vis);
     expect(columns).to.have.length(6);
 
     // sum should be last
diff --git a/src/ui/public/agg_response/tabify/__tests__/_integration.js b/src/ui/public/agg_response/tabify/__tests__/_integration.js
index ea5d6096219d6..9a2846f3aaf0b 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_integration.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_integration.js
@@ -6,14 +6,12 @@ import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify';
 import VisProvider from 'ui/vis';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 describe('tabifyAggResponse Integration', function () {
-
   let Vis;
-  let Buckets;
   let indexPattern;
   let tabifyAggResponse;
 
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private, $injector) {
+  beforeEach(ngMock.inject(function (Private) {
     tabifyAggResponse = Private(AggResponseTabifyTabifyProvider);
     Vis = Private(VisProvider);
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
@@ -26,13 +24,13 @@ describe('tabifyAggResponse Integration', function () {
   }
 
   it('transforms a simple response properly', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: []
     });
     normalizeIds(vis);
 
-    let resp = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
+    const resp = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
 
     expect(resp).to.not.have.property('tables');
     expect(resp).to.have.property('rows').and.property('columns');
@@ -81,7 +79,7 @@ describe('tabifyAggResponse Integration', function () {
     function expectRootGroup(rootTableGroup, expectInnerTables) {
       expect(rootTableGroup).to.have.property('tables');
 
-      let tables = rootTableGroup.tables;
+      const tables = rootTableGroup.tables;
       expect(tables).to.be.an('array').and.have.length(3);
       expectExtensionSplit(tables[0], 'png', expectInnerTables);
       expectExtensionSplit(tables[1], 'css', expectInnerTables);
@@ -155,7 +153,7 @@ describe('tabifyAggResponse Integration', function () {
       // only complete rows, and only put the metrics at the end.
 
       vis.isHierarchical = _.constant(false);
-      let tabbed = tabifyAggResponse(vis, esResp);
+      const tabbed = tabifyAggResponse(vis, esResp);
 
       expectRootGroup(tabbed, function expectTable(table, splitKey) {
         expectColumns(table, [src, os, avg]);
@@ -181,7 +179,7 @@ describe('tabifyAggResponse Integration', function () {
       // the existing bucket and it's metric
 
       vis.isHierarchical = _.constant(true);
-      let tabbed = tabifyAggResponse(vis, esResp, {
+      const tabbed = tabifyAggResponse(vis, esResp, {
         partialRows: true
       });
 
@@ -215,7 +213,7 @@ describe('tabifyAggResponse Integration', function () {
       // the end
 
       vis.isHierarchical = _.constant(true);
-      let tabbed = tabifyAggResponse(vis, esResp, {
+      const tabbed = tabifyAggResponse(vis, esResp, {
         partialRows: true,
         minimalColumns: true
       });
@@ -247,11 +245,11 @@ describe('tabifyAggResponse Integration', function () {
       // create metric columns after each bucket
 
       vis.isHierarchical = _.constant(false);
-      let tabbed = tabifyAggResponse(vis, esResp, {
+      const tabbed = tabifyAggResponse(vis, esResp, {
         minimalColumns: false
       });
 
-      expectRootGroup(tabbed, function expectTable(table, splitKey) {
+      expectRootGroup(tabbed, function expectTable(table) {
         expectColumns(table, [src, os, avg]);
 
         table.rows.forEach(function (row) {
diff --git a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
index e2f601a30253e..72c5b54e23b23 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
@@ -5,13 +5,10 @@ import ngMock from 'ng_mock';
 import AggResponseTabifyResponseWriterProvider from 'ui/agg_response/tabify/_response_writer';
 import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
 import AggResponseTabifyBucketsProvider from 'ui/agg_response/tabify/_buckets';
-import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table';
 import VisProvider from 'ui/vis';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 describe('ResponseWriter class', function () {
-
   let Vis;
-  let Table;
   let Buckets;
   let Private;
   let TableGroup;
@@ -32,7 +29,6 @@ describe('ResponseWriter class', function () {
       ResponseWriter = Private(AggResponseTabifyResponseWriterProvider);
       TableGroup = Private(AggResponseTabifyTableGroupProvider);
       Buckets = Private(AggResponseTabifyBucketsProvider);
-      Table = Private(AggResponseTabifyTableProvider);
       Vis = Private(VisProvider);
       indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
     }));
@@ -42,15 +38,15 @@ describe('ResponseWriter class', function () {
     defineSetup(true);
 
     it('gets the columns for the vis', function () {
-      let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-      let writer = new ResponseWriter(vis);
+      const vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+      new ResponseWriter(vis);
 
       expect(getColumns).to.have.property('callCount', 1);
       expect(getColumns.firstCall.args[0]).to.be(vis);
     });
 
     it('collects the aggConfigs from each column in aggStack', function () {
-      let aggs = [
+      const aggs = [
         { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
         { type: 'terms', schema: 'segment', params: { field: 'extension' } },
         { type: 'avg', schema: 'metric', params: { field: 'bytes' } }
@@ -60,12 +56,12 @@ describe('ResponseWriter class', function () {
         return { aggConfig: agg };
       }));
 
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: aggs
       });
 
-      let writer = new ResponseWriter(vis);
+      const writer = new ResponseWriter(vis);
       expect(writer.aggStack).to.be.an('array');
       expect(writer.aggStack).to.have.length(aggs.length);
       writer.aggStack.forEach(function (agg, i) {
@@ -74,40 +70,40 @@ describe('ResponseWriter class', function () {
     });
 
     it('sets canSplit=true by default', function () {
-      let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-      let writer = new ResponseWriter(vis);
+      const vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+      const writer = new ResponseWriter(vis);
       expect(writer).to.have.property('canSplit', true);
     });
 
     it('sets canSplit=false when config says to', function () {
-      let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-      let writer = new ResponseWriter(vis, { canSplit: false });
+      const vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+      const writer = new ResponseWriter(vis, { canSplit: false });
       expect(writer).to.have.property('canSplit', false);
     });
 
     describe('sets partialRows', function () {
       it('to the value of the config if set', function () {
-        let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        let partial = Boolean(Math.round(Math.random()));
+        const vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        const partial = Boolean(Math.round(Math.random()));
 
-        let writer = new ResponseWriter(vis, { partialRows: partial });
+        const writer = new ResponseWriter(vis, { partialRows: partial });
         expect(writer).to.have.property('partialRows', partial);
       });
 
       it('to the value of vis.isHierarchical if no config', function () {
-        let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        let hierarchical = Boolean(Math.round(Math.random()));
+        const vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        const hierarchical = Boolean(Math.round(Math.random()));
         sinon.stub(vis, 'isHierarchical').returns(hierarchical);
 
-        let writer = new ResponseWriter(vis, {});
+        const writer = new ResponseWriter(vis, {});
         expect(writer).to.have.property('partialRows', hierarchical);
       });
     });
 
     it('starts off with a root TableGroup', function () {
-      let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+      const vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
 
-      let writer = new ResponseWriter(vis);
+      const writer = new ResponseWriter(vis);
       expect(writer.root).to.be.a(TableGroup);
       expect(writer.splitStack).to.be.an('array');
       expect(writer.splitStack).to.have.length(1);
@@ -120,29 +116,29 @@ describe('ResponseWriter class', function () {
 
     describe('#response()', function () {
       it('returns the root TableGroup if splitting', function () {
-        let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        let writer = new ResponseWriter(vis);
+        const vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        const writer = new ResponseWriter(vis);
         expect(writer.response()).to.be(writer.root);
       });
 
       it('returns the first table if not splitting', function () {
-        let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        let writer = new ResponseWriter(vis, { canSplit: false });
-        let table = writer._table();
+        const vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        const writer = new ResponseWriter(vis, { canSplit: false });
+        const table = writer._table();
         expect(writer.response()).to.be(table);
       });
 
       it('adds columns to all of the tables', function () {
-        let vis = new Vis(indexPattern, {
+        const vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', params: { field: '_type' }, schema: 'split' },
             { type: 'count', schema: 'metric' }
           ]
         });
-        let buckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
-        let writer = new ResponseWriter(vis);
-        let tables = [];
+        const buckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
+        const writer = new ResponseWriter(vis);
+        const tables = [];
 
         writer.split(vis.aggs[0], buckets, function () {
           writer.cell(vis.aggs[1], 100, function () {
@@ -154,11 +150,11 @@ describe('ResponseWriter class', function () {
           expect(table.columns == null).to.be(true);
         });
 
-        let resp = writer.response();
+        const resp = writer.response();
         expect(resp).to.be.a(TableGroup);
         expect(resp.tables).to.have.length(2);
 
-        let nginx = resp.tables.shift();
+        const nginx = resp.tables.shift();
         expect(nginx).to.have.property('aggConfig', vis.aggs[0]);
         expect(nginx).to.have.property('key', 'nginx');
         expect(nginx.tables).to.have.length(1);
@@ -166,7 +162,7 @@ describe('ResponseWriter class', function () {
           expect(_.contains(tables, table)).to.be(true);
         });
 
-        let apache = resp.tables.shift();
+        const apache = resp.tables.shift();
         expect(apache).to.have.property('aggConfig', vis.aggs[0]);
         expect(apache).to.have.property('key', 'apache');
         expect(apache.tables).to.have.length(1);
@@ -184,16 +180,16 @@ describe('ResponseWriter class', function () {
 
     describe('#split()', function () {
       it('with break if the user has specified that splitting is to be disabled', function () {
-        let vis = new Vis(indexPattern, {
+        const vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', schema: 'split', params: { field: '_type' } },
             { type: 'count', schema: 'metric' }
           ]
         });
-        let agg = vis.aggs.bySchemaName.split[0];
-        let buckets = new Buckets({ buckets: [ { key: 'apache' } ]});
-        let writer = new ResponseWriter(vis, { canSplit: false });
+        const agg = vis.aggs.bySchemaName.split[0];
+        const buckets = new Buckets({ buckets: [ { key: 'apache' } ] });
+        const writer = new ResponseWriter(vis, { canSplit: false });
 
         expect(function () {
           writer.split(agg, buckets, _.noop);
@@ -201,7 +197,7 @@ describe('ResponseWriter class', function () {
       });
 
       it('forks the acrStack and rewrites the parents', function () {
-        let vis = new Vis(indexPattern, {
+        const vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', params: { field: 'extension' }, schema: 'segment' },
@@ -211,10 +207,10 @@ describe('ResponseWriter class', function () {
           ]
         });
 
-        let writer = new ResponseWriter(vis, { asAggConfigResults: true });
-        let extensions = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
-        let types = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
-        let os = new Buckets({ buckets: [ { key: 'window' }, { key: 'osx' } ] });
+        const writer = new ResponseWriter(vis, { asAggConfigResults: true });
+        const extensions = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
+        const types = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
+        const os = new Buckets({ buckets: [ { key: 'window' }, { key: 'osx' } ] });
 
         extensions.forEach(function (b, extension) {
           writer.cell(vis.aggs[0], extension, function () {
@@ -230,11 +226,11 @@ describe('ResponseWriter class', function () {
           });
         });
 
-        let tables = _.flattenDeep(_.pluck(writer.response().tables, 'tables'));
+        const tables = _.flattenDeep(_.pluck(writer.response().tables, 'tables'));
         expect(tables.length).to.be(types.length);
 
         // collect the far left acr from each table
-        let leftAcrs = _.pluck(tables, 'rows[0][0]');
+        const leftAcrs = _.pluck(tables, 'rows[0][0]');
 
         leftAcrs.forEach(function (acr, i, acrs) {
           expect(acr.aggConfig).to.be(vis.aggs[0]);
@@ -243,7 +239,7 @@ describe('ResponseWriter class', function () {
 
           // for all but the last acr, compare to the next
           if (i + 1 >= acrs.length) return;
-          let acr2 = leftAcrs[i + 1];
+          const acr2 = leftAcrs[i + 1];
 
           expect(acr.key).to.be(acr2.key);
           expect(acr.value).to.be(acr2.value);
@@ -258,8 +254,8 @@ describe('ResponseWriter class', function () {
     describe('#cell()', function () {
       it('logs a cell in the ResponseWriters row buffer, calls the block arg, then removes the value from the buffer',
       function () {
-        let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        let writer = new ResponseWriter(vis);
+        const vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        const writer = new ResponseWriter(vis);
 
         expect(writer.rowBuffer).to.have.length(0);
         writer.cell({}, 500, function () {
@@ -272,10 +268,10 @@ describe('ResponseWriter class', function () {
 
     describe('#row()', function () {
       it('writes the ResponseWriters internal rowBuffer into a table', function () {
-        let vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
-        let writer = new ResponseWriter(vis);
+        const vis = new Vis(indexPattern, { type: 'histogram', aggs: [] });
+        const writer = new ResponseWriter(vis);
 
-        let table = writer._table();
+        const table = writer._table();
         writer.cell({}, 1, function () {
           writer.cell({}, 2, function () {
             writer.cell({}, 3, function () {
@@ -289,7 +285,7 @@ describe('ResponseWriter class', function () {
       });
 
       it('always writes to the table group at the top of the split stack', function () {
-        let vis = new Vis(indexPattern, {
+        const vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', schema: 'split', params: { field: '_type' } },
@@ -298,20 +294,20 @@ describe('ResponseWriter class', function () {
             { type: 'count', schema: 'metric' }
           ]
         });
-        let splits = vis.aggs.bySchemaName.split;
+        const splits = vis.aggs.bySchemaName.split;
 
-        let type = splits[0];
-        let typeBuckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
+        const type = splits[0];
+        const typeBuckets = new Buckets({ buckets: [ { key: 'nginx' }, { key: 'apache' } ] });
 
-        let ext = splits[1];
-        let extBuckets = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
+        const ext = splits[1];
+        const extBuckets = new Buckets({ buckets: [ { key: 'jpg' }, { key: 'png' } ] });
 
-        let os = splits[2];
-        let osBuckets = new Buckets({ buckets: [ { key: 'windows' }, { key: 'mac' } ] });
+        const os = splits[2];
+        const osBuckets = new Buckets({ buckets: [ { key: 'windows' }, { key: 'mac' } ] });
 
-        let count = vis.aggs[3];
+        const count = vis.aggs[3];
 
-        let writer = new ResponseWriter(vis);
+        const writer = new ResponseWriter(vis);
         writer.split(type, typeBuckets, function () {
           writer.split(ext, extBuckets, function () {
             writer.split(os, osBuckets, function (bucket, key) {
@@ -322,7 +318,7 @@ describe('ResponseWriter class', function () {
           });
         });
 
-        let resp = writer.response();
+        const resp = writer.response();
         let sum = 0;
         let tables = 0;
         (function recurse(t) {
@@ -347,16 +343,16 @@ describe('ResponseWriter class', function () {
       });
 
       it('writes partial rows for hierarchical vis', function () {
-        let vis = new Vis(indexPattern, {
+        const vis = new Vis(indexPattern, {
           type: 'pie',
           aggs: [
-            { type: 'terms', schema: 'segment', params: { field: '_type' }},
+            { type: 'terms', schema: 'segment', params: { field: '_type' } },
             { type: 'count', schema: 'metric' }
           ]
         });
 
-        let writer = new ResponseWriter(vis);
-        let table = writer._table();
+        const writer = new ResponseWriter(vis);
+        const table = writer._table();
         writer.cell(vis.aggs[0], 'apache', function () {
           writer.row();
         });
@@ -366,16 +362,16 @@ describe('ResponseWriter class', function () {
       });
 
       it('skips partial rows for non-hierarchical vis', function () {
-        let vis = new Vis(indexPattern, {
+        const vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
-            { type: 'terms', schema: 'segment', params: { field: '_type' }},
+            { type: 'terms', schema: 'segment', params: { field: '_type' } },
             { type: 'count', schema: 'metric' }
           ]
         });
 
-        let writer = new ResponseWriter(vis);
-        let table = writer._table();
+        const writer = new ResponseWriter(vis);
+        const table = writer._table();
         writer.cell(vis.aggs[0], 'apache', function () {
           writer.row();
         });
diff --git a/src/ui/public/agg_response/tabify/__tests__/_table.js b/src/ui/public/agg_response/tabify/__tests__/_table.js
index 4a9011548bc64..0a40510126947 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_table.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_table.js
@@ -7,21 +7,21 @@ describe('Table class', function () {
   let Table;
 
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private, $injector) {
+  beforeEach(ngMock.inject(function (Private) {
     Table = Private(AggResponseTabifyTableProvider);
   }));
 
   it('exposes rows array, but not the columns', function () {
-    let table = new Table();
+    const table = new Table();
     expect(table.rows).to.be.an('array');
     expect(table.columns == null).to.be.ok();
   });
 
   describe('#aggConfig', function () {
     it('accepts a column from the table and returns its agg config', function () {
-      let table = new Table();
-      let football = {};
-      let column = {
+      const table = new Table();
+      const football = {};
+      const column = {
         aggConfig: football
       };
 
@@ -30,7 +30,7 @@ describe('Table class', function () {
 
     it('throws a TypeError if the column is malformed', function () {
       expect(function () {
-        let notAColumn = {};
+        const notAColumn = {};
         (new Table()).aggConfig(notAColumn);
       }).to.throwException(TypeError);
     });
@@ -38,12 +38,12 @@ describe('Table class', function () {
 
   describe('#title', function () {
     it('returns nothing if the table is not part of a table group', function () {
-      let table = new Table();
+      const table = new Table();
       expect(table.title()).to.be('');
     });
 
     it('returns the title of the TableGroup if the table is part of one', function () {
-      let table = new Table();
+      const table = new Table();
       table.$parent = {
         title: 'TableGroup Title',
         tables: [table]
@@ -55,9 +55,9 @@ describe('Table class', function () {
 
   describe('#field', function () {
     it('calls the columns aggConfig#getField() method', function () {
-      let table = new Table();
-      let football = {};
-      let column = {
+      const table = new Table();
+      const football = {};
+      const column = {
         aggConfig: {
           getField: _.constant(football)
         }
@@ -69,9 +69,9 @@ describe('Table class', function () {
 
   describe('#fieldFormatter', function () {
     it('calls the columns aggConfig#fieldFormatter() method', function () {
-      let table = new Table();
-      let football = {};
-      let column = {
+      const table = new Table();
+      const football = {};
+      const column = {
         aggConfig: {
           fieldFormatter: _.constant(football)
         }
diff --git a/src/ui/public/agg_response/tabify/__tests__/_table_group.js b/src/ui/public/agg_response/tabify/__tests__/_table_group.js
index 5455caa143f34..a52ca852f72f1 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_table_group.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_table_group.js
@@ -5,12 +5,12 @@ describe('Table Group class', function () {
   let TableGroup;
 
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private, $injector) {
+  beforeEach(ngMock.inject(function (Private) {
     TableGroup = Private(AggResponseTabifyTableGroupProvider);
   }));
 
   it('exposes tables array and empty aggConfig, key and title', function () {
-    let tableGroup = new TableGroup();
+    const tableGroup = new TableGroup();
     expect(tableGroup.tables).to.be.an('array');
     expect(tableGroup.aggConfig).to.be(null);
     expect(tableGroup.key).to.be(null);
diff --git a/src/ui/public/agg_response/tabify/_buckets.js b/src/ui/public/agg_response/tabify/_buckets.js
index 7d05c83a882b1..37eda6f395b78 100644
--- a/src/ui/public/agg_response/tabify/_buckets.js
+++ b/src/ui/public/agg_response/tabify/_buckets.js
@@ -15,7 +15,7 @@ export default function AggResponseBucketsProvider() {
   }
 
   Buckets.prototype.forEach = function (fn) {
-    let buckets = this.buckets;
+    const buckets = this.buckets;
 
     if (this.objectMode) {
       this._keys.forEach(function (key) {
@@ -29,4 +29,4 @@ export default function AggResponseBucketsProvider() {
   };
 
   return Buckets;
-};
+}
diff --git a/src/ui/public/agg_response/tabify/_get_columns.js b/src/ui/public/agg_response/tabify/_get_columns.js
index b9268891cadc3..f5a60c5d0c538 100644
--- a/src/ui/public/agg_response/tabify/_get_columns.js
+++ b/src/ui/public/agg_response/tabify/_get_columns.js
@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import VisAggConfigProvider from 'ui/vis/agg_config';
 export default function GetColumnsProvider(Private) {
-  let AggConfig = Private(VisAggConfigProvider);
+  const AggConfig = Private(VisAggConfigProvider);
 
   return function getColumns(vis, minimal) {
-    let aggs = vis.aggs.getResponseAggs();
+    const aggs = vis.aggs.getResponseAggs();
 
     if (minimal == null) minimal = !vis.isHierarchical();
 
@@ -23,10 +23,10 @@ export default function GetColumnsProvider(Private) {
     }
 
     // supposed to be bucket,...metrics,bucket,...metrics
-    let columns = [];
+    const columns = [];
 
     // seperate the metrics
-    let grouped = _.groupBy(aggs, function (agg) {
+    const grouped = _.groupBy(aggs, function (agg) {
       return agg.schema.group;
     });
 
@@ -38,7 +38,7 @@ export default function GetColumnsProvider(Private) {
     }
 
     // return the buckets, and after each place all of the metrics
-    grouped.buckets.forEach(function (agg, i) {
+    grouped.buckets.forEach(function (agg) {
       columns.push({ aggConfig: agg });
       grouped.metrics.forEach(function (metric) {
         columns.push({ aggConfig: metric });
@@ -47,4 +47,4 @@ export default function GetColumnsProvider(Private) {
 
     return columns;
   };
-};
+}
diff --git a/src/ui/public/agg_response/tabify/_response_writer.js b/src/ui/public/agg_response/tabify/_response_writer.js
index 53f1ee01782ac..4f44f474f2e02 100644
--- a/src/ui/public/agg_response/tabify/_response_writer.js
+++ b/src/ui/public/agg_response/tabify/_response_writer.js
@@ -4,9 +4,9 @@ import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table';
 import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
 import AggResponseTabifyGetColumnsProvider from 'ui/agg_response/tabify/_get_columns';
 export default function TabbedAggResponseWriterProvider(Private) {
-  let Table = Private(AggResponseTabifyTableProvider);
-  let TableGroup = Private(AggResponseTabifyTableGroupProvider);
-  let getColumns = Private(AggResponseTabifyGetColumnsProvider);
+  const Table = Private(AggResponseTabifyTableProvider);
+  const TableGroup = Private(AggResponseTabifyTableGroupProvider);
+  const getColumns = Private(AggResponseTabifyGetColumnsProvider);
 
 
   _.class(SplitAcr).inherits(AggConfigResult);
@@ -25,7 +25,7 @@ export default function TabbedAggResponseWriterProvider(Private) {
     this.opts = opts || {};
     this.rowBuffer = [];
 
-    let visIsHier = vis.isHierarchical();
+    const visIsHier = vis.isHierarchical();
 
     // do the options allow for splitting? we will only split if true and
     // tabify calls the split method.
@@ -67,9 +67,9 @@ export default function TabbedAggResponseWriterProvider(Private) {
    * @return {Table/TableGroup} table - the created table
    */
   TabbedAggResponseWriter.prototype._table = function (group, agg, key) {
-    let Class = (group) ? TableGroup : Table;
-    let table = new Class();
-    let parent = this.splitStack[0];
+    const Class = (group) ? TableGroup : Table;
+    const table = new Class();
+    const parent = this.splitStack[0];
 
     if (group) {
       table.aggConfig = agg;
@@ -95,7 +95,7 @@ export default function TabbedAggResponseWriterProvider(Private) {
    * @param  {function} block - a function to execute for each sub bucket
    */
   TabbedAggResponseWriter.prototype.split = function (agg, buckets, block) {
-    let self = this;
+    const self = this;
 
     if (!self.canSplit) {
       throw new Error('attempted to split when splitting is disabled');
@@ -127,7 +127,7 @@ export default function TabbedAggResponseWriterProvider(Private) {
   };
 
   TabbedAggResponseWriter.prototype._removeAggFromColumns = function (agg) {
-    let i = _.findIndex(this.columns, function (col) {
+    const i = _.findIndex(this.columns, function (col) {
       return col.aggConfig === agg;
     });
 
@@ -140,8 +140,8 @@ export default function TabbedAggResponseWriterProvider(Private) {
 
     // hierarchical vis creats additional columns for each bucket
     // we will remove those too
-    let mCol = this.columns.splice(i, 1).pop();
-    let mI = _.findIndex(this.aggStack, function (agg) {
+    const mCol = this.columns.splice(i, 1).pop();
+    const mI = _.findIndex(this.aggStack, function (agg) {
       return agg === mCol.aggConfig;
     });
 
@@ -160,8 +160,8 @@ export default function TabbedAggResponseWriterProvider(Private) {
    * @return {SplitAcr} - the AggConfigResult created for the split bucket
    */
   TabbedAggResponseWriter.prototype._injectParentSplit = function (agg, key) {
-    let oldList = this.acrStack;
-    let newList = this.acrStack = [];
+    const oldList = this.acrStack;
+    const newList = this.acrStack = [];
 
     // walk from right to left through the old stack
     // and move things to the new stack
@@ -175,7 +175,7 @@ export default function TabbedAggResponseWriterProvider(Private) {
 
     // walk from right to left, emptying the previous list
     while (oldList.length) {
-      let acr = oldList.pop();
+      const acr = oldList.pop();
 
       // ignore other splits
       if (acr instanceof SplitAcr) {
@@ -189,11 +189,11 @@ export default function TabbedAggResponseWriterProvider(Private) {
         newList.unshift(injected);
       }
 
-      let newAcr = new AggConfigResult(acr.aggConfig, newList[0], acr.value, acr.aggConfig.getKey(acr));
+      const newAcr = new AggConfigResult(acr.aggConfig, newList[0], acr.value, acr.aggConfig.getKey(acr));
       newList.unshift(newAcr);
 
       // and replace the acr in the row buffer if its there
-      let rowI = this.rowBuffer.indexOf(acr);
+      const rowI = this.rowBuffer.indexOf(acr);
       if (rowI > -1) {
         this.rowBuffer[rowI] = newAcr;
       }
@@ -215,7 +215,7 @@ export default function TabbedAggResponseWriterProvider(Private) {
       value = new AggConfigResult(agg, this.acrStack[0], value, value);
     }
 
-    let staskResult = this.asAggConfigResults && value.type === 'bucket';
+    const staskResult = this.asAggConfigResults && value.type === 'bucket';
 
     this.rowBuffer.push(value);
     if (staskResult) this.acrStack.unshift(value);
@@ -237,14 +237,14 @@ export default function TabbedAggResponseWriterProvider(Private) {
    * @return {undefined}
    */
   TabbedAggResponseWriter.prototype.row = function (buffer) {
-    let cells = buffer || this.rowBuffer.slice(0);
+    const cells = buffer || this.rowBuffer.slice(0);
 
     if (!this.partialRows && cells.length < this.columns.length) {
       return;
     }
 
-    let split = this.splitStack[0];
-    let table = split.tables[0] || this._table(false);
+    const split = this.splitStack[0];
+    const table = split.tables[0] || this._table(false);
 
     while (cells.length < this.columns.length) cells.push('');
     table.rows.push(cells);
@@ -257,7 +257,7 @@ export default function TabbedAggResponseWriterProvider(Private) {
    * @return {object} - the final table-tree
    */
   TabbedAggResponseWriter.prototype.response = function () {
-    let columns = this.columns;
+    const columns = this.columns;
 
     // give the columns some metadata
     columns.map(function (col) {
@@ -265,14 +265,14 @@ export default function TabbedAggResponseWriterProvider(Private) {
     });
 
     // walk the tree and write the columns to each table
-    (function step(table, group) {
+    ((function step(table) {
       if (table.tables) table.tables.forEach(step);
       else table.columns = columns.slice(0);
-    }(this.root));
+    })(this.root));
 
     if (this.canSplit) return this.root;
 
-    let table = this.root.tables[0];
+    const table = this.root.tables[0];
     if (!table) return;
 
     delete table.$parent;
@@ -280,4 +280,4 @@ export default function TabbedAggResponseWriterProvider(Private) {
   };
 
   return TabbedAggResponseWriter;
-};
+}
diff --git a/src/ui/public/agg_response/tabify/_table.js b/src/ui/public/agg_response/tabify/_table.js
index c327718fa97a9..2c27ae3ba257c 100644
--- a/src/ui/public/agg_response/tabify/_table.js
+++ b/src/ui/public/agg_response/tabify/_table.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 export default function TableProvider() {
 
   /**
@@ -35,4 +34,4 @@ export default function TableProvider() {
 
 
   return Table;
-};
+}
diff --git a/src/ui/public/agg_response/tabify/_table_group.js b/src/ui/public/agg_response/tabify/_table_group.js
index 4cfda528b8c49..37a8b4939d7f8 100644
--- a/src/ui/public/agg_response/tabify/_table_group.js
+++ b/src/ui/public/agg_response/tabify/_table_group.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 export default function TableGroupProvider() {
 
   /**
@@ -21,4 +20,4 @@ export default function TableGroupProvider() {
   };
 
   return TableGroup;
-};
+}
diff --git a/src/ui/public/agg_response/tabify/tabify.js b/src/ui/public/agg_response/tabify/tabify.js
index 722a1a12b8032..53046349d2f3d 100644
--- a/src/ui/public/agg_response/tabify/tabify.js
+++ b/src/ui/public/agg_response/tabify/tabify.js
@@ -1,18 +1,15 @@
 import _ from 'lodash';
-import VisAggConfigProvider from 'ui/vis/agg_config';
 import AggResponseTabifyResponseWriterProvider from 'ui/agg_response/tabify/_response_writer';
 import AggResponseTabifyBucketsProvider from 'ui/agg_response/tabify/_buckets';
 export default function tabifyAggResponseProvider(Private, Notifier) {
-
-  let AggConfig = Private(VisAggConfigProvider);
-  let TabbedAggResponseWriter = Private(AggResponseTabifyResponseWriterProvider);
-  let Buckets = Private(AggResponseTabifyBucketsProvider);
-  let notify = new Notifier({ location: 'agg_response/tabify'});
+  const TabbedAggResponseWriter = Private(AggResponseTabifyResponseWriterProvider);
+  const Buckets = Private(AggResponseTabifyBucketsProvider);
+  const notify = new Notifier({ location: 'agg_response/tabify' });
 
   function tabifyAggResponse(vis, esResponse, respOpts) {
-    let write = new TabbedAggResponseWriter(vis, respOpts);
+    const write = new TabbedAggResponseWriter(vis, respOpts);
 
-    let topLevelBucket = _.assign({}, esResponse.aggregations, {
+    const topLevelBucket = _.assign({}, esResponse.aggregations, {
       doc_count: esResponse.hits.total
     });
 
@@ -31,13 +28,13 @@ export default function tabifyAggResponseProvider(Private, Notifier) {
    * @returns {undefined}
    */
   function collectBucket(write, bucket, key) {
-    let agg = write.aggStack.shift();
+    const agg = write.aggStack.shift();
 
     switch (agg.schema.group) {
       case 'buckets':
-        let buckets = new Buckets(bucket[agg.id]);
+        const buckets = new Buckets(bucket[agg.id]);
         if (buckets.length) {
-          let splitting = write.canSplit && agg.schema.name === 'split';
+          const splitting = write.canSplit && agg.schema.name === 'split';
           if (splitting) {
             write.split(agg, buckets, function forEachBucket(subBucket, key) {
               collectBucket(write, subBucket, agg.getKey(subBucket), key);
@@ -63,7 +60,7 @@ export default function tabifyAggResponseProvider(Private, Notifier) {
         }
         break;
       case 'metrics':
-        let value = agg.getValue(bucket);
+        const value = agg.getValue(bucket);
         write.cell(agg, value, function () {
           if (!write.aggStack.length) {
             // row complete
@@ -82,7 +79,7 @@ export default function tabifyAggResponseProvider(Private, Notifier) {
   // write empty values for each bucket agg, then write
   // the metrics from the initial bucket using collectBucket()
   function passEmptyBuckets(write, bucket, key) {
-    let agg = write.aggStack.shift();
+    const agg = write.aggStack.shift();
 
     switch (agg.schema.group) {
       case 'metrics':
@@ -101,4 +98,4 @@ export default function tabifyAggResponseProvider(Private, Notifier) {
   }
 
   return notify.timed('tabify agg response', tabifyAggResponse);
-};
+}
diff --git a/src/ui/public/agg_table/__tests__/_group.js b/src/ui/public/agg_table/__tests__/_group.js
index 88c7cb92092ed..ad521aec5301d 100644
--- a/src/ui/public/agg_table/__tests__/_group.js
+++ b/src/ui/public/agg_table/__tests__/_group.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import $ from 'jquery';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
@@ -34,13 +33,13 @@ describe('AggTableGroup Directive', function () {
 
 
   it('renders a simple split response properly', function () {
-    let vis = new Vis(indexPattern, 'table');
+    const vis = new Vis(indexPattern, 'table');
     $scope.group = tabifyAggResponse(vis, fixtures.metricOnly);
     $scope.sort = {
       columnIndex: null,
       direction: null
     };
-    let $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
+    const $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
 
     $compile($el)($scope);
     $scope.$digest();
@@ -50,7 +49,7 @@ describe('AggTableGroup Directive', function () {
   });
 
   it('renders nothing if the table list is empty', function () {
-    let $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
+    const $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
 
     $scope.group = {
       tables: []
@@ -59,12 +58,12 @@ describe('AggTableGroup Directive', function () {
     $compile($el)($scope);
     $scope.$digest();
 
-    let $subTables = $el.find('kbn-agg-table');
+    const $subTables = $el.find('kbn-agg-table');
     expect($subTables.size()).to.be(0);
   });
 
   it('renders a complex response properly', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'pie',
       aggs: [
         { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@@ -77,15 +76,15 @@ describe('AggTableGroup Directive', function () {
       agg.id = 'agg_' + (i + 1);
     });
 
-    let group = $scope.group = tabifyAggResponse(vis, fixtures.threeTermBuckets);
-    let $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
+    const group = $scope.group = tabifyAggResponse(vis, fixtures.threeTermBuckets);
+    const $el = $('<kbn-agg-table-group group="group"></kbn-agg-table-group>');
     $compile($el)($scope);
     $scope.$digest();
 
-    let $subTables = $el.find('kbn-agg-table');
+    const $subTables = $el.find('kbn-agg-table');
     expect($subTables.size()).to.be(3);
 
-    let $subTableHeaders = $el.find('.agg-table-group-header');
+    const $subTableHeaders = $el.find('.agg-table-group-header');
     expect($subTableHeaders.size()).to.be(3);
 
     $subTableHeaders.each(function (i) {
diff --git a/src/ui/public/agg_table/__tests__/_table.js b/src/ui/public/agg_table/__tests__/_table.js
index 3de485472d6b7..231e061f1030a 100644
--- a/src/ui/public/agg_table/__tests__/_table.js
+++ b/src/ui/public/agg_table/__tests__/_table.js
@@ -35,10 +35,10 @@ describe('AggTable Directive', function () {
 
 
   it('renders a simple response properly', function () {
-    let vis = new Vis(indexPattern, 'table');
+    const vis = new Vis(indexPattern, 'table');
     $scope.table = tabifyAggResponse(vis, fixtures.metricOnly, { canSplit: false });
 
-    let $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
+    const $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
     $scope.$digest();
 
     expect($el.find('tbody').size()).to.be(1);
@@ -48,14 +48,14 @@ describe('AggTable Directive', function () {
 
   it('renders nothing if the table is empty', function () {
     $scope.table = null;
-    let $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
+    const $el = $compile('<kbn-agg-table table="table"></kbn-agg-table>')($scope);
     $scope.$digest();
 
     expect($el.find('tbody').size()).to.be(0);
   });
 
   it('renders a complex response properly', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'pie',
       aggs: [
         { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
@@ -69,27 +69,27 @@ describe('AggTable Directive', function () {
     });
 
     $scope.table = tabifyAggResponse(vis, fixtures.threeTermBuckets, { canSplit: false });
-    let $el = $('<kbn-agg-table table="table"></kbn-agg-table>');
+    const $el = $('<kbn-agg-table table="table"></kbn-agg-table>');
     $compile($el)($scope);
     $scope.$digest();
 
     expect($el.find('tbody').size()).to.be(1);
 
-    let $rows = $el.find('tbody tr');
+    const $rows = $el.find('tbody tr');
     expect($rows.size()).to.be.greaterThan(0);
 
     function validBytes(str) {
       expect(str).to.match(/^\d+$/);
-      let bytesAsNum = _.parseInt(str);
+      const bytesAsNum = _.parseInt(str);
       expect(bytesAsNum === 0 || bytesAsNum > 1000).to.be.ok();
     }
 
-    $rows.each(function (i) {
+    $rows.each(function () {
       // 6 cells in every row
-      let $cells = $(this).find('td');
+      const $cells = $(this).find('td');
       expect($cells.size()).to.be(6);
 
-      let txts = $cells.map(function () {
+      const txts = $cells.map(function () {
         return $(this).text().trim();
       });
 
@@ -109,11 +109,11 @@ describe('AggTable Directive', function () {
 
   describe('aggTable.toCsv()', function () {
     it('escapes and formats the rows and columns properly', function () {
-      let $el = $compile('<kbn-agg-table table="table">')($scope);
+      const $el = $compile('<kbn-agg-table table="table">')($scope);
       $scope.$digest();
 
-      let $tableScope = $el.isolateScope();
-      let aggTable = $tableScope.aggTable;
+      const $tableScope = $el.isolateScope();
+      const aggTable = $tableScope.aggTable;
 
       $tableScope.table = {
         columns: [
@@ -150,13 +150,13 @@ describe('AggTable Directive', function () {
     });
 
     it('calls _saveAs properly', function () {
-      let $el = $compile('<kbn-agg-table table="table">')($scope);
+      const $el = $compile('<kbn-agg-table table="table">')($scope);
       $scope.$digest();
 
-      let $tableScope = $el.isolateScope();
-      let aggTable = $tableScope.aggTable;
+      const $tableScope = $el.isolateScope();
+      const aggTable = $tableScope.aggTable;
 
-      let saveAs = sinon.stub(aggTable, '_saveAs');
+      const saveAs = sinon.stub(aggTable, '_saveAs');
       $tableScope.table = {
         columns: [
           { title: 'one' },
@@ -172,7 +172,7 @@ describe('AggTable Directive', function () {
       aggTable.exportAsCsv();
 
       expect(saveAs.callCount).to.be(1);
-      let call = saveAs.getCall(0);
+      const call = saveAs.getCall(0);
       expect(call.args[0]).to.be.a(FakeBlob);
       expect(call.args[0].slices).to.eql([
         'one,two,"with double-quotes("")"' + '\r\n' +
@@ -185,12 +185,12 @@ describe('AggTable Directive', function () {
     });
 
     it('should use the export-title attribute', function () {
-      let expected = 'export file name';
-      let $el = $compile(`<kbn-agg-table table="table" export-title="exportTitle">`)($scope);
+      const expected = 'export file name';
+      const $el = $compile('<kbn-agg-table table="table" export-title="exportTitle">')($scope);
       $scope.$digest();
 
-      let $tableScope = $el.isolateScope();
-      let aggTable = $tableScope.aggTable;
+      const $tableScope = $el.isolateScope();
+      const aggTable = $tableScope.aggTable;
       $tableScope.table = {
         columns: [],
         rows: []
diff --git a/src/ui/public/agg_table/agg_table.js b/src/ui/public/agg_table/agg_table.js
index d7bd8b7565a54..5e5f16f728c99 100644
--- a/src/ui/public/agg_table/agg_table.js
+++ b/src/ui/public/agg_table/agg_table.js
@@ -27,7 +27,7 @@ uiModules
       return compileRecursiveDirective.compile($el);
     },
     controller: function ($scope) {
-      let self = this;
+      const self = this;
 
       self._saveAs = require('@spalger/filesaver').saveAs;
       self.csv = {
@@ -36,15 +36,15 @@ uiModules
       };
 
       self.exportAsCsv = function (formatted) {
-        let csv = new Blob([self.toCsv(formatted)], { type: 'text/plain;charset=utf-8' });
+        const csv = new Blob([self.toCsv(formatted)], { type: 'text/plain;charset=utf-8' });
         self._saveAs(csv, self.csv.filename);
       };
 
       self.toCsv = function (formatted) {
-        let rows = $scope.table.rows;
-        let columns = formatted ? $scope.formattedColumns : $scope.table.columns;
-        let nonAlphaNumRE = /[^a-zA-Z0-9]/;
-        let allDoubleQuoteRE = /"/g;
+        const rows = $scope.table.rows;
+        const columns = formatted ? $scope.formattedColumns : $scope.table.columns;
+        const nonAlphaNumRE = /[^a-zA-Z0-9]/;
+        const allDoubleQuoteRE = /"/g;
 
         function escape(val) {
           if (!formatted && _.isObject(val)) val = val.valueOf();
@@ -56,7 +56,7 @@ uiModules
         }
 
         // escape each cell in each row
-        let csvRows = rows.map(function (row) {
+        const csvRows = rows.map(function (row) {
           return row.map(escape);
         });
 
@@ -71,7 +71,7 @@ uiModules
       };
 
       $scope.$watch('table', function () {
-        let table = $scope.table;
+        const table = $scope.table;
 
         if (!table) {
           $scope.rows = null;
@@ -82,14 +82,14 @@ uiModules
         self.csv.filename = ($scope.exportTitle || table.title() || 'table') + '.csv';
         $scope.rows = table.rows;
         $scope.formattedColumns = table.columns.map(function (col, i) {
-          let agg = $scope.table.aggConfig(col);
-          let field = agg.getField();
-          let formattedColumn = {
+          const agg = $scope.table.aggConfig(col);
+          const field = agg.getField();
+          const formattedColumn = {
             title: col.title,
             filterable: field && field.filterable && agg.schema.group === 'buckets'
           };
 
-          let last = i === (table.columns.length - 1);
+          const last = i === (table.columns.length - 1);
 
           if (last || (agg.schema.group === 'metrics')) {
             formattedColumn.class = 'visualize-table-right';
@@ -100,7 +100,7 @@ uiModules
 
           if (isFieldNumeric || isFirstValueNumeric) {
             function sum(tableRows) {
-              return _.reduce(tableRows, function (prev, curr, n, all) {return prev + curr[i].value; }, 0);
+              return _.reduce(tableRows, function (prev, curr) {return prev + curr[i].value; }, 0);
             }
 
             switch ($scope.totalFunc) {
diff --git a/src/ui/public/agg_table/agg_table_group.js b/src/ui/public/agg_table/agg_table_group.js
index 2cd1031182ba4..cff0e1180f951 100644
--- a/src/ui/public/agg_table/agg_table_group.js
+++ b/src/ui/public/agg_table/agg_table_group.js
@@ -28,10 +28,10 @@ uiModules
 
             if (!group || !group.tables.length) return;
 
-            let firstTable = group.tables[0];
-            let params = firstTable.aggConfig && firstTable.aggConfig.params;
+            const firstTable = group.tables[0];
+            const params = firstTable.aggConfig && firstTable.aggConfig.params;
             // render groups that have Table children as if they were rows, because iteration is cleaner
-            let childLayout = (params && !params.row) ? 'columns' : 'rows';
+            const childLayout = (params && !params.row) ? 'columns' : 'rows';
 
             $scope[childLayout] = group.tables;
           });
diff --git a/src/ui/public/agg_types/__tests__/agg_param_writer.js b/src/ui/public/agg_types/__tests__/agg_param_writer.js
index 58d113f2e6c5c..0de3f8b1eb5b5 100644
--- a/src/ui/public/agg_types/__tests__/agg_param_writer.js
+++ b/src/ui/public/agg_types/__tests__/agg_param_writer.js
@@ -4,10 +4,10 @@ import AggTypesIndexProvider from 'ui/agg_types/index';
 import RegistryVisTypesProvider from 'ui/registry/vis_types';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 module.exports = function AggParamWriterHelper(Private) {
-  let Vis = Private(VisProvider);
-  let aggTypes = Private(AggTypesIndexProvider);
-  let visTypes = Private(RegistryVisTypesProvider);
-  let stubbedLogstashIndexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
+  const Vis = Private(VisProvider);
+  const aggTypes = Private(AggTypesIndexProvider);
+  const visTypes = Private(RegistryVisTypesProvider);
+  const stubbedLogstashIndexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
 
   /**
    * Helper object for writing aggParams. Specify an aggType and it will find a vis & schema, and
@@ -29,7 +29,7 @@ module.exports = function AggParamWriterHelper(Private) {
    * @param {string} opts.aggType - the name of the aggType we want to test. ('histogram', 'filter', etc.)
    */
   function AggParamWriter(opts) {
-    let self = this;
+    const self = this;
 
     self.aggType = opts.aggType;
     if (_.isString(self.aggType)) {
@@ -47,7 +47,7 @@ module.exports = function AggParamWriterHelper(Private) {
 
     // find a suitable vis type and schema
     _.find(visTypes, function (visType) {
-      let schema = _.find(visType.schemas.all, function (schema) {
+      const schema = _.find(visType.schemas.all, function (schema) {
         // type, type, type, type, type... :(
         return schema.group === self.aggType.type;
       });
@@ -69,7 +69,7 @@ module.exports = function AggParamWriterHelper(Private) {
   }
 
   AggParamWriter.prototype.write = function (paramValues) {
-    let self = this;
+    const self = this;
     paramValues = _.clone(paramValues);
 
     if (self.aggType.params.byName.field && !paramValues.field) {
@@ -90,7 +90,7 @@ module.exports = function AggParamWriterHelper(Private) {
       }]
     });
 
-    let aggConfig = _.find(self.vis.aggs, function (aggConfig) {
+    const aggConfig = _.find(self.vis.aggs, function (aggConfig) {
       return aggConfig.type === self.aggType;
     });
 
diff --git a/src/ui/public/agg_types/__tests__/agg_params.js b/src/ui/public/agg_types/__tests__/agg_params.js
index 1eff825ecb769..7636c533d3c07 100644
--- a/src/ui/public/agg_types/__tests__/agg_params.js
+++ b/src/ui/public/agg_types/__tests__/agg_params.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
 import AggTypesAggParamsProvider from 'ui/agg_types/agg_params';
@@ -28,11 +27,11 @@ describe('AggParams class', function () {
 
   describe('constructor args', function () {
     it('accepts an array of param defs', function () {
-      let params = [
+      const params = [
         { name: 'one' },
         { name: 'two' }
       ];
-      let aggParams = new AggParams(params);
+      const aggParams = new AggParams(params);
 
       expect(aggParams).to.have.length(params.length);
       expect(aggParams).to.be.an(Array);
@@ -42,43 +41,43 @@ describe('AggParams class', function () {
 
   describe('AggParam creation', function () {
     it('Uses the FieldAggParam class for params with the name "field"', function () {
-      let params = [
+      const params = [
         { name: 'field' }
       ];
-      let aggParams = new AggParams(params);
+      const aggParams = new AggParams(params);
 
       expect(aggParams).to.have.length(params.length);
       expect(aggParams[0]).to.be.a(FieldAggParam);
     });
 
     it('Uses the OptionedAggParam class for params of type "optioned"', function () {
-      let params = [
+      const params = [
         {
           name: 'interval',
           type: 'optioned'
         }
       ];
-      let aggParams = new AggParams(params);
+      const aggParams = new AggParams(params);
 
       expect(aggParams).to.have.length(params.length);
       expect(aggParams[0]).to.be.a(OptionedAggParam);
     });
 
     it('Uses the RegexAggParam class for params of type "regex"', function () {
-      let params = [
+      const params = [
         {
           name: 'exclude',
           type: 'regex'
         }
       ];
-      let aggParams = new AggParams(params);
+      const aggParams = new AggParams(params);
 
       expect(aggParams).to.have.length(params.length);
       expect(aggParams[0]).to.be.a(RegexAggParam);
     });
 
     it('Always converts the params to a BaseAggParam', function () {
-      let params = [
+      const params = [
         {
           name: 'height',
           editor: '<blink>high</blink>'
@@ -92,7 +91,7 @@ describe('AggParams class', function () {
           editor: '<blink>small</blink>'
         }
       ];
-      let aggParams = new AggParams(params);
+      const aggParams = new AggParams(params);
 
       expect(BaseAggParam).to.have.property('callCount', params.length);
       expect(FieldAggParam).to.have.property('callCount', 0);
diff --git a/src/ui/public/agg_types/__tests__/agg_type.js b/src/ui/public/agg_types/__tests__/agg_type.js
index 94dbcab47d495..ef225ef329e6f 100644
--- a/src/ui/public/agg_types/__tests__/agg_type.js
+++ b/src/ui/public/agg_types/__tests__/agg_type.js
@@ -7,12 +7,10 @@ import AggParamsPM from 'ui/agg_types/agg_params';
 import VisProvider from 'ui/vis';
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 import AggTypesAggTypeProvider from 'ui/agg_types/agg_type';
-import VisAggConfigProvider from 'ui/vis/agg_config';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 describe('AggType Class', function () {
   let AggType;
   let AggParams;
-  let AggConfig;
   let indexPattern;
   let fieldFormat;
   let Vis;
@@ -26,7 +24,6 @@ describe('AggType Class', function () {
     Vis = Private(VisProvider);
     fieldFormat = Private(RegistryFieldFormatsProvider);
     AggType = Private(AggTypesAggTypeProvider);
-    AggConfig = Private(VisAggConfigProvider);
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
   }));
 
@@ -39,7 +36,7 @@ describe('AggType Class', function () {
     });
 
     describe('application of config properties', function () {
-      let copiedConfigProps = [
+      const copiedConfigProps = [
         'name',
         'title',
         'makeLabel',
@@ -48,11 +45,11 @@ describe('AggType Class', function () {
 
       describe('"' + copiedConfigProps.join('", "') + '"', function () {
         it('assigns the config value to itself', function () {
-          let config = _.transform(copiedConfigProps, function (config, prop) {
+          const config = _.transform(copiedConfigProps, function (config, prop) {
             config[prop] = {};
           }, {});
 
-          let aggType = new AggType(config);
+          const aggType = new AggType(config);
 
           copiedConfigProps.forEach(function (prop) {
             expect(aggType[prop]).to.be(config[prop]);
@@ -62,7 +59,7 @@ describe('AggType Class', function () {
 
       describe('makeLabel', function () {
         it('makes a function when the makeLabel config is not specified', function () {
-          let someGetter = function () {};
+          const someGetter = function () {};
 
           let aggType = new AggType({
             makeLabel: someGetter
@@ -81,7 +78,7 @@ describe('AggType Class', function () {
 
       describe('getFormat', function () {
         it('returns the formatter for the aggConfig', function () {
-          let aggType = new AggType({});
+          const aggType = new AggType({});
 
           let vis = new Vis(indexPattern, {
             type: 'histogram',
@@ -112,9 +109,9 @@ describe('AggType Class', function () {
         });
 
         it('can be overridden via config', function () {
-          let someGetter = function () {};
+          const someGetter = function () {};
 
-          let aggType = new AggType({
+          const aggType = new AggType({
             getFormat: someGetter
           });
 
@@ -128,7 +125,7 @@ describe('AggType Class', function () {
         });
 
         it('defaults to AggParams object with JSON param', function () {
-          let aggType = new AggType({
+          const aggType = new AggType({
             name: 'smart agg'
           });
 
@@ -139,7 +136,7 @@ describe('AggType Class', function () {
         });
 
         it('can disable customLabel', function () {
-          let aggType = new AggType({
+          const aggType = new AggType({
             name: 'smart agg',
             customLabels: false
           });
@@ -149,13 +146,13 @@ describe('AggType Class', function () {
         });
 
         it('passes the params arg directly to the AggParams constructor', function () {
-          let params = [
-            {name: 'one'},
-            {name: 'two'}
+          const params = [
+            { name: 'one' },
+            { name: 'two' }
           ];
-          let paramLength = params.length + 2; // json and custom label are always appended
+          const paramLength = params.length + 2; // json and custom label are always appended
 
-          let aggType = new AggType({
+          const aggType = new AggType({
             name: 'bucketeer',
             params: params
           });
@@ -169,8 +166,8 @@ describe('AggType Class', function () {
 
       describe('getResponseAggs', function () {
         it('copies the value', function () {
-          let football = {};
-          let aggType = new AggType({
+          const football = {};
+          const aggType = new AggType({
             getResponseAggs: football
           });
 
@@ -178,7 +175,7 @@ describe('AggType Class', function () {
         });
 
         it('defaults to _.noop', function () {
-          let aggType = new AggType({});
+          const aggType = new AggType({});
 
           expect(aggType.getResponseAggs).to.be(_.noop);
         });
@@ -186,5 +183,4 @@ describe('AggType Class', function () {
     });
 
   });
-
 });
diff --git a/src/ui/public/agg_types/__tests__/bucket_count_between.js b/src/ui/public/agg_types/__tests__/bucket_count_between.js
index 75c2a4e46fdf7..61f0828f4b14f 100644
--- a/src/ui/public/agg_types/__tests__/bucket_count_between.js
+++ b/src/ui/public/agg_types/__tests__/bucket_count_between.js
@@ -32,7 +32,7 @@ describe('bucketCountBetween util', function () {
   }));
 
   it('returns a positive number when a is before b', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         {
@@ -46,14 +46,14 @@ describe('bucketCountBetween util', function () {
       ]
     });
 
-    let a = vis.aggs.byTypeName.date_histogram[0];
-    let b = vis.aggs.byTypeName.terms[0];
-    let count = bucketCountBetween(a, b);
+    const a = vis.aggs.byTypeName.date_histogram[0];
+    const b = vis.aggs.byTypeName.terms[0];
+    const count = bucketCountBetween(a, b);
     expect(isNegative(count)).to.be(false);
   });
 
   it('returns a negative number when a is after b', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         {
@@ -67,14 +67,14 @@ describe('bucketCountBetween util', function () {
       ]
     });
 
-    let a = vis.aggs.byTypeName.terms[0];
-    let b = vis.aggs.byTypeName.date_histogram[0];
-    let count = bucketCountBetween(a, b);
+    const a = vis.aggs.byTypeName.terms[0];
+    const b = vis.aggs.byTypeName.date_histogram[0];
+    const count = bucketCountBetween(a, b);
     expect(isNegative(count)).to.be(true);
   });
 
   it('returns 0 when there are no buckets between a and b', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         {
@@ -88,13 +88,13 @@ describe('bucketCountBetween util', function () {
       ]
     });
 
-    let a = vis.aggs.byTypeName.date_histogram[0];
-    let b = vis.aggs.byTypeName.terms[0];
+    const a = vis.aggs.byTypeName.date_histogram[0];
+    const b = vis.aggs.byTypeName.terms[0];
     expect(bucketCountBetween(a, b)).to.be(0);
   });
 
   it('returns null when b is not in the aggs', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         {
@@ -104,8 +104,8 @@ describe('bucketCountBetween util', function () {
       ]
     });
 
-    let a = vis.aggs.byTypeName.date_histogram[0];
-    let b = new AggConfig(vis, {
+    const a = vis.aggs.byTypeName.date_histogram[0];
+    const b = new AggConfig(vis, {
       type: 'terms',
       schema: 'segment'
     });
@@ -114,7 +114,7 @@ describe('bucketCountBetween util', function () {
   });
 
   it('returns null when a is not in the aggs', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: [
         {
@@ -124,27 +124,27 @@ describe('bucketCountBetween util', function () {
       ]
     });
 
-    let a = new AggConfig(vis, {
+    const a = new AggConfig(vis, {
       type: 'terms',
       schema: 'segment'
     });
-    let b = vis.aggs.byTypeName.date_histogram[0];
+    const b = vis.aggs.byTypeName.date_histogram[0];
 
     expect(bucketCountBetween(a, b)).to.be(null);
   });
 
   it('returns null when a and b are not in the aggs', function () {
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       type: 'histogram',
       aggs: []
     });
 
-    let a = new AggConfig(vis, {
+    const a = new AggConfig(vis, {
       type: 'terms',
       schema: 'segment'
     });
 
-    let b = new AggConfig(vis, {
+    const b = new AggConfig(vis, {
       type: 'date_histogram',
       schema: 'segment'
     });
@@ -154,14 +154,14 @@ describe('bucketCountBetween util', function () {
 
   function countTest(pre, post) {
     return function () {
-      let schemas = visTypes.byName.histogram.schemas.buckets;
+      const schemas = visTypes.byName.histogram.schemas.buckets;
 
       // slow for this test is actually somewhere around 1/2 a sec
       this.slow(500);
 
       function randBucketAggForVis(vis) {
-        let schema = _.sample(schemas);
-        let aggType = _.sample(aggTypes.byType.buckets);
+        const schema = _.sample(schemas);
+        const aggType = _.sample(aggTypes.byType.buckets);
 
         return new AggConfig(vis, {
           schema: schema,
@@ -170,18 +170,18 @@ describe('bucketCountBetween util', function () {
       }
 
       _.times(50, function (n) {
-        let vis = new Vis(indexPattern, {
+        const vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: []
         });
 
-        let randBucketAgg = _.partial(randBucketAggForVis, vis);
+        const randBucketAgg = _.partial(randBucketAggForVis, vis);
 
-        let a = randBucketAgg();
-        let b = randBucketAgg();
+        const a = randBucketAgg();
+        const b = randBucketAgg();
 
         // create n aggs between a and b
-        let aggs = [];
+        const aggs = [];
         aggs.fill = function (n) {
           for (let i = 0; i < n; i++) {
             aggs.push(randBucketAgg());
diff --git a/src/ui/public/agg_types/__tests__/buckets/_geo_hash.js b/src/ui/public/agg_types/__tests__/buckets/_geo_hash.js
index c4b2650cd6219..b296b67929341 100644
--- a/src/ui/public/agg_types/__tests__/buckets/_geo_hash.js
+++ b/src/ui/public/agg_types/__tests__/buckets/_geo_hash.js
@@ -6,7 +6,7 @@ describe('Geohash Agg', function () {
 
   describe('write', function () {
 
-    let paramWriter = new AggTypesBucketsGeoHashProvider(function PrivateMock() {
+    const paramWriter = new AggTypesBucketsGeoHashProvider(function PrivateMock() {
       return function BucketMock(geohashProvider) {
         return geohashProvider.params[4];
       };
@@ -45,7 +45,7 @@ describe('Geohash Agg', function () {
 
       Object.keys(zoomToGeoHashPrecision).forEach((zoomLevel) => {
         it(`zoom level ${zoomLevel} should correspond to correct geohash-precision`, () => {
-          const output = {params: {}};
+          const output = { params: {} };
           paramWriter.write({
             vis: {
               hasUiState: () => true,
diff --git a/src/ui/public/agg_types/__tests__/buckets/_histogram.js b/src/ui/public/agg_types/__tests__/buckets/_histogram.js
index cf6f8d6ac86f9..084652269f1fc 100644
--- a/src/ui/public/agg_types/__tests__/buckets/_histogram.js
+++ b/src/ui/public/agg_types/__tests__/buckets/_histogram.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import AggTypesIndexProvider from 'ui/agg_types/index';
@@ -28,7 +27,7 @@ describe('Histogram Agg', function () {
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
-      let AggParamWriter = Private(AggParamWriterProvider);
+      const AggParamWriter = Private(AggParamWriterProvider);
       paramWriter = new AggParamWriter({ aggType: 'histogram' });
     }));
 
@@ -36,28 +35,28 @@ describe('Histogram Agg', function () {
       // reads aggConfig.params.interval, writes to dsl.interval
 
       it('accepts a whole number', function () {
-        let output = paramWriter.write({ interval: 100 });
+        const output = paramWriter.write({ interval: 100 });
         expect(output.params).to.have.property('interval', 100);
       });
 
       it('accepts a decimal number', function () {
-        let output = paramWriter.write({ interval: 0.1 });
+        const output = paramWriter.write({ interval: 0.1 });
         expect(output.params).to.have.property('interval', 0.1);
       });
 
       it('accepts a decimal number string', function () {
-        let output = paramWriter.write({ interval: '0.1' });
+        const output = paramWriter.write({ interval: '0.1' });
         expect(output.params).to.have.property('interval', 0.1);
       });
 
       it('accepts a whole number string', function () {
-        let output = paramWriter.write({ interval: '10' });
+        const output = paramWriter.write({ interval: '10' });
         expect(output.params).to.have.property('interval', 10);
       });
 
       it('fails on non-numeric values', function () {
         // template validation prevents this from users, not devs
-        let output = paramWriter.write({ interval: [] });
+        const output = paramWriter.write({ interval: [] });
         expect(isNaN(output.params.interval)).to.be.ok();
       });
     });
@@ -91,7 +90,7 @@ describe('Histogram Agg', function () {
 
     describe('extended_bounds', function () {
       it('writes when only eb.min is set', function () {
-        let output = paramWriter.write({
+        const output = paramWriter.write({
           min_doc_count: true,
           extended_bounds: { min: 0 }
         });
@@ -100,7 +99,7 @@ describe('Histogram Agg', function () {
       });
 
       it('writes when only eb.max is set', function () {
-        let output = paramWriter.write({
+        const output = paramWriter.write({
           min_doc_count: true,
           extended_bounds: { max: 0 }
         });
@@ -109,7 +108,7 @@ describe('Histogram Agg', function () {
       });
 
       it('writes when both eb.min and eb.max are set', function () {
-        let output = paramWriter.write({
+        const output = paramWriter.write({
           min_doc_count: true,
           extended_bounds: { min: 99, max: 100 }
         });
@@ -118,7 +117,7 @@ describe('Histogram Agg', function () {
       });
 
       it('does not write when nothing is set', function () {
-        let output = paramWriter.write({
+        const output = paramWriter.write({
           min_doc_count: true,
           extended_bounds: {}
         });
@@ -126,7 +125,7 @@ describe('Histogram Agg', function () {
       });
 
       it('does not write when min_doc_count is false', function () {
-        let output = paramWriter.write({
+        const output = paramWriter.write({
           min_doc_count: false,
           extended_bounds: { min: 99, max: 100 }
         });
diff --git a/src/ui/public/agg_types/__tests__/buckets/_range.js b/src/ui/public/agg_types/__tests__/buckets/_range.js
index a25c447bdd38f..1a9de3c62a20b 100644
--- a/src/ui/public/agg_types/__tests__/buckets/_range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/_range.js
@@ -1,27 +1,22 @@
 import { values } from 'lodash';
-import _ from 'lodash';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
 import resp from 'fixtures/agg_resp/range';
-import AggTypesIndexProvider from 'ui/agg_types/index';
 import VisProvider from 'ui/vis';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 describe('Range Agg', function () {
+  const buckets = values(resp.aggregations[1].buckets);
 
-  let buckets = values(resp.aggregations[1].buckets);
-
-  let range;
   let Vis;
   let indexPattern;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    range = Private(AggTypesIndexProvider).byName.range;
     Vis = Private(VisProvider);
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
 
-    let BytesFormat = Private(RegistryFieldFormatsProvider).byId.bytes;
+    const BytesFormat = Private(RegistryFieldFormatsProvider).byId.bytes;
 
     indexPattern.fieldFormatMap.bytes = new BytesFormat({
       pattern: '0,0.[000] b'
@@ -32,7 +27,7 @@ describe('Range Agg', function () {
 
   describe('formating', function () {
     it('formats bucket keys properly', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -49,8 +44,8 @@ describe('Range Agg', function () {
         ]
       });
 
-      let agg = vis.aggs.byTypeName.range[0];
-      let format = function (val) {
+      const agg = vis.aggs.byTypeName.range[0];
+      const format = function (val) {
         return agg.fieldFormatter()(agg.getKey(val));
       };
       expect(format(buckets[0])).to.be('-∞ to 1 KB');
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
index 76daadfe70b4b..d07c13572dc1c 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
@@ -1,34 +1,29 @@
 import _ from 'lodash';
 import moment from 'moment';
-import sinon from 'auto-release-sinon';
 import aggResp from 'fixtures/agg_resp/date_histogram';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
 import VisProvider from 'ui/vis';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import AggTypesBucketsCreateFilterDateHistogramProvider from 'ui/agg_types/buckets/create_filter/date_histogram';
-import TimeBucketsProvider from 'ui/time_buckets';
 import AggTypesBucketsIntervalOptionsProvider from 'ui/agg_types/buckets/_interval_options';
 describe('AggConfig Filters', function () {
   describe('date_histogram', function () {
-
     let vis;
     let agg;
     let field;
     let filter;
     let bucketKey;
     let bucketStart;
-    let getIntervalStub;
     let intervalOptions;
 
     let init;
 
     beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private, $injector) {
-      let Vis = Private(VisProvider);
-      let indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-      let createFilter = Private(AggTypesBucketsCreateFilterDateHistogramProvider);
-      let TimeBuckets = Private(TimeBucketsProvider);
+    beforeEach(ngMock.inject(function (Private) {
+      const Vis = Private(VisProvider);
+      const indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
+      const createFilter = Private(AggTypesBucketsCreateFilterDateHistogramProvider);
       intervalOptions = Private(AggTypesBucketsIntervalOptionsProvider);
 
       init = function (interval, duration) {
@@ -51,7 +46,7 @@ describe('AggConfig Filters', function () {
         bucketKey = _.sample(aggResp.aggregations['1'].buckets).key;
         bucketStart = moment(bucketKey);
 
-        let timePad = moment.duration(duration / 2);
+        const timePad = moment.duration(duration / 2);
         agg.buckets.setBounds({
           min: bucketStart.clone().subtract(timePad),
           max: bucketStart.clone().add(timePad),
@@ -68,7 +63,7 @@ describe('AggConfig Filters', function () {
       expect(filter).to.have.property('range');
       expect(filter.range).to.have.property(field.name);
 
-      let fieldParams = filter.range[field.name];
+      const fieldParams = filter.range[field.name];
       expect(fieldParams).to.have.property('gte');
       expect(fieldParams.gte).to.be.a('number');
 
@@ -98,8 +93,8 @@ describe('AggConfig Filters', function () {
 
         init(option.val, duration);
 
-        let interval = agg.buckets.getInterval();
-        let params = filter.range[field.name];
+        const interval = agg.buckets.getInterval();
+        const params = filter.range[field.name];
 
         expect(params.gte).to.be(+bucketStart);
         expect(params.lt).to.be(+bucketStart.clone().add(interval));
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
index 117852228b6cc..98de9d47a2c72 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
@@ -1,15 +1,12 @@
 
-import moment from 'moment';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import VisProvider from 'ui/vis';
-import VisAggConfigProvider from 'ui/vis/agg_config';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import AggTypesBucketsCreateFilterDateRangeProvider from 'ui/agg_types/buckets/create_filter/date_range';
 
 describe('AggConfig Filters', function () {
   describe('Date range', function () {
-    let AggConfig;
     let indexPattern;
     let Vis;
     let createFilter;
@@ -17,13 +14,12 @@ describe('AggConfig Filters', function () {
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       Vis = Private(VisProvider);
-      AggConfig = Private(VisAggConfigProvider);
       indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
       createFilter = Private(AggTypesBucketsCreateFilterDateRangeProvider);
     }));
 
     it('should return a range filter for date_range agg', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -38,8 +34,8 @@ describe('AggConfig Filters', function () {
         ]
       });
 
-      let aggConfig = vis.aggs.byTypeName.date_range[0];
-      let filter = createFilter(aggConfig, 'February 1st, 2015 to February 7th, 2015');
+      const aggConfig = vis.aggs.byTypeName.date_range[0];
+      const filter = createFilter(aggConfig, 'February 1st, 2015 to February 7th, 2015');
       expect(filter).to.have.property('range');
       expect(filter).to.have.property('meta');
       expect(filter.meta).to.have.property('index', indexPattern.id);
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
index 43069575965af..19a7addd79b14 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
@@ -3,13 +3,11 @@ import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import VisProvider from 'ui/vis';
-import VisAggConfigProvider from 'ui/vis/agg_config';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import AggTypesBucketsCreateFilterFiltersProvider from 'ui/agg_types/buckets/create_filter/filters';
 
 describe('AggConfig Filters', function () {
   describe('filters', function () {
-    let AggConfig;
     let indexPattern;
     let Vis;
     let createFilter;
@@ -17,13 +15,12 @@ describe('AggConfig Filters', function () {
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       Vis = Private(VisProvider);
-      AggConfig = Private(VisAggConfigProvider);
       indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
       createFilter = Private(AggTypesBucketsCreateFilterFiltersProvider);
     }));
 
     it('should return a filters filter', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -39,12 +36,11 @@ describe('AggConfig Filters', function () {
         ]
       });
 
-      let aggConfig = vis.aggs.byTypeName.filters[0];
-      let filter = createFilter(aggConfig, '_type:nginx');
+      const aggConfig = vis.aggs.byTypeName.filters[0];
+      const filter = createFilter(aggConfig, '_type:nginx');
       expect(_.omit(filter, 'meta')).to.eql(aggConfig.params.filters[1].input);
       expect(filter.meta).to.have.property('index', indexPattern.id);
 
     });
-
   });
 });
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
index 702cd0ea746b7..3e9252480ea41 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
@@ -1,15 +1,12 @@
 
-import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import VisProvider from 'ui/vis';
-import VisAggConfigProvider from 'ui/vis/agg_config';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import AggTypesBucketsCreateFilterHistogramProvider from 'ui/agg_types/buckets/create_filter/histogram';
 
 describe('AggConfig Filters', function () {
   describe('histogram', function () {
-    let AggConfig;
     let indexPattern;
     let Vis;
     let createFilter;
@@ -17,13 +14,12 @@ describe('AggConfig Filters', function () {
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       Vis = Private(VisProvider);
-      AggConfig = Private(VisAggConfigProvider);
       indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
       createFilter = Private(AggTypesBucketsCreateFilterHistogramProvider);
     }));
 
     it('should return an range filter for histogram', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -34,8 +30,8 @@ describe('AggConfig Filters', function () {
         ]
       });
 
-      let aggConfig = vis.aggs.byTypeName.histogram[0];
-      let filter = createFilter(aggConfig, 2048);
+      const aggConfig = vis.aggs.byTypeName.histogram[0];
+      const filter = createFilter(aggConfig, 2048);
       expect(filter).to.have.property('meta');
       expect(filter.meta).to.have.property('index', indexPattern.id);
       expect(filter).to.have.property('range');
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
index 2fb5708d57c9a..31a2dc9fdab07 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
@@ -1,13 +1,11 @@
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import VisProvider from 'ui/vis';
-import VisAggConfigProvider from 'ui/vis/agg_config';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import AggTypesBucketsCreateFilterIpRangeProvider from 'ui/agg_types/buckets/create_filter/ip_range';
 describe('AggConfig Filters', function () {
 
   describe('IP range', function () {
-    let AggConfig;
     let indexPattern;
     let Vis;
     let createFilter;
@@ -15,13 +13,12 @@ describe('AggConfig Filters', function () {
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       Vis = Private(VisProvider);
-      AggConfig = Private(VisAggConfigProvider);
       indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
       createFilter = Private(AggTypesBucketsCreateFilterIpRangeProvider);
     }));
 
     it('should return a range filter for ip_range agg', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -40,8 +37,8 @@ describe('AggConfig Filters', function () {
         ]
       });
 
-      let aggConfig = vis.aggs.byTypeName.ip_range[0];
-      let filter = createFilter(aggConfig, '0.0.0.0 to 1.1.1.1');
+      const aggConfig = vis.aggs.byTypeName.ip_range[0];
+      const filter = createFilter(aggConfig, '0.0.0.0 to 1.1.1.1');
       expect(filter).to.have.property('range');
       expect(filter).to.have.property('meta');
       expect(filter.meta).to.have.property('index', indexPattern.id);
@@ -51,7 +48,7 @@ describe('AggConfig Filters', function () {
     });
 
     it('should return a range filter for ip_range agg using a CIDR mask', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -70,8 +67,8 @@ describe('AggConfig Filters', function () {
         ]
       });
 
-      let aggConfig = vis.aggs.byTypeName.ip_range[0];
-      let filter = createFilter(aggConfig, '67.129.65.201/27');
+      const aggConfig = vis.aggs.byTypeName.ip_range[0];
+      const filter = createFilter(aggConfig, '67.129.65.201/27');
       expect(filter).to.have.property('range');
       expect(filter).to.have.property('meta');
       expect(filter.meta).to.have.property('index', indexPattern.id);
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
index b6ccd71d38cd5..ad02e6f933f9f 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
@@ -1,13 +1,11 @@
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import VisProvider from 'ui/vis';
-import VisAggConfigProvider from 'ui/vis/agg_config';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import AggTypesBucketsCreateFilterRangeProvider from 'ui/agg_types/buckets/create_filter/range';
 describe('AggConfig Filters', function () {
 
   describe('range', function () {
-    let AggConfig;
     let indexPattern;
     let Vis;
     let createFilter;
@@ -15,13 +13,12 @@ describe('AggConfig Filters', function () {
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       Vis = Private(VisProvider);
-      AggConfig = Private(VisAggConfigProvider);
       indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
       createFilter = Private(AggTypesBucketsCreateFilterRangeProvider);
     }));
 
     it('should return a range filter for range agg', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -37,8 +34,8 @@ describe('AggConfig Filters', function () {
         ]
       });
 
-      let aggConfig = vis.aggs.byTypeName.range[0];
-      let filter = createFilter(aggConfig, { gte: 1024, lt: 2048.0 });
+      const aggConfig = vis.aggs.byTypeName.range[0];
+      const filter = createFilter(aggConfig, { gte: 1024, lt: 2048.0 });
       expect(filter).to.have.property('range');
       expect(filter).to.have.property('meta');
       expect(filter.meta).to.have.property('index', indexPattern.id);
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
index c0a67aa283655..dc835b7e7abc6 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
@@ -1,13 +1,11 @@
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import VisProvider from 'ui/vis';
-import VisAggConfigProvider from 'ui/vis/agg_config';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import AggTypesBucketsCreateFilterTermsProvider from 'ui/agg_types/buckets/create_filter/terms';
 describe('AggConfig Filters', function () {
 
   describe('terms', function () {
-    let AggConfig;
     let indexPattern;
     let Vis;
     let createFilter;
@@ -15,18 +13,17 @@ describe('AggConfig Filters', function () {
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
       Vis = Private(VisProvider);
-      AggConfig = Private(VisAggConfigProvider);
       indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
       createFilter = Private(AggTypesBucketsCreateFilterTermsProvider);
     }));
 
     it('should return a match filter for terms', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
       });
-      let aggConfig = vis.aggs.byTypeName.terms[0];
-      let filter = createFilter(aggConfig, 'apache');
+      const aggConfig = vis.aggs.byTypeName.terms[0];
+      const filter = createFilter(aggConfig, 'apache');
       expect(filter).to.have.property('query');
       expect(filter.query).to.have.property('match');
       expect(filter.query.match).to.have.property('_type');
@@ -36,6 +33,5 @@ describe('AggConfig Filters', function () {
       expect(filter.meta).to.have.property('index', indexPattern.id);
 
     });
-
   });
 });
diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
index 6d2e4834418eb..62bc7944e747b 100644
--- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
+++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
@@ -17,7 +17,7 @@ describe('editor', function () {
   beforeEach(ngMock.inject(function (Private, $injector, $compile) {
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
 
-    let Vis = Private(VisProvider);
+    const Vis = Private(VisProvider);
 
     /**
      * Render the AggParams editor for the date histogram aggregation
@@ -38,8 +38,8 @@ describe('editor', function () {
         ]
       });
 
-      let $el = $('<vis-editor-agg-params agg="agg" group-name="groupName"></vis-editor-agg-params>');
-      let $parentScope = $injector.get('$rootScope').$new();
+      const $el = $('<vis-editor-agg-params agg="agg" group-name="groupName"></vis-editor-agg-params>');
+      const $parentScope = $injector.get('$rootScope').$new();
 
       agg = $parentScope.agg = vis.aggs.bySchemaName.segment[0];
       $parentScope.groupName = 'buckets';
@@ -48,10 +48,10 @@ describe('editor', function () {
       $scope = $el.scope();
       $scope.$digest();
 
-      let $inputs = $('vis-agg-param-editor', $el);
+      const $inputs = $('vis-agg-param-editor', $el);
       return _.transform($inputs.toArray(), function (inputs, e) {
-        let $el = $(e);
-        let $scope = $el.scope();
+        const $el = $(e);
+        const $scope = $el.scope();
 
         inputs[$scope.aggParam.name] = {
           $el: $el,
@@ -107,7 +107,7 @@ describe('editor', function () {
       expect(params.interval.modelValue().val).to.be('auto');
       expect(params.field.modelValue().name).to.be(indexPattern.timeFieldName);
 
-      let field = _.find(indexPattern.fields, function (f) {
+      const field = _.find(indexPattern.fields, function (f) {
         return f.type === 'date' && f.name !== indexPattern.timeFieldName;
       });
 
diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
index 4e6c6870f2574..5a0c06d6811b3 100644
--- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
+++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
@@ -18,9 +18,9 @@ describe('params', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
-    let AggParamWriter = Private(AggParamWriterProvider);
-    let indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-    let timefilter = $injector.get('timefilter');
+    const AggParamWriter = Private(AggParamWriterProvider);
+    const indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
+    const timefilter = $injector.get('timefilter');
 
     timeField = indexPattern.timeFieldName;
     aggTypes = Private(AggTypesIndexProvider);
@@ -31,7 +31,7 @@ describe('params', function () {
       return paramWriter.write({ interval: interval, field: timeField });
     };
 
-    let now = moment();
+    const now = moment();
     setTimeBounds = function (n, units) {
       timefilter.enabled = true;
       timefilter.getBounds = _.constant({
@@ -43,24 +43,24 @@ describe('params', function () {
 
   describe('interval', function () {
     it('accepts a valid interval', function () {
-      let output = writeInterval('d');
+      const output = writeInterval('d');
       expect(output.params).to.have.property('interval', '1d');
     });
 
     it('ignores invalid intervals', function () {
-      let output = writeInterval('foo');
+      const output = writeInterval('foo');
       expect(output.params).to.have.property('interval', '0ms');
     });
 
     it('automatically picks an interval', function () {
       setTimeBounds(15, 'm');
-      let output = writeInterval('auto');
+      const output = writeInterval('auto');
       expect(output.params.interval).to.be('30s');
     });
 
     it('scales up the interval if it will make too many buckets', function () {
       setTimeBounds(30, 'm');
-      let output = writeInterval('s');
+      const output = writeInterval('s');
       expect(output.params.interval).to.be('10s');
       expect(output.metricScaleText).to.be('second');
       expect(output.metricScale).to.be(0.1);
@@ -68,30 +68,30 @@ describe('params', function () {
 
     it('does not scale down the interval', function () {
       setTimeBounds(1, 'm');
-      let output = writeInterval('h');
+      const output = writeInterval('h');
       expect(output.params.interval).to.be('1h');
       expect(output.metricScaleText).to.be(undefined);
       expect(output.metricScale).to.be(undefined);
     });
 
     describe('only scales when all metrics are sum or count', function () {
-      let tests = [
+      const tests = [
         [ false, 'avg', 'count', 'sum' ],
         [ true, 'count', 'sum' ],
         [ false, 'count', 'cardinality' ]
       ];
 
       tests.forEach(function (test) {
-        let should = test.shift();
-        let typeNames = test.slice();
+        const should = test.shift();
+        const typeNames = test.slice();
 
         it(typeNames.join(', ') + ' should ' + (should ? '' : 'not') + ' scale', function () {
           setTimeBounds(1, 'y');
 
-          let vis = paramWriter.vis;
+          const vis = paramWriter.vis;
           vis.aggs.splice(0);
 
-          let histoConfig = new AggConfig(vis, {
+          const histoConfig = new AggConfig(vis, {
             type: aggTypes.byName.date_histogram,
             schema: 'segment',
             params: { interval: 's', field: timeField }
@@ -106,7 +106,7 @@ describe('params', function () {
             }));
           });
 
-          let output = histoConfig.write();
+          const output = histoConfig.write();
           expect(_.has(output, 'metricScale')).to.be(should);
         });
       });
@@ -115,9 +115,9 @@ describe('params', function () {
 
   describe('extended_bounds', function () {
     it('should write a long value if a moment passed in', function () {
-      let then = moment(0);
-      let now = moment(500);
-      let output = paramWriter.write({
+      const then = moment(0);
+      const now = moment(500);
+      const output = paramWriter.write({
         extended_bounds: {
           min: then,
           max: now
@@ -133,9 +133,9 @@ describe('params', function () {
     });
 
     it('should write a long if a long is passed', function () {
-      let then = 0;
-      let now = 500;
-      let output = paramWriter.write({
+      const then = 0;
+      const now = 500;
+      const output = paramWriter.write({
         extended_bounds: {
           min: then,
           max: now
diff --git a/src/ui/public/agg_types/__tests__/controls/number_list.js b/src/ui/public/agg_types/__tests__/controls/number_list.js
index 3c7204b0682b8..1259b9e82445c 100644
--- a/src/ui/public/agg_types/__tests__/controls/number_list.js
+++ b/src/ui/public/agg_types/__tests__/controls/number_list.js
@@ -1,5 +1,4 @@
 import $ from 'jquery';
-import _ from 'lodash';
 import expect from 'expect.js';
 import simulateKeys from 'test_utils/simulate_keys';
 import ngMock from 'ng_mock';
@@ -13,15 +12,15 @@ describe('NumberList directive', function () {
 
   function onlyValidValues() {
     return $el.find('[ng-model]').toArray().map(function (el) {
-      let ngModel = $(el).controller('ngModel');
+      const ngModel = $(el).controller('ngModel');
       return ngModel.$valid ? ngModel.$modelValue : undefined;
     });
   }
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector) {
-    let $compile = $injector.get('$compile');
-    let $rootScope = $injector.get('$rootScope');
+    const $compile = $injector.get('$compile');
+    const $rootScope = $injector.get('$rootScope');
 
     $scope = $rootScope.$new();
     $el = $('<kbn-number-list ng-model="vals">');
@@ -75,7 +74,7 @@ describe('NumberList directive', function () {
     it('shift-up increases by 0.1', function () {
       compile([4.8]);
 
-      let seq = [
+      const seq = [
         {
           type: 'press',
           key: 'shift',
@@ -111,7 +110,7 @@ describe('NumberList directive', function () {
     it('shift-down decreases by 0.1', function () {
       compile([5.1]);
 
-      let seq = [
+      const seq = [
         {
           type: 'press',
           key: 'shift',
@@ -135,12 +134,12 @@ describe('NumberList directive', function () {
     it('maintains valid number', function () {
       compile([9, 11, 13]);
 
-      let seq = [
+      const seq = [
         'down', // 10 (11 - 1)
         'down'  // 10 (limited by 9)
       ];
 
-      let getEl = function () { return $el.find('input').eq(1); };
+      const getEl = function () { return $el.find('input').eq(1); };
 
       return simulateKeys(getEl, seq)
       .then(function () {
diff --git a/src/ui/public/agg_types/__tests__/metrics/median.js b/src/ui/public/agg_types/__tests__/metrics/median.js
index 3524031c62029..19829480e58ed 100644
--- a/src/ui/public/agg_types/__tests__/metrics/median.js
+++ b/src/ui/public/agg_types/__tests__/metrics/median.js
@@ -1,23 +1,18 @@
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import AggTypeMetricMedianProvider from 'ui/agg_types/metrics/median';
 import VisProvider from 'ui/vis';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 describe('AggTypeMetricMedianProvider class', function () {
-
-  let vis;
   let indexPattern;
-  let aggTypeMetricMedian;
   let aggDsl;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     const Vis = Private(VisProvider);
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
-    aggTypeMetricMedian = Private(AggTypeMetricMedianProvider);
 
-    let vis = new Vis(indexPattern, {
+    const vis = new Vis(indexPattern, {
       'title': 'New Visualization',
       'type': 'metric',
       'params': {
@@ -42,7 +37,7 @@ describe('AggTypeMetricMedianProvider class', function () {
 
     // Grab the aggConfig off the vis (we don't actually use the vis for
     // anything else)
-    let aggConfig = vis.aggs[0];
+    const aggConfig = vis.aggs[0];
     aggDsl = aggConfig.toDsl();
   }));
 
@@ -57,5 +52,4 @@ describe('AggTypeMetricMedianProvider class', function () {
   it ('asks Elasticsearch for array-based values in the aggregation response', function () {
     expect(aggDsl.percentiles.keyed).to.be(false);
   });
-
 });
diff --git a/src/ui/public/agg_types/__tests__/metrics/std_deviation.js b/src/ui/public/agg_types/__tests__/metrics/std_deviation.js
index 90666b65e5dbd..1433ed793ccaa 100644
--- a/src/ui/public/agg_types/__tests__/metrics/std_deviation.js
+++ b/src/ui/public/agg_types/__tests__/metrics/std_deviation.js
@@ -18,37 +18,37 @@ describe('AggTypeMetricStandardDeviationProvider class', function () {
   }));
 
   it('uses the custom label if it is set', function () {
-    let vis = new Vis(indexPattern, {});
+    const vis = new Vis(indexPattern, {});
 
     // Grab the aggConfig off the vis (we don't actually use the vis for
     // anything else)
-    let aggConfig = vis.aggs[0];
+    const aggConfig = vis.aggs[0];
     aggConfig.params.customLabel = 'custom label';
     aggConfig.params.field = {
       displayName: 'memory'
     };
 
-    let responseAggs = aggTypeMetricStandardDeviation.getResponseAggs(aggConfig);
-    let lowerStdDevLabel = responseAggs[0].makeLabel();
-    let upperStdDevLabel = responseAggs[1].makeLabel();
+    const responseAggs = aggTypeMetricStandardDeviation.getResponseAggs(aggConfig);
+    const lowerStdDevLabel = responseAggs[0].makeLabel();
+    const upperStdDevLabel = responseAggs[1].makeLabel();
 
     expect(lowerStdDevLabel).to.be('Lower custom label');
     expect(upperStdDevLabel).to.be('Upper custom label');
   });
 
   it('uses the default labels if custom label is not set', function () {
-    let vis = new Vis(indexPattern, {});
+    const vis = new Vis(indexPattern, {});
 
     // Grab the aggConfig off the vis (we don't actually use the vis for
     // anything else)
-    let aggConfig = vis.aggs[0];
+    const aggConfig = vis.aggs[0];
     aggConfig.params.field = {
       displayName: 'memory'
     };
 
-    let responseAggs = aggTypeMetricStandardDeviation.getResponseAggs(aggConfig);
-    let lowerStdDevLabel = responseAggs[0].makeLabel();
-    let upperStdDevLabel = responseAggs[1].makeLabel();
+    const responseAggs = aggTypeMetricStandardDeviation.getResponseAggs(aggConfig);
+    const lowerStdDevLabel = responseAggs[0].makeLabel();
+    const upperStdDevLabel = responseAggs[1].makeLabel();
 
     expect(lowerStdDevLabel).to.be('Lower Standard Deviation of memory');
     expect(upperStdDevLabel).to.be('Upper Standard Deviation of memory');
diff --git a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
index 47455e418a38a..a464c7d8dd173 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
@@ -2,34 +2,30 @@ import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import VisProvider from 'ui/vis';
-import VisAggConfigProvider from 'ui/vis/agg_config';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import AggTypesParamTypesCalculateIntervalProvider from 'ui/agg_types/param_types/_calculate_interval';
 
 describe('calculateInterval()', function () {
-  let AggConfig;
   let indexPattern;
   let Vis;
-  let createFilter;
   let calculateInterval;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     Vis = Private(VisProvider);
-    AggConfig = Private(VisAggConfigProvider);
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
     calculateInterval = Private(AggTypesParamTypesCalculateIntervalProvider);
   }));
 
-  let testInterval = function (option, expected) {
-    let msg = 'should return ' + JSON.stringify(expected) + ' for ' + option;
+  const testInterval = function (option, expected) {
+    const msg = 'should return ' + JSON.stringify(expected) + ' for ' + option;
     it(msg, function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [ { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp', interval: option } } ]
       });
-      let aggConfig = vis.aggs.byTypeName.date_histogram[0];
-      let interval = calculateInterval(aggConfig);
+      const aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      const interval = calculateInterval(aggConfig);
       _.each(expected, function (val, key) {
         expect(interval).to.have.property(key, val);
       });
@@ -84,5 +80,4 @@ describe('calculateInterval()', function () {
     metricScale: 1,
     description: 'year'
   });
-
 });
diff --git a/src/ui/public/agg_types/__tests__/param_types/_field.js b/src/ui/public/agg_types/__tests__/param_types/_field.js
index cc2679fc0d4b8..a09318118c380 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_field.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_field.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
@@ -17,7 +16,7 @@ describe('Field', function () {
 
   describe('constructor', function () {
     it('it is an instance of BaseAggParam', function () {
-      let aggParam = new FieldAggParam({
+      const aggParam = new FieldAggParam({
         name: 'field'
       });
 
diff --git a/src/ui/public/agg_types/__tests__/param_types/_optioned.js b/src/ui/public/agg_types/__tests__/param_types/_optioned.js
index 69165309fb12d..5eaf02457529e 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_optioned.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_optioned.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
@@ -17,7 +16,7 @@ describe('Optioned', function () {
 
   describe('constructor', function () {
     it('it is an instance of BaseAggParam', function () {
-      let aggParam = new OptionedAggParam({
+      const aggParam = new OptionedAggParam({
         name: 'some_param',
         type: 'optioned'
       });
diff --git a/src/ui/public/agg_types/__tests__/param_types/_raw_json.js b/src/ui/public/agg_types/__tests__/param_types/_raw_json.js
index 86c69ee620dad..53bfd8b8a5a8f 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_raw_json.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_raw_json.js
@@ -6,7 +6,7 @@ import AggTypesParamTypesRawJsonProvider from 'ui/agg_types/param_types/raw_json
 
 
 module.exports = describe('JSON', function () {
-  let paramName = 'json_test';
+  const paramName = 'json_test';
   let BaseAggParam;
   let JsonAggParam;
   let aggParam;
@@ -15,7 +15,7 @@ module.exports = describe('JSON', function () {
 
   function initAggParam(config) {
     config = config || {};
-    let defaults = {
+    const defaults = {
       name: paramName,
       type: 'json'
     };
@@ -59,7 +59,7 @@ module.exports = describe('JSON', function () {
     });
 
     it('should append param when valid JSON', function () {
-      let jsonData = JSON.stringify({
+      const jsonData = JSON.stringify({
         new_param: 'should exist in output'
       });
 
@@ -75,7 +75,7 @@ module.exports = describe('JSON', function () {
     });
 
     it('should not overwrite existing params', function () {
-      let jsonData = JSON.stringify({
+      const jsonData = JSON.stringify({
         new_param: 'should exist in output',
         existing: 'should be used'
       });
@@ -88,7 +88,7 @@ module.exports = describe('JSON', function () {
     });
 
     it('should drop nulled params', function () {
-      let jsonData = JSON.stringify({
+      const jsonData = JSON.stringify({
         new_param: 'should exist in output',
         field: null
       });
diff --git a/src/ui/public/agg_types/__tests__/param_types/_regex.js b/src/ui/public/agg_types/__tests__/param_types/_regex.js
index a29c7b7d812e3..900afbb83abc5 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_regex.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_regex.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
@@ -23,7 +22,7 @@ describe('Regex', function () {
 
   describe('constructor', function () {
     it('should be an instance of BaseAggParam', function () {
-      let aggParam = new RegexAggParam({
+      const aggParam = new RegexAggParam({
         name: 'some_param',
         type: 'regex'
       });
@@ -36,14 +35,14 @@ describe('Regex', function () {
   describe('write results', function () {
     let aggParam;
     let aggConfig;
-    let output = { params: {} };
-    let paramName = 'exclude';
+    const output = { params: {} };
+    const paramName = 'exclude';
 
     beforeEach(function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'pie',
         aggs: [
-          { type: 'terms', schema: 'split', params: { field: 'extension' }},
+          { type: 'terms', schema: 'split', params: { field: 'extension' } },
         ]
       });
       aggConfig = vis.aggs[0];
diff --git a/src/ui/public/agg_types/__tests__/param_types/_string.js b/src/ui/public/agg_types/__tests__/param_types/_string.js
index fde04e53a2742..01de3883c115c 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_string.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_string.js
@@ -5,7 +5,7 @@ import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
 import AggTypesParamTypesStringProvider from 'ui/agg_types/param_types/string';
 
 module.exports = describe('String', function () {
-  let paramName = 'json_test';
+  const paramName = 'json_test';
   let BaseAggParam;
   let StringAggParam;
   let aggParam;
@@ -14,7 +14,7 @@ module.exports = describe('String', function () {
 
   function initAggParam(config) {
     config = config || {};
-    let defaults = {
+    const defaults = {
       name: paramName,
       type: 'string'
     };
@@ -42,8 +42,8 @@ module.exports = describe('String', function () {
 
   describe('write', function () {
     it('should append param by name', function () {
-      let paramName = 'testing';
-      let params = {};
+      const paramName = 'testing';
+      const params = {};
       params[paramName] = 'some input';
 
       initAggParam({ name: paramName });
@@ -55,8 +55,8 @@ module.exports = describe('String', function () {
     });
 
     it('should not be in output with empty input', function () {
-      let paramName = 'more_testing';
-      let params = {};
+      const paramName = 'more_testing';
+      const params = {};
       params[paramName] = '';
 
       initAggParam({ name: paramName });
diff --git a/src/ui/public/agg_types/__tests__/utils/_stub_agg_params.js b/src/ui/public/agg_types/__tests__/utils/_stub_agg_params.js
index c12ced529cf5f..8fdab2c7c66ad 100644
--- a/src/ui/public/agg_types/__tests__/utils/_stub_agg_params.js
+++ b/src/ui/public/agg_types/__tests__/utils/_stub_agg_params.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import sinon from 'auto-release-sinon';
 
 function ParamClassStub(parent, body) {
-  let stub = sinon.spy(body || function () {
+  const stub = sinon.spy(body || function () {
     stub.Super && stub.Super.call(this);
   });
   if (parent) _.class(stub).inherits(parent);
@@ -24,7 +24,7 @@ function ParamClassStub(parent, body) {
  * @return {undefined}
  */
 module.exports = function stubParamClasses(Private) {
-  let BaseAggParam = Private.stub(
+  const BaseAggParam = Private.stub(
     require('ui/agg_types/param_types/base'),
     new ParamClassStub(null, function (config) {
       _.assign(this, config);
diff --git a/src/ui/public/agg_types/agg_params.js b/src/ui/public/agg_types/agg_params.js
index d6c435c214b4c..251a0e9d64e5b 100644
--- a/src/ui/public/agg_types/agg_params.js
+++ b/src/ui/public/agg_types/agg_params.js
@@ -10,7 +10,7 @@ import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
 export default function AggParamsFactory(Private) {
 
 
-  let paramTypeMap = {
+  const paramTypeMap = {
     field: Private(AggTypesParamTypesFieldProvider),
     optioned: Private(AggTypesParamTypesOptionedProvider),
     regex: Private(AggTypesParamTypesRegexProvider),
@@ -37,8 +37,8 @@ export default function AggParamsFactory(Private) {
     AggParams.Super.call(this, {
       index: ['name'],
       initialSet: params.map(function (config) {
-        let type = config.name === 'field' ? config.name : config.type;
-        let Class = paramTypeMap[type] || paramTypeMap._default;
+        const type = config.name === 'field' ? config.name : config.type;
+        const Class = paramTypeMap[type] || paramTypeMap._default;
         return new Class(config);
       })
     });
@@ -59,7 +59,7 @@ export default function AggParamsFactory(Private) {
    *         are dependent on the AggParam#write methods which should be studied for each AggType.
    */
   AggParams.prototype.write = function (aggConfig, locals) {
-    let output = { params: {} };
+    const output = { params: {} };
     locals = locals || {};
 
     this.forEach(function (param) {
@@ -74,4 +74,4 @@ export default function AggParamsFactory(Private) {
   };
 
   return AggParams;
-};
+}
diff --git a/src/ui/public/agg_types/agg_type.js b/src/ui/public/agg_types/agg_type.js
index f73b15cac7acc..53e3850d3dadf 100644
--- a/src/ui/public/agg_types/agg_type.js
+++ b/src/ui/public/agg_types/agg_type.js
@@ -2,8 +2,8 @@ import _ from 'lodash';
 import AggTypesAggParamsProvider from 'ui/agg_types/agg_params';
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 export default function AggTypeFactory(Private) {
-  let AggParams = Private(AggTypesAggParamsProvider);
-  let fieldFormats = Private(RegistryFieldFormatsProvider);
+  const AggParams = Private(AggTypesAggParamsProvider);
+  const fieldFormats = Private(RegistryFieldFormatsProvider);
 
   /**
    * Generic AggType Constructor
@@ -142,9 +142,9 @@ export default function AggTypeFactory(Private) {
    * @return {FieldFromat}
    */
   AggType.prototype.getFormat = function (agg) {
-    let field = agg.getField();
+    const field = agg.getField();
     return field ? field.format : fieldFormats.getDefaultInstance('string');
   };
 
   return AggType;
-};
+}
diff --git a/src/ui/public/agg_types/buckets/_bucket_agg_type.js b/src/ui/public/agg_types/buckets/_bucket_agg_type.js
index 4249ec29be71e..9a0c137d285ae 100644
--- a/src/ui/public/agg_types/buckets/_bucket_agg_type.js
+++ b/src/ui/public/agg_types/buckets/_bucket_agg_type.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import AggTypesAggTypeProvider from 'ui/agg_types/agg_type';
 export default function BucketAggTypeProvider(Private) {
-  let AggType = Private(AggTypesAggTypeProvider);
+  const AggType = Private(AggTypesAggTypeProvider);
 
   _.class(BucketAggType).inherits(AggType);
   function BucketAggType(config) {
@@ -17,4 +17,4 @@ export default function BucketAggTypeProvider(Private) {
   };
 
   return BucketAggType;
-};
+}
diff --git a/src/ui/public/agg_types/buckets/_bucket_count_between.js b/src/ui/public/agg_types/buckets/_bucket_count_between.js
index 3fbcd3e723343..64310c08be8b7 100644
--- a/src/ui/public/agg_types/buckets/_bucket_count_between.js
+++ b/src/ui/public/agg_types/buckets/_bucket_count_between.js
@@ -13,19 +13,19 @@ export default function BucketCountBetweenProvider() {
    * @return {null|number}
    */
   function bucketCountBetween(aggConfigA, aggConfigB) {
-    let aggs = aggConfigA.vis.aggs.getRequestAggs();
+    const aggs = aggConfigA.vis.aggs.getRequestAggs();
 
-    let aIndex = aggs.indexOf(aggConfigA);
-    let bIndex = aggs.indexOf(aggConfigB);
+    const aIndex = aggs.indexOf(aggConfigA);
+    const bIndex = aggs.indexOf(aggConfigB);
 
     if (aIndex === -1 || bIndex === -1) {
       return null;
     }
 
     // return a negative distance, if b is before a
-    let negative = (aIndex > bIndex);
+    const negative = (aIndex > bIndex);
 
-    let count = aggs
+    const count = aggs
       .slice(Math.min(aIndex, bIndex), Math.max(aIndex, bIndex))
       .reduce(function (count, cfg) {
         if (cfg === aggConfigA || cfg === aggConfigB || cfg.schema.group !== 'buckets') {
@@ -39,4 +39,4 @@ export default function BucketCountBetweenProvider() {
   }
 
   return bucketCountBetween;
-};
+}
diff --git a/src/ui/public/agg_types/buckets/_interval_options.js b/src/ui/public/agg_types/buckets/_interval_options.js
index 344b7fa30b2c9..026cfedbfed55 100644
--- a/src/ui/public/agg_types/buckets/_interval_options.js
+++ b/src/ui/public/agg_types/buckets/_interval_options.js
@@ -1,10 +1,4 @@
-import moment from 'moment';
-
-export default function IntervalOptionsService(Private) {
-
-  // shorthand
-  let ms = function (type) { return moment.duration(1, type).asMilliseconds(); };
-
+export default function IntervalOptionsService() {
   return [
     {
       display: 'Auto',
@@ -52,4 +46,4 @@ export default function IntervalOptionsService(Private) {
       val: 'custom'
     }
   ];
-};
+}
diff --git a/src/ui/public/agg_types/buckets/create_filter/date_histogram.js b/src/ui/public/agg_types/buckets/create_filter/date_histogram.js
index 67b23bbf2e945..f5c41aad07d2c 100644
--- a/src/ui/public/agg_types/buckets/create_filter/date_histogram.js
+++ b/src/ui/public/agg_types/buckets/create_filter/date_histogram.js
@@ -1,10 +1,10 @@
 import moment from 'moment';
 import buildRangeFilter from 'ui/filter_manager/lib/range';
-export default function createDateHistogramFilterProvider(Private) {
+export default function createDateHistogramFilterProvider() {
 
   return function (agg, key) {
-    let start = moment(key);
-    let interval = agg.buckets.getInterval();
+    const start = moment(key);
+    const interval = agg.buckets.getInterval();
 
     return buildRangeFilter(agg.params.field, {
       gte: start.valueOf(),
@@ -13,4 +13,4 @@ export default function createDateHistogramFilterProvider(Private) {
     }, agg.vis.indexPattern);
   };
 
-};
+}
diff --git a/src/ui/public/agg_types/buckets/create_filter/date_range.js b/src/ui/public/agg_types/buckets/create_filter/date_range.js
index 89e8232b6e53e..9d86a4ffb6440 100644
--- a/src/ui/public/agg_types/buckets/create_filter/date_range.js
+++ b/src/ui/public/agg_types/buckets/create_filter/date_range.js
@@ -4,9 +4,9 @@ import buildRangeFilter from 'ui/filter_manager/lib/range';
 export default function createDateRangeFilterProvider(config) {
 
   return function (agg, key) {
-    let range = dateRange.parse(key, config.get('dateFormat'));
+    const range = dateRange.parse(key, config.get('dateFormat'));
 
-    let filter = {};
+    const filter = {};
     if (range.from) filter.gte = +range.from;
     if (range.to) filter.lt = +range.to;
     if (range.to && range.from) filter.format = 'epoch_millis';
@@ -14,4 +14,4 @@ export default function createDateRangeFilterProvider(config) {
     return buildRangeFilter(agg.params.field, filter, agg.vis.indexPattern);
   };
 
-};
+}
diff --git a/src/ui/public/agg_types/buckets/create_filter/filters.js b/src/ui/public/agg_types/buckets/create_filter/filters.js
index e9cbde979f2f8..eba4eb0d474b3 100644
--- a/src/ui/public/agg_types/buckets/create_filter/filters.js
+++ b/src/ui/public/agg_types/buckets/create_filter/filters.js
@@ -1,13 +1,13 @@
 import buildQueryFilter from 'ui/filter_manager/lib/query';
 import _ from 'lodash';
-export default function CreateFilterFiltersProvider(Private) {
+export default function CreateFilterFiltersProvider() {
   return function (aggConfig, key) {
     // have the aggConfig write agg dsl params
-    let dslFilters = _.get(aggConfig.toDsl(), 'filters.filters');
-    let filter = dslFilters[key];
+    const dslFilters = _.get(aggConfig.toDsl(), 'filters.filters');
+    const filter = dslFilters[key];
 
     if (filter) {
       return buildQueryFilter(filter.query, aggConfig.vis.indexPattern.id);
     }
   };
-};
+}
diff --git a/src/ui/public/agg_types/buckets/create_filter/histogram.js b/src/ui/public/agg_types/buckets/create_filter/histogram.js
index fd6c8c1e21c16..2db55fdd25ee8 100644
--- a/src/ui/public/agg_types/buckets/create_filter/histogram.js
+++ b/src/ui/public/agg_types/buckets/create_filter/histogram.js
@@ -1,14 +1,14 @@
 import buildRangeFilter from 'ui/filter_manager/lib/range';
 
-export default function createHistogramFilterProvider(Private) {
+export default function createHistogramFilterProvider() {
   return function (aggConfig, key) {
-    let value = parseInt(key, 10);
+    const value = parseInt(key, 10);
 
     return buildRangeFilter(
       aggConfig.params.field,
-      {gte: value, lt: value + aggConfig.params.interval},
+      { gte: value, lt: value + aggConfig.params.interval },
       aggConfig.vis.indexPattern,
       aggConfig.fieldFormatter()(key)
     );
   };
-};
+}
diff --git a/src/ui/public/agg_types/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/buckets/create_filter/ip_range.js
index 7c13fbd4faaf9..dbd632dab93fb 100644
--- a/src/ui/public/agg_types/buckets/create_filter/ip_range.js
+++ b/src/ui/public/agg_types/buckets/create_filter/ip_range.js
@@ -6,13 +6,13 @@ export default function createIpRangeFilterProvider() {
     if (aggConfig.params.ipRangeType === 'mask') {
       range = new CidrMask(key).getRange();
     } else {
-      let [from, to] = key.split(/\s+to\s+/);
+      const [from, to] = key.split(/\s+to\s+/);
       range = {
         from: from === '-Infinity' ? -Infinity : from,
         to: to === 'Infinity' ? Infinity : to
       };
     }
 
-    return buildRangeFilter(aggConfig.params.field, {gte: range.from, lte: range.to}, aggConfig.vis.indexPattern);
+    return buildRangeFilter(aggConfig.params.field, { gte: range.from, lte: range.to }, aggConfig.vis.indexPattern);
   };
-};
+}
diff --git a/src/ui/public/agg_types/buckets/create_filter/range.js b/src/ui/public/agg_types/buckets/create_filter/range.js
index a64a31dd4fe84..edd2b28abc13c 100644
--- a/src/ui/public/agg_types/buckets/create_filter/range.js
+++ b/src/ui/public/agg_types/buckets/create_filter/range.js
@@ -1,5 +1,5 @@
 import buildRangeFilter from 'ui/filter_manager/lib/range';
-export default function createRangeFilterProvider(Private) {
+export default function createRangeFilterProvider() {
   return function (aggConfig, key) {
     return buildRangeFilter(
       aggConfig.params.field,
@@ -8,4 +8,4 @@ export default function createRangeFilterProvider(Private) {
       aggConfig.fieldFormatter()(key)
     );
   };
-};
+}
diff --git a/src/ui/public/agg_types/buckets/create_filter/terms.js b/src/ui/public/agg_types/buckets/create_filter/terms.js
index c3a6774e3682e..88b13631d593e 100644
--- a/src/ui/public/agg_types/buckets/create_filter/terms.js
+++ b/src/ui/public/agg_types/buckets/create_filter/terms.js
@@ -1,6 +1,6 @@
 import buildPhraseFilter from 'ui/filter_manager/lib/phrase';
-export default function createTermsFilterProvider(Private) {
+export default function createTermsFilterProvider() {
   return function (aggConfig, key) {
     return buildPhraseFilter(aggConfig.params.field, key, aggConfig.vis.indexPattern);
   };
-};
+}
diff --git a/src/ui/public/agg_types/buckets/date_histogram.js b/src/ui/public/agg_types/buckets/date_histogram.js
index ffb54a8df9ea9..f87ecc86a3005 100644
--- a/src/ui/public/agg_types/buckets/date_histogram.js
+++ b/src/ui/public/agg_types/buckets/date_histogram.js
@@ -40,7 +40,6 @@ export default function DateHistogramAggType(timefilter, config, Private) {
     },
     makeLabel: function (agg) {
       const output = this.params.write(agg);
-      const params = output.params;
       const field = agg.getFieldDisplayName();
       return field + ' per ' + (output.metricScaleText || output.bucketInterval.description);
     },
@@ -82,7 +81,7 @@ export default function DateHistogramAggType(timefilter, config, Private) {
         name: 'interval',
         type: 'optioned',
         deserialize: function (state) {
-          const interval = _.find(intervalOptions, {val: state});
+          const interval = _.find(intervalOptions, { val: state });
           return interval || _.find(intervalOptions, function (option) {
             // For upgrading from 4.0.x to 4.1.x - intervals are now stored as 'y' instead of 'year',
             // but this maps the old values to the new values
@@ -156,4 +155,4 @@ export default function DateHistogramAggType(timefilter, config, Private) {
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/buckets/date_range.js b/src/ui/public/agg_types/buckets/date_range.js
index bd265516df7c1..497513327c6db 100644
--- a/src/ui/public/agg_types/buckets/date_range.js
+++ b/src/ui/public/agg_types/buckets/date_range.js
@@ -1,4 +1,3 @@
-import moment from 'moment';
 import dateRange from 'ui/utils/date_range';
 import 'ui/directives/validate_date_math';
 import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type';
@@ -6,10 +5,10 @@ import AggTypesBucketsCreateFilterDateRangeProvider from 'ui/agg_types/buckets/c
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 import dateRangesTemplate from 'ui/agg_types/controls/date_ranges.html';
 
-export default function DateRangeAggDefinition(Private, config) {
-  let BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
-  let createFilter = Private(AggTypesBucketsCreateFilterDateRangeProvider);
-  let fieldFormats = Private(RegistryFieldFormatsProvider);
+export default function DateRangeAggDefinition(Private) {
+  const BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
+  const createFilter = Private(AggTypesBucketsCreateFilterDateRangeProvider);
+  const fieldFormats = Private(RegistryFieldFormatsProvider);
 
 
   return new BucketAggType({
@@ -17,7 +16,7 @@ export default function DateRangeAggDefinition(Private, config) {
     title: 'Date Range',
     createFilter: createFilter,
     getKey: function (bucket, key, agg) {
-      let formatter = agg.fieldOwnFormatter('text', fieldFormats.getDefaultInstance('date'));
+      const formatter = agg.fieldOwnFormatter('text', fieldFormats.getDefaultInstance('date'));
       return dateRange.toString(bucket, formatter);
     },
     getFormat: function () {
@@ -41,4 +40,4 @@ export default function DateRangeAggDefinition(Private, config) {
       editor: dateRangesTemplate
     }]
   });
-};
+}
diff --git a/src/ui/public/agg_types/buckets/filters.js b/src/ui/public/agg_types/buckets/filters.js
index 47ab9c13bd0c7..3767c442bf7fc 100644
--- a/src/ui/public/agg_types/buckets/filters.js
+++ b/src/ui/public/agg_types/buckets/filters.js
@@ -5,10 +5,10 @@ import AggTypesBucketsCreateFilterFiltersProvider from 'ui/agg_types/buckets/cre
 import DecorateQueryProvider from 'ui/courier/data_source/_decorate_query';
 import filtersTemplate from 'ui/agg_types/controls/filters.html';
 export default function FiltersAggDefinition(Private, Notifier) {
-  let BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
-  let createFilter = Private(AggTypesBucketsCreateFilterFiltersProvider);
-  let decorateQuery = Private(DecorateQueryProvider);
-  let notif = new Notifier({ location: 'Filters Agg' });
+  const BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
+  const createFilter = Private(AggTypesBucketsCreateFilterFiltersProvider);
+  const decorateQuery = Private(DecorateQueryProvider);
+  const notif = new Notifier({ location: 'Filters Agg' });
 
   return new BucketAggType({
     name: 'filters',
@@ -19,30 +19,30 @@ export default function FiltersAggDefinition(Private, Notifier) {
       {
         name: 'filters',
         editor: filtersTemplate,
-        default: [ {input: {}, label: ''} ],
+        default: [ { input: {}, label: '' } ],
         write: function (aggConfig, output) {
-          let inFilters = aggConfig.params.filters;
+          const inFilters = aggConfig.params.filters;
           if (!_.size(inFilters)) return;
 
-          let outFilters = _.transform(inFilters, function (filters, filter) {
-            let input = filter.input;
+          const outFilters = _.transform(inFilters, function (filters, filter) {
+            const input = filter.input;
             if (!input) return notif.log('malformed filter agg params, missing "input" query');
 
-            let query = input.query;
+            const query = input.query;
             if (!query) return notif.log('malformed filter agg params, missing "query" on input');
 
             decorateQuery(query);
 
-            let label = filter.label || _.get(query, 'query_string.query') || angular.toJson(query);
+            const label = filter.label || _.get(query, 'query_string.query') || angular.toJson(query);
             filters[label] = input;
           }, {});
 
           if (!_.size(outFilters)) return;
 
-          let params = output.params || (output.params = {});
+          const params = output.params || (output.params = {});
           params.filters = outFilters;
         }
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/buckets/geo_hash.js b/src/ui/public/agg_types/buckets/geo_hash.js
index 230683f4514a2..2ef18ba475329 100644
--- a/src/ui/public/agg_types/buckets/geo_hash.js
+++ b/src/ui/public/agg_types/buckets/geo_hash.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type';
 import precisionTemplate from 'ui/agg_types/controls/precision.html';
-import {geohashColumns} from 'ui/utils/decode_geo_hash';
+import { geohashColumns } from 'ui/utils/decode_geo_hash';
 
 export default function GeoHashAggDefinition(Private, config) {
   const BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
@@ -11,7 +11,7 @@ export default function GeoHashAggDefinition(Private, config) {
    * Map Leaflet zoom levels to geohash precision levels.
    * The size of a geohash column-width on the map should be at least `minGeohashPixels` pixels wide.
    */
-  let zoomPrecision = {};
+  const zoomPrecision = {};
   const minGeohashPixels = 16;
   for (let zoom = 0; zoom <= 21; zoom += 1) {
     const worldPixels = 256 * Math.pow(2, zoom);
@@ -66,7 +66,7 @@ export default function GeoHashAggDefinition(Private, config) {
         name: 'precision',
         editor: precisionTemplate,
         deserialize: getPrecision,
-        controller: function ($scope) {
+        controller: function () {
         },
         write: function (aggConfig, output) {
           const vis = aggConfig.vis;
@@ -80,4 +80,4 @@ export default function GeoHashAggDefinition(Private, config) {
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/buckets/histogram.js b/src/ui/public/agg_types/buckets/histogram.js
index 8ebffb710e4ea..4eb2e5349ba4c 100644
--- a/src/ui/public/agg_types/buckets/histogram.js
+++ b/src/ui/public/agg_types/buckets/histogram.js
@@ -1,5 +1,3 @@
-import _ from 'lodash';
-import moment from 'moment';
 import 'ui/validate_date_interval';
 import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type';
 import AggTypesBucketsCreateFilterHistogramProvider from 'ui/agg_types/buckets/create_filter/histogram';
@@ -7,8 +5,8 @@ import intervalTemplate from 'ui/agg_types/controls/interval.html';
 import minDocCountTemplate from 'ui/agg_types/controls/min_doc_count.html';
 import extendedBoundsTemplate from 'ui/agg_types/controls/extended_bounds.html';
 export default function HistogramAggDefinition(Private) {
-  let BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
-  let createFilter = Private(AggTypesBucketsCreateFilterHistogramProvider);
+  const BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
+  const createFilter = Private(AggTypesBucketsCreateFilterHistogramProvider);
 
 
   return new BucketAggType({
@@ -51,7 +49,7 @@ export default function HistogramAggDefinition(Private) {
         default: {},
         editor: extendedBoundsTemplate,
         write: function (aggConfig, output) {
-          let val = aggConfig.params.extended_bounds;
+          const val = aggConfig.params.extended_bounds;
 
           if (aggConfig.params.min_doc_count && (val.min != null || val.max != null)) {
             output.params.extended_bounds = {
@@ -63,7 +61,7 @@ export default function HistogramAggDefinition(Private) {
 
         // called from the editor
         shouldShow: function (aggConfig) {
-          let field = aggConfig.params.field;
+          const field = aggConfig.params.field;
           if (
             field
             && (field.type === 'number' || field.type === 'date')
@@ -74,4 +72,4 @@ export default function HistogramAggDefinition(Private) {
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/buckets/ip_range.js b/src/ui/public/agg_types/buckets/ip_range.js
index 82a9c8776d46c..ebdac9dadab91 100644
--- a/src/ui/public/agg_types/buckets/ip_range.js
+++ b/src/ui/public/agg_types/buckets/ip_range.js
@@ -6,14 +6,14 @@ import AggTypesBucketsCreateFilterIpRangeProvider from 'ui/agg_types/buckets/cre
 import ipRangesTemplate from 'ui/agg_types/controls/ip_ranges.html';
 
 export default function RangeAggDefinition(Private) {
-  let BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
-  let createFilter = Private(AggTypesBucketsCreateFilterIpRangeProvider);
+  const BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
+  const createFilter = Private(AggTypesBucketsCreateFilterIpRangeProvider);
 
   return new BucketAggType({
     name: 'ip_range',
     title: 'IPv4 Range',
     createFilter: createFilter,
-    getKey: function (bucket, key, agg) {
+    getKey: function (bucket, key) {
       if (key) return key;
       const from = _.get(bucket, 'from', '-Infinity');
       const to = _.get(bucket, 'to', 'Infinity');
@@ -34,12 +34,12 @@ export default function RangeAggDefinition(Private) {
         name: 'ranges',
         default: {
           fromTo: [
-            {from: '0.0.0.0', to: '127.255.255.255'},
-            {from: '128.0.0.0', to: '191.255.255.255'}
+            { from: '0.0.0.0', to: '127.255.255.255' },
+            { from: '128.0.0.0', to: '191.255.255.255' }
           ],
           mask: [
-            {mask: '0.0.0.0/1'},
-            {mask: '128.0.0.0/2'}
+            { mask: '0.0.0.0/1' },
+            { mask: '128.0.0.0/2' }
           ]
         },
         editor: ipRangesTemplate,
@@ -58,4 +58,4 @@ export default function RangeAggDefinition(Private) {
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/buckets/range.js b/src/ui/public/agg_types/buckets/range.js
index 446cae17dc176..80e16710698d6 100644
--- a/src/ui/public/agg_types/buckets/range.js
+++ b/src/ui/public/agg_types/buckets/range.js
@@ -1,17 +1,16 @@
-import _ from 'lodash';
 import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type';
 import AggTypesBucketsCreateFilterRangeProvider from 'ui/agg_types/buckets/create_filter/range';
 import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
 import RangeKeyProvider from './range_key';
 import rangesTemplate from 'ui/agg_types/controls/ranges.html';
 export default function RangeAggDefinition(Private) {
-  let BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
-  let createFilter = Private(AggTypesBucketsCreateFilterRangeProvider);
-  let FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
-  let RangeKey = Private(RangeKeyProvider);
+  const BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
+  const createFilter = Private(AggTypesBucketsCreateFilterRangeProvider);
+  const FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
+  const RangeKey = Private(RangeKeyProvider);
 
-  let keyCaches = new WeakMap();
-  let formats = new WeakMap();
+  const keyCaches = new WeakMap();
+  const formats = new WeakMap();
 
   return new BucketAggType({
     name: 'range',
@@ -28,7 +27,7 @@ export default function RangeAggDefinition(Private) {
         keyCaches.set(agg, keys);
       }
 
-      let id = RangeKey.idBucket(bucket);
+      const id = RangeKey.idBucket(bucket);
 
       key = keys.get(id);
       if (!key) {
@@ -42,8 +41,8 @@ export default function RangeAggDefinition(Private) {
       let format = formats.get(agg);
       if (format) return format;
 
-      let RangeFormat = FieldFormat.from(function (range) {
-        let format = agg.fieldOwnFormatter();
+      const RangeFormat = FieldFormat.from(function (range) {
+        const format = agg.fieldOwnFormatter();
         return `${format(range.gte)} to ${format(range.lt)}`;
       });
 
@@ -71,4 +70,4 @@ export default function RangeAggDefinition(Private) {
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/buckets/range_key.js b/src/ui/public/agg_types/buckets/range_key.js
index 27508492855d0..f38fe38a62144 100644
--- a/src/ui/public/agg_types/buckets/range_key.js
+++ b/src/ui/public/agg_types/buckets/range_key.js
@@ -22,4 +22,4 @@ export default function () {
 
 
   return RangeKey;
-};
+}
diff --git a/src/ui/public/agg_types/buckets/significant_terms.js b/src/ui/public/agg_types/buckets/significant_terms.js
index 789df97ff00cf..240957080914e 100644
--- a/src/ui/public/agg_types/buckets/significant_terms.js
+++ b/src/ui/public/agg_types/buckets/significant_terms.js
@@ -1,10 +1,9 @@
-import _ from 'lodash';
 import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type';
 import AggTypesBucketsCreateFilterTermsProvider from 'ui/agg_types/buckets/create_filter/terms';
 import orderAndSizeTemplate from 'ui/agg_types/controls/order_and_size.html';
 export default function SignificantTermsAggDefinition(Private) {
-  let BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
-  let createFilter = Private(AggTypesBucketsCreateFilterTermsProvider);
+  const BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
+  const createFilter = Private(AggTypesBucketsCreateFilterTermsProvider);
 
   return new BucketAggType({
     name: 'significant_terms',
@@ -35,4 +34,4 @@ export default function SignificantTermsAggDefinition(Private) {
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/buckets/terms.js b/src/ui/public/agg_types/buckets/terms.js
index 1a326ec8e8e81..139da258295bb 100644
--- a/src/ui/public/agg_types/buckets/terms.js
+++ b/src/ui/public/agg_types/buckets/terms.js
@@ -1,6 +1,5 @@
 import _ from 'lodash';
 import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type';
-import AggTypesBucketsBucketCountBetweenProvider from 'ui/agg_types/buckets/_bucket_count_between';
 import VisAggConfigProvider from 'ui/vis/agg_config';
 import VisSchemasProvider from 'ui/vis/schemas';
 import AggTypesBucketsCreateFilterTermsProvider from 'ui/agg_types/buckets/create_filter/terms';
@@ -9,14 +8,13 @@ import orderAndSizeTemplate from 'ui/agg_types/controls/order_and_size.html';
 import routeBasedNotifierProvider from 'ui/route_based_notifier';
 
 export default function TermsAggDefinition(Private) {
-  let BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
-  let bucketCountBetween = Private(AggTypesBucketsBucketCountBetweenProvider);
-  let AggConfig = Private(VisAggConfigProvider);
-  let Schemas = Private(VisSchemasProvider);
-  let createFilter = Private(AggTypesBucketsCreateFilterTermsProvider);
+  const BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
+  const AggConfig = Private(VisAggConfigProvider);
+  const Schemas = Private(VisSchemasProvider);
+  const createFilter = Private(AggTypesBucketsCreateFilterTermsProvider);
   const routeBasedNotifier = Private(routeBasedNotifierProvider);
 
-  let orderAggSchema = (new Schemas([
+  const orderAggSchema = (new Schemas([
     {
       group: 'none',
       name: 'orderAgg',
@@ -27,7 +25,7 @@ export default function TermsAggDefinition(Private) {
 
   function isNotType(type) {
     return function (agg) {
-      let field = agg.params.field;
+      const field = agg.params.field;
       return !field || field.type !== type;
     };
   }
@@ -36,7 +34,7 @@ export default function TermsAggDefinition(Private) {
     name: 'terms',
     title: 'Terms',
     makeLabel: function (agg) {
-      let params = agg.params;
+      const params = agg.params;
       return agg.getFieldDisplayName() + ': ' + params.order.display;
     },
     createFilter: createFilter,
@@ -75,7 +73,7 @@ export default function TermsAggDefinition(Private) {
         makeOrderAgg: function (termsAgg, state) {
           state = state || {};
           state.schema = orderAggSchema;
-          let orderAgg = new AggConfig(termsAgg.vis, state);
+          const orderAgg = new AggConfig(termsAgg.vis, state);
           orderAgg.id = termsAgg.id + '-orderAgg';
           return orderAgg;
         },
@@ -88,18 +86,17 @@ export default function TermsAggDefinition(Private) {
             }
           };
 
-          let INIT = {}; // flag to know when prevOrderBy has changed
+          const INIT = {}; // flag to know when prevOrderBy has changed
           let prevOrderBy = INIT;
 
           $scope.$watch('responseValueAggs', updateOrderAgg);
           $scope.$watch('agg.params.orderBy', updateOrderAgg);
 
           function updateOrderAgg() {
-            let agg = $scope.agg;
-            let aggs = agg.vis.aggs;
-            let params = agg.params;
-            let orderBy = params.orderBy;
-            let paramDef = agg.type.params.byName.orderAgg;
+            const agg = $scope.agg;
+            const params = agg.params;
+            const orderBy = params.orderBy;
+            const paramDef = agg.type.params.byName.orderAgg;
 
             // setup the initial value of orderBy
             if (!orderBy && prevOrderBy === INIT) {
@@ -132,9 +129,9 @@ export default function TermsAggDefinition(Private) {
           }
         },
         write: function (agg, output) {
-          let vis = agg.vis;
-          let dir = agg.params.order.val;
-          let order = output.params.order = {};
+          const vis = agg.vis;
+          const dir = agg.params.order.val;
+          const order = output.params.order = {};
 
           let orderAgg = agg.params.orderAgg || vis.aggs.getResponseAggById(agg.params.orderBy);
 
@@ -158,7 +155,7 @@ export default function TermsAggDefinition(Private) {
             return;
           }
 
-          let orderAggId = orderAgg.id;
+          const orderAggId = orderAgg.id;
           if (orderAgg.parentId) {
             orderAgg = vis.aggs.byId[orderAgg.parentId];
           }
@@ -184,4 +181,4 @@ export default function TermsAggDefinition(Private) {
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/index.js b/src/ui/public/agg_types/index.js
index 762a9dbab4a99..5ad33dadc4791 100644
--- a/src/ui/public/agg_types/index.js
+++ b/src/ui/public/agg_types/index.js
@@ -21,7 +21,7 @@ import AggTypesBucketsSignificantTermsProvider from 'ui/agg_types/buckets/signif
 import AggTypesBucketsGeoHashProvider from 'ui/agg_types/buckets/geo_hash';
 export default function AggTypeService(Private) {
 
-  let aggs = {
+  const aggs = {
     metrics: [
       Private(AggTypesMetricsCountProvider),
       Private(AggTypesMetricsAvgProvider),
@@ -76,6 +76,6 @@ export default function AggTypeService(Private) {
     group: ['type'],
     initialSet: aggs.metrics.concat(aggs.buckets)
   });
-};
+}
 
 // preload
diff --git a/src/ui/public/agg_types/metrics/avg.js b/src/ui/public/agg_types/metrics/avg.js
index 4c7fc8ed50a1b..b0e7b8ac12a03 100644
--- a/src/ui/public/agg_types/metrics/avg.js
+++ b/src/ui/public/agg_types/metrics/avg.js
@@ -1,7 +1,7 @@
 import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
 
 export default function AggTypeMetricAvgProvider(Private) {
-  let MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
+  const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
 
   return new MetricAggType({
     name: 'avg',
@@ -16,4 +16,4 @@ export default function AggTypeMetricAvgProvider(Private) {
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/metrics/cardinality.js b/src/ui/public/agg_types/metrics/cardinality.js
index 76fed873e87e5..9a20c808e21ab 100644
--- a/src/ui/public/agg_types/metrics/cardinality.js
+++ b/src/ui/public/agg_types/metrics/cardinality.js
@@ -2,8 +2,8 @@ import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_ag
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 
 export default function AggTypeMetricCardinalityProvider(Private) {
-  let MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
-  let fieldFormats = Private(RegistryFieldFormatsProvider);
+  const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
+  const fieldFormats = Private(RegistryFieldFormatsProvider);
 
   return new MetricAggType({
     name: 'cardinality',
@@ -20,4 +20,4 @@ export default function AggTypeMetricCardinalityProvider(Private) {
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/metrics/count.js b/src/ui/public/agg_types/metrics/count.js
index fcad3d8dffa06..4956116761157 100644
--- a/src/ui/public/agg_types/metrics/count.js
+++ b/src/ui/public/agg_types/metrics/count.js
@@ -2,8 +2,8 @@ import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_ag
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 
 export default function AggTypeMetricCountProvider(Private) {
-  let MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
-  let fieldFormats = Private(RegistryFieldFormatsProvider);
+  const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
+  const fieldFormats = Private(RegistryFieldFormatsProvider);
 
   return new MetricAggType({
     name: 'count',
@@ -19,4 +19,4 @@ export default function AggTypeMetricCountProvider(Private) {
       return bucket.doc_count;
     }
   });
-};
+}
diff --git a/src/ui/public/agg_types/metrics/get_response_agg_config_class.js b/src/ui/public/agg_types/metrics/get_response_agg_config_class.js
index b9112f343e81b..8dad245681800 100644
--- a/src/ui/public/agg_types/metrics/get_response_agg_config_class.js
+++ b/src/ui/public/agg_types/metrics/get_response_agg_config_class.js
@@ -30,7 +30,7 @@ export default function ResponseAggConfigProvider() {
       this.key = key;
       this.parentId = this.id;
 
-      let subId = String(key);
+      const subId = String(key);
       if (subId.indexOf('.') > -1) {
         this.id = this.parentId + '[\'' + subId.replace(/'/g, '\\\'') + '\']';
       } else {
@@ -46,4 +46,4 @@ export default function ResponseAggConfigProvider() {
 
     return ResponseAggConfig;
   }
-};
+}
diff --git a/src/ui/public/agg_types/metrics/max.js b/src/ui/public/agg_types/metrics/max.js
index 2e39117904bc3..3790c8ad92264 100644
--- a/src/ui/public/agg_types/metrics/max.js
+++ b/src/ui/public/agg_types/metrics/max.js
@@ -1,7 +1,7 @@
 import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
 
 export default function AggTypeMetricMaxProvider(Private) {
-  let MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
+  const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
 
   return new MetricAggType({
     name: 'max',
@@ -16,4 +16,4 @@ export default function AggTypeMetricMaxProvider(Private) {
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/metrics/median.js b/src/ui/public/agg_types/metrics/median.js
index 0b01fbbd1b116..b7b62dbb4fa44 100644
--- a/src/ui/public/agg_types/metrics/median.js
+++ b/src/ui/public/agg_types/metrics/median.js
@@ -1,11 +1,8 @@
-import _ from 'lodash';
 import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
-import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class';
 import AggTypesMetricsPercentilesProvider from 'ui/agg_types/metrics/percentiles';
 export default function AggTypeMetricMedianProvider(Private) {
-  let MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
-  let getResponseAggConfigClass = Private(AggTypesMetricsGetResponseAggConfigClassProvider);
-  let percentiles = Private(AggTypesMetricsPercentilesProvider);
+  const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
+  const percentiles = Private(AggTypesMetricsPercentilesProvider);
 
   return new MetricAggType({
     name: 'median',
@@ -32,4 +29,4 @@ export default function AggTypeMetricMedianProvider(Private) {
     getResponseAggs: percentiles.getResponseAggs,
     getValue: percentiles.getValue
   });
-};
+}
diff --git a/src/ui/public/agg_types/metrics/metric_agg_type.js b/src/ui/public/agg_types/metrics/metric_agg_type.js
index 445da4549868c..12f712cce4f09 100644
--- a/src/ui/public/agg_types/metrics/metric_agg_type.js
+++ b/src/ui/public/agg_types/metrics/metric_agg_type.js
@@ -2,8 +2,8 @@ import _ from 'lodash';
 import AggTypesAggTypeProvider from 'ui/agg_types/agg_type';
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 export default function MetricAggTypeProvider(Private) {
-  let AggType = Private(AggTypesAggTypeProvider);
-  let fieldFormats = Private(RegistryFieldFormatsProvider);
+  const AggType = Private(AggTypesAggTypeProvider);
+  const fieldFormats = Private(RegistryFieldFormatsProvider);
 
   _.class(MetricAggType).inherits(AggType);
   function MetricAggType(config) {
@@ -24,7 +24,7 @@ export default function MetricAggTypeProvider(Private) {
    */
   MetricAggType.prototype.getValue = function (agg, bucket) {
     // Metric types where an empty set equals `zero`
-    let isSettableToZero = ['cardinality', 'sum'].indexOf(agg.__type.name) !== -1;
+    const isSettableToZero = ['cardinality', 'sum'].indexOf(agg.__type.name) !== -1;
 
     // Return proper values when no buckets are present
     // `Count` handles empty sets properly
@@ -42,9 +42,9 @@ export default function MetricAggTypeProvider(Private) {
    * @return {FieldFromat}
    */
   MetricAggType.prototype.getFormat = function (agg) {
-    let field = agg.getField();
+    const field = agg.getField();
     return field ? field.format : fieldFormats.getDefaultInstance('number');
   };
 
   return MetricAggType;
-};
+}
diff --git a/src/ui/public/agg_types/metrics/min.js b/src/ui/public/agg_types/metrics/min.js
index d60b04f959f8d..42e54c37eeca2 100644
--- a/src/ui/public/agg_types/metrics/min.js
+++ b/src/ui/public/agg_types/metrics/min.js
@@ -1,7 +1,7 @@
 import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
 
 export default function AggTypeMetricMinProvider(Private) {
-  let MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
+  const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
 
   return new MetricAggType({
     name: 'min',
@@ -16,4 +16,4 @@ export default function AggTypeMetricMinProvider(Private) {
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/metrics/percentile_ranks.js b/src/ui/public/agg_types/metrics/percentile_ranks.js
index 87891eb9d9019..9fb15e8580664 100644
--- a/src/ui/public/agg_types/metrics/percentile_ranks.js
+++ b/src/ui/public/agg_types/metrics/percentile_ranks.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import valuesEditor from 'ui/agg_types/controls/percentile_ranks.html';
 import 'ui/number_list';
 import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
@@ -7,16 +6,16 @@ import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 import getPercentileValue from './percentiles_get_value';
 
 export default function AggTypeMetricPercentileRanksProvider(Private) {
-  let MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
-  let getResponseAggConfigClass = Private(AggTypesMetricsGetResponseAggConfigClassProvider);
-  let fieldFormats = Private(RegistryFieldFormatsProvider);
+  const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
+  const getResponseAggConfigClass = Private(AggTypesMetricsGetResponseAggConfigClassProvider);
+  const fieldFormats = Private(RegistryFieldFormatsProvider);
 
   // required by the values editor
 
-  let valueProps = {
+  const valueProps = {
     makeLabel: function () {
-      let field = this.getField();
-      let format = (field && field.format) || fieldFormats.getDefaultInstance('number');
+      const field = this.getField();
+      const format = (field && field.format) || fieldFormats.getDefaultInstance('number');
       const label = this.params.customLabel || this.getFieldDisplayName();
 
       return 'Percentile rank ' + format.convert(this.key, 'text') + ' of "' + label + '"';
@@ -46,7 +45,7 @@ export default function AggTypeMetricPercentileRanksProvider(Private) {
       }
     ],
     getResponseAggs: function (agg) {
-      let ValueAggConfig = getResponseAggConfigClass(agg, valueProps);
+      const ValueAggConfig = getResponseAggConfigClass(agg, valueProps);
 
       return agg.params.values.map(function (value) {
         return new ValueAggConfig(value);
@@ -59,4 +58,4 @@ export default function AggTypeMetricPercentileRanksProvider(Private) {
       return getPercentileValue(agg, bucket) / 100;
     }
   });
-};
+}
diff --git a/src/ui/public/agg_types/metrics/percentiles.js b/src/ui/public/agg_types/metrics/percentiles.js
index b1ef53fee93cc..980d44e5a763c 100644
--- a/src/ui/public/agg_types/metrics/percentiles.js
+++ b/src/ui/public/agg_types/metrics/percentiles.js
@@ -1,20 +1,17 @@
-import _ from 'lodash';
 import ordinalSuffix from 'ui/utils/ordinal_suffix';
 import percentsEditor from 'ui/agg_types/controls/percentiles.html';
 import 'ui/number_list';
 import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
 import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class';
-import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 import getPercentileValue from './percentiles_get_value';
 
 export default function AggTypeMetricPercentilesProvider(Private) {
-  let MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
-  let getResponseAggConfigClass = Private(AggTypesMetricsGetResponseAggConfigClassProvider);
-  let fieldFormats = Private(RegistryFieldFormatsProvider);
+  const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
+  const getResponseAggConfigClass = Private(AggTypesMetricsGetResponseAggConfigClassProvider);
 
   // required by the percentiles editor
 
-  let valueProps = {
+  const valueProps = {
     makeLabel: function () {
       const label = this.params.customLabel || this.getFieldDisplayName();
       return ordinalSuffix(this.key) + ' percentile of ' + label;
@@ -44,7 +41,7 @@ export default function AggTypeMetricPercentilesProvider(Private) {
       }
     ],
     getResponseAggs: function (agg) {
-      let ValueAggConfig = getResponseAggConfigClass(agg, valueProps);
+      const ValueAggConfig = getResponseAggConfigClass(agg, valueProps);
 
       return agg.params.percents.map(function (percent) {
         return new ValueAggConfig(percent);
@@ -52,4 +49,4 @@ export default function AggTypeMetricPercentilesProvider(Private) {
     },
     getValue: getPercentileValue
   });
-};
+}
diff --git a/src/ui/public/agg_types/metrics/std_deviation.js b/src/ui/public/agg_types/metrics/std_deviation.js
index fc101110d4b89..da1236fce508e 100644
--- a/src/ui/public/agg_types/metrics/std_deviation.js
+++ b/src/ui/public/agg_types/metrics/std_deviation.js
@@ -2,12 +2,12 @@ import _ from 'lodash';
 import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
 import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class';
 export default function AggTypeMetricStandardDeviationProvider(Private) {
-  let MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
-  let getResponseAggConfigClass = Private(AggTypesMetricsGetResponseAggConfigClassProvider);
+  const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
+  const getResponseAggConfigClass = Private(AggTypesMetricsGetResponseAggConfigClassProvider);
 
-  let responseAggConfigProps = {
+  const responseAggConfigProps = {
     valProp: function () {
-      let details = this.keyedDetails(this.params.customLabel)[this.key];
+      const details = this.keyedDetails(this.params.customLabel)[this.key];
       return details.valProp;
     },
     makeLabel: function () {
@@ -45,7 +45,7 @@ export default function AggTypeMetricStandardDeviationProvider(Private) {
     ],
 
     getResponseAggs: function (agg) {
-      let ValueAggConfig = getResponseAggConfigClass(agg, responseAggConfigProps);
+      const ValueAggConfig = getResponseAggConfigClass(agg, responseAggConfigProps);
 
       return [
         new ValueAggConfig('std_lower'),
@@ -57,4 +57,4 @@ export default function AggTypeMetricStandardDeviationProvider(Private) {
       return _.get(bucket[agg.parentId], agg.valProp());
     }
   });
-};
+}
diff --git a/src/ui/public/agg_types/metrics/sum.js b/src/ui/public/agg_types/metrics/sum.js
index b90309e917f9d..901fee3e28d2b 100644
--- a/src/ui/public/agg_types/metrics/sum.js
+++ b/src/ui/public/agg_types/metrics/sum.js
@@ -1,7 +1,7 @@
 import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
 
 export default function AggTypeMetricSumProvider(Private) {
-  let MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
+  const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
 
   return new MetricAggType({
     name: 'sum',
@@ -16,4 +16,4 @@ export default function AggTypeMetricSumProvider(Private) {
       }
     ]
   });
-};
+}
diff --git a/src/ui/public/agg_types/param_types/base.js b/src/ui/public/agg_types/param_types/base.js
index 997ff7a8e4765..1b2d1f71128a4 100644
--- a/src/ui/public/agg_types/param_types/base.js
+++ b/src/ui/public/agg_types/param_types/base.js
@@ -6,4 +6,4 @@ export default function BaseAggParamFactory() {
   }
 
   return BaseAggParam;
-};
+}
diff --git a/src/ui/public/agg_types/param_types/field.js b/src/ui/public/agg_types/param_types/field.js
index 611c6b545390a..2009a3572a4ab 100644
--- a/src/ui/public/agg_types/param_types/field.js
+++ b/src/ui/public/agg_types/param_types/field.js
@@ -7,7 +7,7 @@ import IndexedArray from 'ui/indexed_array';
 import Notifier from 'ui/notify/notifier';
 
 export default function FieldAggParamFactory(Private, $filter) {
-  let BaseAggParam = Private(AggTypesParamTypesBaseProvider);
+  const BaseAggParam = Private(AggTypesParamTypesBaseProvider);
   const notifier = new Notifier();
 
   _.class(FieldAggParam).inherits(BaseAggParam);
@@ -71,7 +71,7 @@ export default function FieldAggParamFactory(Private, $filter) {
 
     const validField = this.getFieldOptions(aggConfig).byName[fieldName];
     if (!validField) {
-      notifier.error(`Saved "field" parameter is now invalid. Please select a new field.`);
+      notifier.error('Saved "field" parameter is now invalid. Please select a new field.');
     }
 
     return validField;
@@ -88,7 +88,7 @@ export default function FieldAggParamFactory(Private, $filter) {
    * @return {undefined}
    */
   FieldAggParam.prototype.write = function (aggConfig, output) {
-    let field = aggConfig.getField();
+    const field = aggConfig.getField();
 
     if (!field) {
       throw new TypeError('"field" is a required parameter');
@@ -105,4 +105,4 @@ export default function FieldAggParamFactory(Private, $filter) {
   };
 
   return FieldAggParam;
-};
+}
diff --git a/src/ui/public/agg_types/param_types/optioned.js b/src/ui/public/agg_types/param_types/optioned.js
index 2e161a879a6c5..03ea1532cb2a8 100644
--- a/src/ui/public/agg_types/param_types/optioned.js
+++ b/src/ui/public/agg_types/param_types/optioned.js
@@ -3,7 +3,7 @@ import IndexedArray from 'ui/indexed_array';
 import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
 export default function OptionedAggParamFactory(Private) {
 
-  let BaseAggParam = Private(AggTypesParamTypesBaseProvider);
+  const BaseAggParam = Private(AggTypesParamTypesBaseProvider);
 
   _.class(OptionedAggParam).inherits(BaseAggParam);
   function OptionedAggParam(config) {
@@ -51,4 +51,4 @@ export default function OptionedAggParamFactory(Private) {
   };
 
   return OptionedAggParam;
-};
+}
diff --git a/src/ui/public/agg_types/param_types/raw_json.js b/src/ui/public/agg_types/param_types/raw_json.js
index 25f160174230d..b32f48443a6db 100644
--- a/src/ui/public/agg_types/param_types/raw_json.js
+++ b/src/ui/public/agg_types/param_types/raw_json.js
@@ -3,7 +3,7 @@ import editorHtml from 'ui/agg_types/controls/raw_json.html';
 import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
 export default function RawJSONAggParamFactory(Private) {
 
-  let BaseAggParam = Private(AggTypesParamTypesBaseProvider);
+  const BaseAggParam = Private(AggTypesParamTypesBaseProvider);
 
   _.class(RawJSONAggParam).inherits(BaseAggParam);
   function RawJSONAggParam(config) {
@@ -26,7 +26,7 @@ export default function RawJSONAggParamFactory(Private) {
    */
   RawJSONAggParam.prototype.write = function (aggConfig, output) {
     let paramJSON;
-    let param = aggConfig.params[this.name];
+    const param = aggConfig.params[this.name];
 
     if (!param) {
       return;
@@ -45,7 +45,7 @@ export default function RawJSONAggParamFactory(Private) {
         .keys()
         .union(_.keys(b))
         .transform(function (dest, key) {
-          let val = compare(a[key], b[key]);
+          const val = compare(a[key], b[key]);
           if (val !== undefined) dest[key] = val;
         }, {})
         .value();
@@ -74,4 +74,4 @@ export default function RawJSONAggParamFactory(Private) {
   };
 
   return RawJSONAggParam;
-};
+}
diff --git a/src/ui/public/agg_types/param_types/regex.js b/src/ui/public/agg_types/param_types/regex.js
index 3a38c06f8b9da..5628cf719146d 100644
--- a/src/ui/public/agg_types/param_types/regex.js
+++ b/src/ui/public/agg_types/param_types/regex.js
@@ -3,7 +3,7 @@ import editorHtml from 'ui/agg_types/controls/regular_expression.html';
 import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
 export default function RegexAggParamFactory(Private) {
 
-  let BaseAggParam = Private(AggTypesParamTypesBaseProvider);
+  const BaseAggParam = Private(AggTypesParamTypesBaseProvider);
 
   _.class(RegexAggParam).inherits(BaseAggParam);
   function RegexAggParam(config) {
@@ -18,7 +18,7 @@ export default function RegexAggParamFactory(Private) {
    *
    * @return {bool}
    */
-  RegexAggParam.prototype.disabled = function (aggConfig) {
+  RegexAggParam.prototype.disabled = function () {
     return false;
   };
 
@@ -33,15 +33,15 @@ export default function RegexAggParamFactory(Private) {
    * @return {undefined}
    */
   RegexAggParam.prototype.write = function (aggConfig, output) {
-    let param = aggConfig.params[this.name];
-    let paramType = aggConfig.type.params.byName[this.name];
+    const param = aggConfig.params[this.name];
+    const paramType = aggConfig.type.params.byName[this.name];
 
     // clear aggParam if pattern is not set or is disabled
     if (!param || !param.pattern || !param.pattern.length || paramType.disabled(aggConfig)) {
       return;
     }
 
-    let obj = {
+    const obj = {
       pattern: param.pattern
     };
 
@@ -49,4 +49,4 @@ export default function RegexAggParamFactory(Private) {
   };
 
   return RegexAggParam;
-};
+}
diff --git a/src/ui/public/agg_types/param_types/string.js b/src/ui/public/agg_types/param_types/string.js
index 58803171c44a4..151e8218ab757 100644
--- a/src/ui/public/agg_types/param_types/string.js
+++ b/src/ui/public/agg_types/param_types/string.js
@@ -3,7 +3,7 @@ import editorHtml from 'ui/agg_types/controls/string.html';
 import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
 export default function FieldAggParamFactory(Private) {
 
-  let BaseAggParam = Private(AggTypesParamTypesBaseProvider);
+  const BaseAggParam = Private(AggTypesParamTypesBaseProvider);
 
   _.class(ScriptAggParam).inherits(BaseAggParam);
   function ScriptAggParam(config) {
@@ -29,4 +29,4 @@ export default function FieldAggParamFactory(Private) {
   };
 
   return ScriptAggParam;
-};
+}
diff --git a/src/ui/public/bind/__tests__/bind.js b/src/ui/public/bind/__tests__/bind.js
index e7acb9b037080..4d11e0dabb463 100644
--- a/src/ui/public/bind/__tests__/bind.js
+++ b/src/ui/public/bind/__tests__/bind.js
@@ -1,4 +1,3 @@
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 describe('$scope.$bind', function () {
@@ -16,7 +15,7 @@ describe('$scope.$bind', function () {
     expect($rootScope.$bind).to.be.a('function');
     expect($scope).to.have.property('$bind', $rootScope.$bind);
 
-    let $isoScope = $scope.$new(true);
+    const $isoScope = $scope.$new(true);
     expect($isoScope).to.have.property('$bind', $rootScope.$bind);
   });
 
@@ -33,8 +32,6 @@ describe('$scope.$bind', function () {
   });
 
   it('sets up a binding from the child to the parent scope', function () {
-    let stub = sinon.stub();
-
     $rootScope.val = 'foo';
     $scope.$bind('localVal', 'val');
     expect($scope.localVal).to.be('foo');
@@ -47,8 +44,8 @@ describe('$scope.$bind', function () {
   });
 
   it('pulls from the scopes $parent by default', function () {
-    let $parent = $rootScope.$new();
-    let $self = $parent.$new();
+    const $parent = $rootScope.$new();
+    const $self = $parent.$new();
 
     $parent.val = 'foo';
     $self.val = 'bar';
@@ -58,8 +55,8 @@ describe('$scope.$bind', function () {
   });
 
   it('accepts an alternate scope to read from', function () {
-    let $parent = $rootScope.$new();
-    let $self = $parent.$new();
+    const $parent = $rootScope.$new();
+    const $self = $parent.$new();
 
     $parent.val = 'foo';
     $self.val = 'bar';
diff --git a/src/ui/public/bind/bind.js b/src/ui/public/bind/bind.js
index ba16ddc5bfdcb..24ed2c8e6fff6 100644
--- a/src/ui/public/bind/bind.js
+++ b/src/ui/public/bind/bind.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import angular from 'angular';
 import uiModules from 'ui/modules';
 
@@ -27,19 +26,19 @@ uiModules.get('kibana')
      * @return {undefined}
      */
     $delegate.constructor.prototype.$bind = function (to, from, $sourceScope) {
-      let $source = $sourceScope || this.$parent;
-      let $target = this;
+      const $source = $sourceScope || this.$parent;
+      const $target = this;
 
       // parse expressions
-      let $to = $parse(to);
+      const $to = $parse(to);
       if (!$to.assign) errorNotAssignable(to, from);
-      let $from = $parse(from);
+      const $from = $parse(from);
 
       // bind scopes to expressions
-      let getTarget = function () { return $to($target); };
-      let setTarget = function (v) { return $to.assign($target, v); };
-      let getSource = function () { return $from($source); };
-      let setSource = function (v) { return $from.assignOrFail($source, v); };
+      const getTarget = function () { return $to($target); };
+      const setTarget = function (v) { return $to.assign($target, v); };
+      const getSource = function () { return $from($source); };
+      const setSource = function (v) { return $from.assignOrFail($source, v); };
 
       // to support writing from the child to the parent we need to know
       // which source has changed. Track the source value and anytime it
@@ -55,19 +54,19 @@ uiModules.get('kibana')
       };
 
       // if we are syncing down a literal, then we use loose equality check
-      let strict = !$from.literal;
-      let compare = strict ? strictEquality : angular.equals;
+      const strict = !$from.literal;
+      const compare = strict ? strictEquality : angular.equals;
 
 
       // push the initial value down, start off in sync
       setTarget(lastSourceVal);
 
       $target.$watch(function () {
-        let sourceVal = getSource();
-        let targetVal = getTarget();
+        const sourceVal = getSource();
+        const targetVal = getTarget();
 
-        let outOfSync = !compare(sourceVal, targetVal);
-        let sourceChanged = outOfSync && !compare(sourceVal, lastSourceVal);
+        const outOfSync = !compare(sourceVal, targetVal);
+        const sourceChanged = outOfSync && !compare(sourceVal, lastSourceVal);
 
         if (sourceChanged) setTarget(sourceVal);
         else if (outOfSync) setSource(targetVal);
diff --git a/src/ui/public/binder/__tests__/binder.js b/src/ui/public/binder/__tests__/binder.js
index 182050bb597fd..61cdaef8ce30e 100644
--- a/src/ui/public/binder/__tests__/binder.js
+++ b/src/ui/public/binder/__tests__/binder.js
@@ -16,13 +16,13 @@ describe('Binder class', function () {
   context('Constructing with a $scope', function () {
     it('accepts a $scope and listens for $destroy', function () {
       sinon.stub($scope, '$on');
-      let binder = new Binder($scope);
+      new Binder($scope);
       expect($scope.$on.callCount).to.be(1);
       expect($scope.$on.args[0][0]).to.be('$destroy');
     });
 
     it('unbinds when the $scope is destroyed', function () {
-      let binder = new Binder($scope);
+      const binder = new Binder($scope);
       sinon.stub(binder, 'destroy');
       $scope.$destroy();
       expect(binder.destroy.callCount).to.be(1);
@@ -31,12 +31,12 @@ describe('Binder class', function () {
 
   describe('Binder#on', function () {
     it('binds to normal event emitters', function () {
-      let binder = new Binder();
-      let emitter = {
+      const binder = new Binder();
+      const emitter = {
         on: sinon.stub(),
         removeListener: sinon.stub()
       };
-      let handler = sinon.stub();
+      const handler = sinon.stub();
 
       binder.on(emitter, 'click', handler);
       expect(emitter.on.callCount).to.be(1);
@@ -52,9 +52,9 @@ describe('Binder class', function () {
 
   describe('Binder#jqOn', function () {
     it('binds jquery event handlers', function () {
-      let binder = new Binder();
-      let el = document.createElement('div');
-      let handler = sinon.stub();
+      const binder = new Binder();
+      const el = document.createElement('div');
+      const handler = sinon.stub();
 
       binder.jqOn(el, 'click', handler);
       $(el).click();
diff --git a/src/ui/public/bound_to_config_obj.js b/src/ui/public/bound_to_config_obj.js
index 5f4ac5272dde8..1123c4f232f85 100644
--- a/src/ui/public/bound_to_config_obj.js
+++ b/src/ui/public/bound_to_config_obj.js
@@ -34,4 +34,4 @@ export default function BoundToConfigObjProvider(config) {
 
   return BoundToConfigObj;
 
-};
+}
diff --git a/src/ui/public/chrome/__tests__/kbn_loading_indicator.js b/src/ui/public/chrome/__tests__/kbn_loading_indicator.js
index 902c407a36863..0b46d66f9f845 100644
--- a/src/ui/public/chrome/__tests__/kbn_loading_indicator.js
+++ b/src/ui/public/chrome/__tests__/kbn_loading_indicator.js
@@ -1,6 +1,5 @@
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
-import uiModules from 'ui/modules';
 import $ from 'jquery';
 
 import '../directives/loading_indicator/loading_indicator';
@@ -24,7 +23,7 @@ describe('kbnLoadingIndicator', function () {
 
   });
 
-  it(`doesn't have ng-hide class when there are connections`, function () {
+  it('doesn\'t have ng-hide class when there are connections', function () {
     const $el = compile(true);
     expect($el.hasClass('ng-hide')).to.be(false);
   });
diff --git a/src/ui/public/chrome/__tests__/nav_controls.js b/src/ui/public/chrome/__tests__/nav_controls.js
index dda0bdc483465..1943b91025ded 100644
--- a/src/ui/public/chrome/__tests__/nav_controls.js
+++ b/src/ui/public/chrome/__tests__/nav_controls.js
@@ -2,7 +2,6 @@ import ngMock from 'ng_mock';
 import $ from 'jquery';
 import expect from 'expect.js';
 
-import uiModules from 'ui/modules';
 import chromeNavControlsRegistry from 'ui/registry/chrome_nav_controls';
 import Registry from 'ui/registry/_registry';
 
@@ -32,11 +31,11 @@ describe('chrome nav controls', function () {
       return {
         name: 'control',
         order: 100,
-        template: `<span id="testTemplateEl"></span>`
+        template: '<span id="testTemplateEl"></span>'
       };
     });
 
-    let $el = compile();
+    const $el = compile();
     expect($el.find('#testTemplateEl')).to.have.length(1);
   });
 
@@ -45,25 +44,25 @@ describe('chrome nav controls', function () {
       return {
         name: 'control2',
         order: 2,
-        template: `<span id="2", class="testControl"></span>`
+        template: '<span id="2", class="testControl"></span>'
       };
     });
     stubRegistry.register(function () {
       return {
         name: 'control1',
         order: 1,
-        template: `<span id="1", class="testControl"></span>`
+        template: '<span id="1", class="testControl"></span>'
       };
     });
     stubRegistry.register(function () {
       return {
         name: 'control3',
         order: 3,
-        template: `<span id="3", class="testControl"></span>`
+        template: '<span id="3", class="testControl"></span>'
       };
     });
 
-    let $el = compile();
+    const $el = compile();
     expect(
       $el.find('.testControl')
       .toArray()
diff --git a/src/ui/public/chrome/api/__tests__/angular.js b/src/ui/public/chrome/api/__tests__/angular.js
index 1f79157a90dd7..0bf46a7ced0f3 100644
--- a/src/ui/public/chrome/api/__tests__/angular.js
+++ b/src/ui/public/chrome/api/__tests__/angular.js
@@ -1,5 +1,3 @@
-import expect from 'expect.js';
-
 import kbnAngular from '../angular';
 import { noop } from 'lodash';
 
diff --git a/src/ui/public/chrome/api/__tests__/nav.js b/src/ui/public/chrome/api/__tests__/nav.js
index 12d44e221bd07..8ccb91bcdb804 100644
--- a/src/ui/public/chrome/api/__tests__/nav.js
+++ b/src/ui/public/chrome/api/__tests__/nav.js
@@ -64,7 +64,9 @@ describe('chrome nav apis', function () {
       const nav = [
         { id: 'kibana:discover', title: 'Discover' }
       ];
-      const { chrome, internals } = init({ appUrlStore, nav });
+      const {
+        chrome
+      } = init({ appUrlStore, nav });
 
       const navLink = chrome.getNavLinkById('kibana:discover');
       expect(navLink).to.eql(nav[0]);
@@ -75,11 +77,13 @@ describe('chrome nav apis', function () {
       const nav = [
         { id: 'kibana:discover', title: 'Discover' }
       ];
-      const { chrome, internals } = init({ appUrlStore, nav });
+      const {
+        chrome
+      } = init({ appUrlStore, nav });
 
       let errorThrown = false;
       try {
-        const navLink = chrome.getNavLinkById('nonexistent');
+        chrome.getNavLinkById('nonexistent');
       } catch (e) {
         errorThrown = true;
       }
@@ -99,7 +103,9 @@ describe('chrome nav apis', function () {
         return l;
       });
 
-      const { chrome, internals } = init({ appUrlStore, nav });
+      const {
+        internals
+      } = init({ appUrlStore, nav });
 
       internals.trackPossibleSubUrl('https://localhost:9200/app/kibana#dashboard?_g=globalstate');
       expect(internals.nav[0].lastSubUrl).to.be('https://localhost:9200/app/kibana#discover?_g=globalstate');
diff --git a/src/ui/public/chrome/api/angular.js b/src/ui/public/chrome/api/angular.js
index 5755dafff9166..816658768fe71 100644
--- a/src/ui/public/chrome/api/angular.js
+++ b/src/ui/public/chrome/api/angular.js
@@ -12,7 +12,7 @@ module.exports = function (chrome, internals) {
   chrome.getBreadcrumbs = _.noop;
 
   chrome.setupAngular = function () {
-    let kibana = modules.get('kibana');
+    const kibana = modules.get('kibana');
 
     _.forOwn(chrome.getInjected(), function (val, name) {
       kibana.value(name, val);
@@ -27,7 +27,7 @@ module.exports = function (chrome, internals) {
     .value('sessionId', Date.now())
     .value('chrome', chrome)
     .value('esUrl', (function () {
-      let a = document.createElement('a');
+      const a = document.createElement('a');
       a.href = chrome.addBasePath('/elasticsearch');
       return a.href;
     }()))
@@ -43,7 +43,7 @@ module.exports = function (chrome, internals) {
       };
 
       chrome.getBreadcrumbs = () => {
-        let path = $location.path();
+        const path = $location.path();
         let length = path.length - 1;
 
         // trim trailing slash
@@ -58,7 +58,7 @@ module.exports = function (chrome, internals) {
 
       const notify = new Notifier();
       const urlOverflow = Private(UrlOverflowServiceProvider);
-      const check = (event) => {
+      const check = () => {
         if ($location.path() === '/error/url-overflow') return;
 
         try {
diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js
index f66db80a634e5..d5856e59b37d5 100644
--- a/src/ui/public/chrome/api/nav.js
+++ b/src/ui/public/chrome/api/nav.js
@@ -1,5 +1,5 @@
 import { parse, format } from 'url';
-import { startsWith, isString, find } from 'lodash';
+import { startsWith, isString } from 'lodash';
 
 export default function (chrome, internals) {
   chrome.getNavLinks = function () {
@@ -19,10 +19,10 @@ export default function (chrome, internals) {
   };
 
   chrome.addBasePath = function (url) {
-    let isUrl = url && isString(url);
+    const isUrl = url && isString(url);
     if (!isUrl) return url;
 
-    let parsed = parse(url, true, true);
+    const parsed = parse(url, true, true);
     if (!parsed.host && parsed.pathname) {
       if (parsed.pathname[0] === '/') {
         parsed.pathname = chrome.getBasePath() + parsed.pathname;
@@ -126,7 +126,7 @@ export default function (chrome, internals) {
 
   internals.nav.forEach(link => {
     // convert all link urls to absolute urls
-    let a = document.createElement('a');
+    const a = document.createElement('a');
     a.setAttribute('href', link.url);
     link.url = a.href;
   });
@@ -134,4 +134,4 @@ export default function (chrome, internals) {
   // simulate a possible change in url to initialize the
   // link.active and link.lastUrl properties
   internals.trackPossibleSubUrl(document.location.href);
-};
+}
diff --git a/src/ui/public/chrome/api/template.js b/src/ui/public/chrome/api/template.js
index 2f8cc486fc2dc..762207897282d 100644
--- a/src/ui/public/chrome/api/template.js
+++ b/src/ui/public/chrome/api/template.js
@@ -1,5 +1,3 @@
-import _ from 'lodash';
-
 module.exports = function (chrome, internals) {
 
   /**
diff --git a/src/ui/public/chrome/api/theme.js b/src/ui/public/chrome/api/theme.js
index 192239cd91488..f2fee099ad015 100644
--- a/src/ui/public/chrome/api/theme.js
+++ b/src/ui/public/chrome/api/theme.js
@@ -81,8 +81,8 @@ module.exports = function (chrome, internals) {
    * @return {chrome}
    */
   chrome.removeApplicationClass = function (val) {
-    let classesToRemove = [].concat(val || []);
-    let classes = internals.applicationClasses || [];
+    const classesToRemove = [].concat(val || []);
+    const classes = internals.applicationClasses || [];
     _.pull(classes, ...classesToRemove);
 
     internals.applicationClasses = classes;
diff --git a/src/ui/public/chrome/directives/append_nav_controls.js b/src/ui/public/chrome/directives/append_nav_controls.js
index 1433ec0654428..92414364a16f6 100644
--- a/src/ui/public/chrome/directives/append_nav_controls.js
+++ b/src/ui/public/chrome/directives/append_nav_controls.js
@@ -1,9 +1,7 @@
-import $ from 'jquery';
-
 import chromeNavControlsRegistry from 'ui/registry/chrome_nav_controls';
 import UiModules from 'ui/modules';
 
-export default function (chrome, internals) {
+export default function () {
 
   UiModules
   .get('kibana')
diff --git a/src/ui/public/chrome/directives/global_nav/app_switcher/__tests__/app_switcher.js b/src/ui/public/chrome/directives/global_nav/app_switcher/__tests__/app_switcher.js
index 3f0dac3370d89..67dd85a206b5e 100644
--- a/src/ui/public/chrome/directives/global_nav/app_switcher/__tests__/app_switcher.js
+++ b/src/ui/public/chrome/directives/global_nav/app_switcher/__tests__/app_switcher.js
@@ -4,9 +4,7 @@ import expect from 'expect.js';
 
 import DomLocationProvider from 'ui/dom_location';
 import { constant } from 'lodash';
-import { set } from 'lodash';
 import { cloneDeep } from 'lodash';
-import { indexBy } from 'lodash';
 import $ from 'jquery';
 import 'ui/chrome';
 import '../app_switcher';
@@ -18,7 +16,7 @@ describe('appSwitcher directive', function () {
 
   function setup(href, links) {
     return ngMock.inject(function ($window, $rootScope, $compile, Private) {
-      let domLocation = Private(DomLocationProvider);
+      const domLocation = Private(DomLocationProvider);
 
       $rootScope.chrome = {
         getNavLinks: constant(cloneDeep(links)),
@@ -46,14 +44,14 @@ describe('appSwitcher directive', function () {
   }
 
   context('when one link is for the active app', function () {
-    let myLink = {
+    const myLink = {
       active: true,
       title: 'myLink',
       url: 'http://localhost:555/app/myApp',
       lastSubUrl: 'http://localhost:555/app/myApp#/lastSubUrl'
     };
 
-    let notMyLink = {
+    const notMyLink = {
       active: false,
       title: 'notMyLink',
       url: 'http://localhost:555/app/notMyApp',
@@ -63,27 +61,27 @@ describe('appSwitcher directive', function () {
     beforeEach(setup('http://localhost:5555/app/myApp/', [myLink, notMyLink]));
 
     it('links to the inactive apps base url', function () {
-      let $myLink = env.$el.findTestSubject('appLink').eq(0);
+      const $myLink = env.$el.findTestSubject('appLink').eq(0);
       expect($myLink.prop('href')).to.be(myLink.url);
       expect($myLink.prop('href')).to.not.be(myLink.lastSubUrl);
     });
 
     it('links to the inactive apps last sub url', function () {
-      let $notMyLink = env.$el.findTestSubject('appLink').eq(1);
+      const $notMyLink = env.$el.findTestSubject('appLink').eq(1);
       expect($notMyLink.prop('href')).to.be(notMyLink.lastSubUrl);
       expect($notMyLink.prop('href')).to.not.be(notMyLink.url);
     });
   });
 
   context('when none of the links are for the active app', function () {
-    let myLink = {
+    const myLink = {
       active: false,
       title: 'myLink',
       url: 'http://localhost:555/app/myApp',
       lastSubUrl: 'http://localhost:555/app/myApp#/lastSubUrl'
     };
 
-    let notMyLink = {
+    const notMyLink = {
       active: false,
       title: 'notMyLink',
       url: 'http://localhost:555/app/notMyApp',
@@ -93,9 +91,9 @@ describe('appSwitcher directive', function () {
     beforeEach(setup('http://localhost:5555/app/myApp/', [myLink, notMyLink]));
 
     it('links to the lastSubUrl for each', function () {
-      let $links = env.$el.findTestSubject('appLink');
-      let $myLink = $links.eq(0);
-      let $notMyLink = $links.eq(1);
+      const $links = env.$el.findTestSubject('appLink');
+      const $myLink = $links.eq(0);
+      const $notMyLink = $links.eq(1);
 
       expect($myLink.prop('href')).to.be(myLink.lastSubUrl);
       expect($myLink.prop('href')).to.not.be(myLink.url);
@@ -106,19 +104,19 @@ describe('appSwitcher directive', function () {
   });
 
   context('clicking a link with matching href but missing hash', function () {
-    let url = 'http://localhost:555/app/myApp?query=1';
+    const url = 'http://localhost:555/app/myApp?query=1';
     beforeEach(setup(url + '#/lastSubUrl', [
       { url: url }
     ]));
 
     it('just prevents propogation (no reload)', function () {
-      let event = new $.Event('click');
+      const event = new $.Event('click');
 
       expect(env.location.reload.callCount).to.be(0);
       expect(event.isDefaultPrevented()).to.be(false);
       expect(event.isPropagationStopped()).to.be(false);
 
-      let $link = env.$el.findTestSubject('appLink');
+      const $link = env.$el.findTestSubject('appLink');
       expect($link.prop('href')).to.be(url);
       $link.trigger(event);
 
@@ -129,19 +127,19 @@ describe('appSwitcher directive', function () {
   });
 
   context('clicking a link that matches entire url', function () {
-    let url = 'http://localhost:555/app/myApp#/lastSubUrl';
+    const url = 'http://localhost:555/app/myApp#/lastSubUrl';
     beforeEach(setup(url, [
       { url: url }
     ]));
 
     it('calls window.location.reload and prevents propogation', function () {
-      let event = new $.Event('click');
+      const event = new $.Event('click');
 
       expect(env.location.reload.callCount).to.be(0);
       expect(event.isDefaultPrevented()).to.be(false);
       expect(event.isPropagationStopped()).to.be(false);
 
-      let $link = env.$el.findTestSubject('appLink');
+      const $link = env.$el.findTestSubject('appLink');
       expect($link.prop('href')).to.be(env.currentHref);
       $link.trigger(event);
 
@@ -152,21 +150,21 @@ describe('appSwitcher directive', function () {
   });
 
   context('clicking a link with matching href but changed hash', function () {
-    let rootUrl = 'http://localhost:555/app/myApp?query=1';
-    let url = rootUrl + '#/lastSubUrl2';
+    const rootUrl = 'http://localhost:555/app/myApp?query=1';
+    const url = rootUrl + '#/lastSubUrl2';
 
     beforeEach(setup(url + '#/lastSubUrl', [
       { url: url }
     ]));
 
     it('calls window.location.reload and prevents propogation', function () {
-      let event = new $.Event('click');
+      const event = new $.Event('click');
 
       expect(env.location.reload.callCount).to.be(0);
       expect(event.isDefaultPrevented()).to.be(false);
       expect(event.isPropagationStopped()).to.be(false);
 
-      let $link = env.$el.findTestSubject('appLink');
+      const $link = env.$el.findTestSubject('appLink');
       expect($link.prop('href')).to.be(url);
       $link.trigger(event);
 
@@ -185,7 +183,7 @@ describe('appSwitcher directive', function () {
     ]));
 
     it('allows click through', function () {
-      let event = new $.Event('click');
+      const event = new $.Event('click');
 
       expect(env.location.reload.callCount).to.be(0);
       expect(event.isPropagationStopped()).to.be(false);
@@ -206,7 +204,7 @@ describe('appSwitcher directive', function () {
     ]));
 
     it('allows click through', function () {
-      let event = new $.Event('click');
+      const event = new $.Event('click');
 
       expect(env.location.reload.callCount).to.be(0);
       expect(event.isPropagationStopped()).to.be(false);
diff --git a/src/ui/public/chrome/directives/global_nav/app_switcher/app_switcher.js b/src/ui/public/chrome/directives/global_nav/app_switcher/app_switcher.js
index db05b415c6a45..fa356b1694235 100644
--- a/src/ui/public/chrome/directives/global_nav/app_switcher/app_switcher.js
+++ b/src/ui/public/chrome/directives/global_nav/app_switcher/app_switcher.js
@@ -1,6 +1,5 @@
 import DomLocationProvider from 'ui/dom_location';
 import { parse } from 'url';
-import { bindKey } from 'lodash';
 import uiModules from 'ui/modules';
 import appSwitcherTemplate from './app_switcher.html';
 
diff --git a/src/ui/public/chrome/directives/global_nav/global_nav_link/__tests__/global_nav_link.js b/src/ui/public/chrome/directives/global_nav/global_nav_link/__tests__/global_nav_link.js
index 54254736724e4..e9c11fd68662d 100644
--- a/src/ui/public/chrome/directives/global_nav/global_nav_link/__tests__/global_nav_link.js
+++ b/src/ui/public/chrome/directives/global_nav/global_nav_link/__tests__/global_nav_link.js
@@ -43,7 +43,7 @@ describe('globalNavLink directive', () => {
   describe('interface', () => {
 
     describe('isActive attribute', () => {
-      it(`doesn't apply the active class when false`, () => {
+      it('doesn\'t apply the active class when false', () => {
         const element = create({
           isActive: false,
         });
@@ -59,7 +59,7 @@ describe('globalNavLink directive', () => {
     });
 
     describe('isDisabled attribute', () => {
-      it(`doesn't apply the is-global-nav-link-disabled class when false`, () => {
+      it('doesn\'t apply the is-global-nav-link-disabled class when false', () => {
         const element = create({
           isDisabled: false,
         });
@@ -107,7 +107,7 @@ describe('globalNavLink directive', () => {
     });
 
     describe('kbnRoute attribute', () => {
-      it(`is applied to the link when href isn't defined`, () => {
+      it('is applied to the link when href isn\'t defined', () => {
         const attrs = {
           kbnRoute: '#test',
         };
@@ -116,7 +116,7 @@ describe('globalNavLink directive', () => {
         expect(link.attr('href')).to.be(attrs.kbnRoute);
       });
 
-      it(`isn't applied to the link when href is defined`, () => {
+      it('isn\'t applied to the link when href is defined', () => {
         const attrs = {
           href: 'link to a website',
           kbnRoute: '#test',
@@ -147,7 +147,7 @@ describe('globalNavLink directive', () => {
           expect(placeholder.length).to.be(0);
         });
 
-        it(`is set as the img src`, () => {
+        it('is set as the img src', () => {
           const attrs = {
             icon: 'icon url',
           };
@@ -176,7 +176,7 @@ describe('globalNavLink directive', () => {
           expect(placeholder.length).to.be(1);
         });
 
-        it(`uses the title's first letter as the placeholder`, () => {
+        it('uses the title\'s first letter as the placeholder', () => {
           const attrs = {
             icon: undefined,
             title: 'Xyz',
diff --git a/src/ui/public/chrome/directives/kbn_chrome.js b/src/ui/public/chrome/directives/kbn_chrome.js
index 1b191dda6809a..49b460d3ee985 100644
--- a/src/ui/public/chrome/directives/kbn_chrome.js
+++ b/src/ui/public/chrome/directives/kbn_chrome.js
@@ -13,9 +13,9 @@ export default function (chrome, internals) {
 
   UiModules
   .get('kibana')
-  .directive('kbnChrome', $rootScope => {
+  .directive('kbnChrome', () => {
     return {
-      template($el) {
+      template() {
         const $content = $(require('./kbn_chrome.html'));
         const $app = $content.find('.application');
 
diff --git a/src/ui/public/chrome/directives/loading_indicator/loading_indicator.js b/src/ui/public/chrome/directives/loading_indicator/loading_indicator.js
index eae4d5272a712..8ecdb079d260d 100644
--- a/src/ui/public/chrome/directives/loading_indicator/loading_indicator.js
+++ b/src/ui/public/chrome/directives/loading_indicator/loading_indicator.js
@@ -1,11 +1,10 @@
 import UiModules from 'ui/modules';
-import angular from 'angular';
 import template from './loading_indicator.html';
 import './loading_indicator.less';
 
 UiModules
 .get('ui/kibana')
-.directive('kbnLoadingIndicator', function ($compile) {
+.directive('kbnLoadingIndicator', function () {
   return {
     restrict: 'E',
     replace: true,
diff --git a/src/ui/public/chrome/services/global_nav_state.js b/src/ui/public/chrome/services/global_nav_state.js
index 51e6a88798401..16e4d69fa9579 100644
--- a/src/ui/public/chrome/services/global_nav_state.js
+++ b/src/ui/public/chrome/services/global_nav_state.js
@@ -1,6 +1,5 @@
 
 import modules from 'ui/modules';
-import angular from 'angular';
 
 modules.get('kibana')
 .service('globalNavState', (localStorage, $rootScope) => {
diff --git a/src/ui/public/collapsible_sidebar/collapsible_sidebar.js b/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
index d19a70af9643e..fb99712ac49f7 100644
--- a/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
+++ b/src/ui/public/collapsible_sidebar/collapsible_sidebar.js
@@ -8,15 +8,15 @@ uiModules
 .get('kibana')
 .directive('collapsibleSidebar', function () {
   // simply a list of all of all of angulars .col-md-* classes except 12
-  let listOfWidthClasses = _.times(11, function (i) { return 'col-md-' + i; });
+  const listOfWidthClasses = _.times(11, function (i) { return 'col-md-' + i; });
 
   return {
     restrict: 'C',
     link: function ($scope, $elem) {
-      let $collapser = $('<div class="sidebar-collapser"><div class="chevron-cont"></div></div>');
-      let $siblings = $elem.siblings();
+      const $collapser = $('<div class="sidebar-collapser"><div class="chevron-cont"></div></div>');
+      const $siblings = $elem.siblings();
 
-      let siblingsClass = listOfWidthClasses.reduce(function (prev, className) {
+      const siblingsClass = listOfWidthClasses.reduce(function (prev, className) {
         if (prev) return prev;
         return $siblings.hasClass(className) && className;
       }, false);
diff --git a/src/ui/public/config/__tests__/config.js b/src/ui/public/config/__tests__/config.js
index 929693d926f45..1151d88d8dba5 100644
--- a/src/ui/public/config/__tests__/config.js
+++ b/src/ui/public/config/__tests__/config.js
@@ -6,7 +6,7 @@ describe('config component', function () {
   let $scope;
 
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function ($injector, Private) {
+  beforeEach(ngMock.inject(function ($injector) {
     config = $injector.get('config');
     $scope = $injector.get('$rootScope');
   }));
diff --git a/src/ui/public/config/_delayed_updater.js b/src/ui/public/config/_delayed_updater.js
index fd04d61ed6136..01f2e00f8e1b7 100644
--- a/src/ui/public/config/_delayed_updater.js
+++ b/src/ui/public/config/_delayed_updater.js
@@ -27,8 +27,8 @@ export default function DelayedUpdaterFactory($http, chrome, Promise) {
     unsavedChanges = {};
 
     persist(changes)
-      .then(result => settle(promises, `resolve`, result))
-      .catch(reason => settle(promises, `reject`, reason));
+      .then(result => settle(promises, 'resolve', result))
+      .catch(reason => settle(promises, 'reject', reason));
   }
 
   function settle(listeners, decision, data) {
@@ -47,15 +47,15 @@ export default function DelayedUpdaterFactory($http, chrome, Promise) {
   }
 
   function remove(key) {
-    return sync(`delete`, { postfix: `/${key}` });
+    return sync('delete', { postfix: `/${key}` });
   }
 
   function edit(key, value) {
-    return sync(`post`, { postfix: `/${key}`, data: { value } });
+    return sync('post', { postfix: `/${key}`, data: { value } });
   }
 
   function editMany(changes) {
-    return sync(`post`, { data: { changes } });
+    return sync('post', { data: { changes } });
   }
 
   function sync(method, { postfix = '', data } = {}) {
@@ -65,4 +65,4 @@ export default function DelayedUpdaterFactory($http, chrome, Promise) {
       data
     });
   }
-};
+}
diff --git a/src/ui/public/config/config.js b/src/ui/public/config/config.js
index 265e0b5dd6afe..d10bad930b036 100644
--- a/src/ui/public/config/config.js
+++ b/src/ui/public/config/config.js
@@ -1,15 +1,14 @@
 import angular from 'angular';
-import { once, cloneDeep, defaultsDeep, isPlainObject } from 'lodash';
-import uiRoutes from 'ui/routes';
+import { cloneDeep, defaultsDeep, isPlainObject } from 'lodash';
 import uiModules from 'ui/modules';
 import Notifier from 'ui/notify/notifier';
 import ConfigDelayedUpdaterProvider from 'ui/config/_delayed_updater';
 const module = uiModules.get('kibana/config');
 
 // service for delivering config variables to everywhere else
-module.service(`config`, function (Private, $rootScope, $http, chrome, uiSettings) {
+module.service('config', function (Private, $rootScope, $http, chrome, uiSettings) {
   const config = this;
-  const notify = new Notifier({ location: `Config` });
+  const notify = new Notifier({ location: 'Config' });
   const { defaults, user: initialUserSettings } = uiSettings;
   const delayedUpdate = Private(ConfigDelayedUpdaterProvider);
   let settings = mergeSettings(defaults, initialUserSettings);
@@ -55,7 +54,7 @@ any custom setting configuration watchers for "${key}" may fix this issue.`);
   function watchAll(scope = $rootScope, fn) {
     const update = (e, ...args) => fn(...args);
     fn(null, null, null, config);
-    return scope.$on(`change:config`, update);
+    return scope.$on('change:config', update);
   }
 
   function change(key, value) {
@@ -99,7 +98,7 @@ any custom setting configuration watchers for "${key}" may fix this issue.`);
     const newVal = config.get(key);
     notify.log(`config change: ${key}: ${oldVal} -> ${newVal}`);
     $rootScope.$broadcast(`change:config.${key}`, newVal, oldVal, key, config);
-    $rootScope.$broadcast(`change:config`,        newVal, oldVal, key, config);
+    $rootScope.$broadcast('change:config',        newVal, oldVal, key, config);
   }
 
   function nullOrEmpty(value) {
diff --git a/src/ui/public/courier/_error_handlers.js b/src/ui/public/courier/_error_handlers.js
index 6b8193f616045..dbb30e30deb7e 100644
--- a/src/ui/public/courier/_error_handlers.js
+++ b/src/ui/public/courier/_error_handlers.js
@@ -5,4 +5,4 @@ export default function ErrorHandlerList() {
    * @type {Array}
    */
   return [];
-};
+}
diff --git a/src/ui/public/courier/_redirect_when_missing.js b/src/ui/public/courier/_redirect_when_missing.js
index b86c75cba4129..64178f084eb3a 100644
--- a/src/ui/public/courier/_redirect_when_missing.js
+++ b/src/ui/public/courier/_redirect_when_missing.js
@@ -1,9 +1,9 @@
 import errors from 'ui/errors';
 
 export default function RedirectWhenMissingFn($location, kbnUrl, Notifier, Promise) {
-  let SavedObjectNotFound = errors.SavedObjectNotFound;
+  const SavedObjectNotFound = errors.SavedObjectNotFound;
 
-  let notify = new Notifier();
+  const notify = new Notifier();
 
   /**
    * Creates an error handler that will redirect to a url when a SavedObjectNotFound
@@ -32,4 +32,4 @@ export default function RedirectWhenMissingFn($location, kbnUrl, Notifier, Promi
       return Promise.halt();
     };
   };
-};
+}
diff --git a/src/ui/public/courier/_request_queue.js b/src/ui/public/courier/_request_queue.js
index b6dba26b187f1..abd85e6f07a14 100644
--- a/src/ui/public/courier/_request_queue.js
+++ b/src/ui/public/courier/_request_queue.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 export default function PendingRequestList() {
 
   /**
@@ -6,7 +5,7 @@ export default function PendingRequestList() {
    * they are processed by fetch.[sourceType]().
    * @type {Array}
    */
-  let queue = [];
+  const queue = [];
 
   queue.getInactive = function (/* strategies */) {
     return queue.get.apply(queue, arguments)
@@ -33,4 +32,4 @@ export default function PendingRequestList() {
   };
 
   return queue;
-};
+}
diff --git a/src/ui/public/courier/courier.js b/src/ui/public/courier/courier.js
index 4e09d24a8ef82..098cf88eb8e24 100644
--- a/src/ui/public/courier/courier.js
+++ b/src/ui/public/courier/courier.js
@@ -1,6 +1,5 @@
 import _ from 'lodash';
 
-import errors from 'ui/errors';
 import 'ui/es';
 import 'ui/promises';
 import 'ui/safe_confirm';
@@ -12,7 +11,6 @@ import DocSourceProvider from './data_source/doc_source';
 import SearchSourceProvider from './data_source/search_source';
 import SearchStrategyProvider from './fetch/strategy/search';
 import RequestQueueProvider from './_request_queue';
-import ErrorHandlersProvider from './_error_handlers';
 import FetchProvider from './fetch';
 import DocLooperProvider from './looper/doc';
 import SearchLooperProvider from './looper/search';
@@ -24,18 +22,17 @@ import RedirectWhenMissingProvider from './_redirect_when_missing';
 uiModules.get('kibana/courier')
 .service('courier', function ($rootScope, Private, Promise, indexPatterns) {
   function Courier() {
-    let self = this;
+    const self = this;
 
-    let DocSource = Private(DocSourceProvider);
-    let SearchSource = Private(SearchSourceProvider);
-    let searchStrategy = Private(SearchStrategyProvider);
+    const DocSource = Private(DocSourceProvider);
+    const SearchSource = Private(SearchSourceProvider);
+    const searchStrategy = Private(SearchStrategyProvider);
 
-    let requestQueue = Private(RequestQueueProvider);
-    let errorHandlers = Private(ErrorHandlersProvider);
+    const requestQueue = Private(RequestQueueProvider);
 
-    let fetch = Private(FetchProvider);
-    let docLooper = self.docLooper = Private(DocLooperProvider);
-    let searchLooper = self.searchLooper = Private(SearchLooperProvider);
+    const fetch = Private(FetchProvider);
+    const docLooper = self.docLooper = Private(DocLooperProvider);
+    const searchLooper = self.searchLooper = Private(SearchLooperProvider);
 
     // expose some internal modules
     self.setRootSearchSource = Private(RootSearchSourceProvider).set;
@@ -47,8 +44,6 @@ uiModules.get('kibana/courier')
     self.DocSource = DocSource;
     self.SearchSource = SearchSource;
 
-    let HastyRefresh = errors.HastyRefresh;
-
     /**
      * update the time between automatic search requests
      *
@@ -135,8 +130,8 @@ uiModules.get('kibana/courier')
 
     // Listen for refreshInterval changes
     $rootScope.$watchCollection('timefilter.refreshInterval', function () {
-      let refreshValue = _.get($rootScope, 'timefilter.refreshInterval.value');
-      let refreshPause = _.get($rootScope, 'timefilter.refreshInterval.pause');
+      const refreshValue = _.get($rootScope, 'timefilter.refreshInterval.value');
+      const refreshPause = _.get($rootScope, 'timefilter.refreshInterval.pause');
       if (_.isNumber(refreshValue) && !refreshPause) {
         self.fetchInterval(refreshValue);
       } else {
@@ -144,7 +139,7 @@ uiModules.get('kibana/courier')
       }
     });
 
-    let onFatalDefer = Promise.defer();
+    const onFatalDefer = Promise.defer();
     onFatalDefer.promise.then(self.close);
     Notifier.fatalCallbacks.push(onFatalDefer.resolve);
   }
diff --git a/src/ui/public/courier/data_source/__tests__/decorate_query.js b/src/ui/public/courier/data_source/__tests__/decorate_query.js
index adae8151b2dcb..4054f02720065 100644
--- a/src/ui/public/courier/data_source/__tests__/decorate_query.js
+++ b/src/ui/public/courier/data_source/__tests__/decorate_query.js
@@ -1,24 +1,17 @@
-import moment from 'moment';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import _ from 'lodash';
 import DecorateQueryProvider from 'ui/courier/data_source/_decorate_query';
 
 describe('Query decorator', function () {
-
   let config;
 
-  let indexPattern;
-
-  let getComputedFields;
-
   let fn;
   beforeEach(ngMock.module(
     'kibana',
     function ($provide) {
       // Super simple config stub
       $provide.service('config', function () {
-        let keys = {};
+        const keys = {};
         return {
           get: function (key) { return keys[key]; },
           set: function (key, value) { keys[key] = value; }
@@ -37,8 +30,7 @@ describe('Query decorator', function () {
   });
 
   it('should merge in the query string options', function () {
-    config.set('query:queryString:options', {analyze_wildcard: true});
-    expect(fn({query_string: {query: '*'}})).to.eql({query_string: {query: '*', analyze_wildcard: true}});
+    config.set('query:queryString:options', { analyze_wildcard: true });
+    expect(fn({ query_string: { query: '*' } })).to.eql({ query_string: { query: '*', analyze_wildcard: true } });
   });
-
 });
diff --git a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
index 061e73e7adfe8..8ed3ab799dc40 100644
--- a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
+++ b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
@@ -24,37 +24,37 @@ describe('SearchSource#normalizeSortRequest', function () {
   }));
 
   it('should return an array', function () {
-    let sortable = { someField: 'desc'};
-    let result = normalizeSortRequest(sortable, indexPattern);
+    const sortable = { someField: 'desc' };
+    const result = normalizeSortRequest(sortable, indexPattern);
     expect(result).to.be.an(Array);
     expect(result).to.eql(normalizedSort);
     // ensure object passed in is not mutated
     expect(result[0]).to.not.be.equal(sortable);
-    expect(sortable).to.eql({ someField: 'desc'});
+    expect(sortable).to.eql({ someField: 'desc' });
   });
 
   it('should make plain string sort into the more verbose format', function () {
-    let result = normalizeSortRequest([{ someField: 'desc'}], indexPattern);
+    const result = normalizeSortRequest([{ someField: 'desc' }], indexPattern);
     expect(result).to.eql(normalizedSort);
   });
 
   it('should append default sort options', function () {
-    let sortState = [{
+    const sortState = [{
       someField: {
         order: 'desc',
         unmapped_type: 'boolean'
       }
     }];
-    let result = normalizeSortRequest(sortState, indexPattern);
+    const result = normalizeSortRequest(sortState, indexPattern);
     expect(result).to.eql(normalizedSort);
   });
 
   it('should enable script based sorting', function () {
-    let fieldName = 'script string';
-    let direction = 'desc';
-    let indexField = indexPattern.fields.byName[fieldName];
+    const fieldName = 'script string';
+    const direction = 'desc';
+    const indexField = indexPattern.fields.byName[fieldName];
 
-    let sortState = {};
+    const sortState = {};
     sortState[fieldName] = direction;
     normalizedSort = {
       _script: {
@@ -76,31 +76,30 @@ describe('SearchSource#normalizeSortRequest', function () {
   });
 
   it('should use script based sorting only on sortable types', function () {
-    let fieldName = 'script murmur3';
-    let direction = 'asc';
-    let indexField = indexPattern.fields.byName[fieldName];
+    const fieldName = 'script murmur3';
+    const direction = 'asc';
 
-    let sortState = {};
+    const sortState = {};
     sortState[fieldName] = direction;
     normalizedSort = {};
     normalizedSort[fieldName] = {
       order: direction,
       unmapped_type: 'boolean'
     };
-    let result = normalizeSortRequest([sortState], indexPattern);
+    const result = normalizeSortRequest([sortState], indexPattern);
 
     expect(result).to.eql([normalizedSort]);
   });
 
   it('should remove unmapped_type parameter from _score sorting', function () {
-    let sortable = { _score: 'desc'};
-    let expected = [{
+    const sortable = { _score: 'desc' };
+    const expected = [{
       _score: {
         order: 'desc'
       }
     }];
 
-    let result = normalizeSortRequest(sortable, indexPattern);
+    const result = normalizeSortRequest(sortable, indexPattern);
     expect(_.isEqual(result, expected)).to.be.ok();
 
   });
diff --git a/src/ui/public/courier/data_source/_abstract.js b/src/ui/public/courier/data_source/_abstract.js
index 0b6832f876ebe..4b811d88052a1 100644
--- a/src/ui/public/courier/data_source/_abstract.js
+++ b/src/ui/public/courier/data_source/_abstract.js
@@ -10,13 +10,13 @@ import DecorateQueryProvider from './_decorate_query';
 import FieldWildcardProvider from '../../field_wildcard';
 
 export default function SourceAbstractFactory(Private, Promise, PromiseEmitter) {
-  let requestQueue = Private(RequestQueueProvider);
-  let errorHandlers = Private(ErrorHandlersProvider);
-  let courierFetch = Private(FetchProvider);
-  let { fieldWildcardFilter } = Private(FieldWildcardProvider);
+  const requestQueue = Private(RequestQueueProvider);
+  const errorHandlers = Private(ErrorHandlersProvider);
+  const courierFetch = Private(FetchProvider);
+  const { fieldWildcardFilter } = Private(FieldWildcardProvider);
 
   function SourceAbstract(initialState, strategy) {
-    let self = this;
+    const self = this;
     self._instanceid = _.uniqueId('data_source');
 
     self._state = (function () {
@@ -81,7 +81,7 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
    *   string of the state value to set
    */
   SourceAbstract.prototype.set = function (state, val) {
-    let self = this;
+    const self = this;
 
     if (typeof state === 'string') {
       // the getter and setter methods check for undefined explicitly
@@ -127,7 +127,7 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
    * @return {Promise}
    */
   SourceAbstract.prototype.onResults = function (handler) {
-    let self = this;
+    const self = this;
 
     return new PromiseEmitter(function (resolve, reject) {
       const defer = Promise.defer();
@@ -151,7 +151,7 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
    * @return {Promise}
    */
   SourceAbstract.prototype.onError = function (handler) {
-    let self = this;
+    const self = this;
 
     return new PromiseEmitter(function (resolve, reject) {
       const defer = Promise.defer();
@@ -174,7 +174,7 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
    * @async
    */
   SourceAbstract.prototype.fetch = function () {
-    let self = this;
+    const self = this;
     let req = _.first(self._myStartableQueued());
 
     if (!req) {
@@ -234,13 +234,13 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
    * @resolved {Object|null} - the flat state of the SourceAbstract
    */
   SourceAbstract.prototype._flatten = function () {
-    let type = this._getType();
+    const type = this._getType();
 
     // the merged state of this dataSource and it's ancestors
-    let flatState = {};
+    const flatState = {};
 
     // function used to write each property from each state object in the chain to flat state
-    let root = this;
+    const root = this;
 
     // start the chain at this source
     let current = this;
@@ -257,12 +257,12 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
           });
         }
 
-        let prom = root._mergeProp(flatState, value, key);
+        const prom = root._mergeProp(flatState, value, key);
         return Promise.is(prom) ? prom : null;
       }))
       .then(function () {
         // move to this sources parent
-        let parent = current.getParent();
+        const parent = current.getParent();
         // keep calling until we reach the top parent
         if (parent) {
           current = parent;
@@ -273,7 +273,7 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
     .then(function () {
       if (type === 'search') {
         // This is down here to prevent the circular dependency
-        let decorateQuery = Private(DecorateQueryProvider);
+        const decorateQuery = Private(DecorateQueryProvider);
 
         flatState.body = flatState.body || {};
 
@@ -285,7 +285,7 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
         }
 
         if (flatState.body.size > 0) {
-          let computedFields = flatState.index.getComputedFields();
+          const computedFields = flatState.index.getComputedFields();
           flatState.body.stored_fields = computedFields.storedFields;
           flatState.body.script_fields = flatState.body.script_fields || {};
           flatState.body.docvalue_fields = flatState.body.docvalue_fields || [];
@@ -309,7 +309,7 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
          *                          through otherwise it will filter out
          * @returns {function}
          */
-        let filterNegate = function (reverse) {
+        const filterNegate = function (reverse) {
           return function (filter) {
             if (_.isUndefined(filter.meta) || _.isUndefined(filter.meta.negate)) return !reverse;
             return filter.meta && filter.meta.negate === reverse;
@@ -321,7 +321,7 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
         * @param  {Object} filter - The filter to translate
         * @return {Object} the query version of that filter
         */
-        let translateToQuery = function (filter) {
+        const translateToQuery = function (filter) {
           if (!filter) return;
 
           if (filter.query) {
@@ -336,7 +336,7 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
          * @param {object} filter The filter to clean
          * @returns {object}
          */
-        let cleanFilter = function (filter) {
+        const cleanFilter = function (filter) {
           return _.omit(filter, ['meta']);
         };
 
@@ -396,4 +396,4 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
   };
 
   return SourceAbstract;
-};
+}
diff --git a/src/ui/public/courier/data_source/_decorate_query.js b/src/ui/public/courier/data_source/_decorate_query.js
index bb6fca29200b6..deb8ee907857d 100644
--- a/src/ui/public/courier/data_source/_decorate_query.js
+++ b/src/ui/public/courier/data_source/_decorate_query.js
@@ -7,7 +7,7 @@ export default function DecorateQuery(config) {
    * @returns {object}
    */
   return function (query) {
-    let queryOptions = config.get('query:queryString:options');
+    const queryOptions = config.get('query:queryString:options');
 
     if (_.has(query, 'query_string.query')) {
       _.extend(query.query_string, queryOptions);
@@ -15,4 +15,4 @@ export default function DecorateQuery(config) {
 
     return query;
   };
-};
+}
diff --git a/src/ui/public/courier/data_source/_doc_send_to_es.js b/src/ui/public/courier/data_source/_doc_send_to_es.js
index f7191b03100a9..8838059c9b350 100644
--- a/src/ui/public/courier/data_source/_doc_send_to_es.js
+++ b/src/ui/public/courier/data_source/_doc_send_to_es.js
@@ -12,8 +12,8 @@ import RequestQueueProvider from 'ui/courier/_request_queue';
 import FetchProvider from 'ui/courier/fetch/fetch';
 
 export default function (Promise, Private, es) {
-  let requestQueue = Private(RequestQueueProvider);
-  let courierFetch = Private(FetchProvider);
+  const requestQueue = Private(RequestQueueProvider);
+  const courierFetch = Private(FetchProvider);
 
   /**
    * Backend for doUpdate and doIndex
@@ -23,9 +23,9 @@ export default function (Promise, Private, es) {
    * @param  {String} body - HTTP request body
    */
   return function (method, validateVersion, body, ignore) {
-    let doc = this;
+    const doc = this;
     // straight assignment will causes undefined values
-    let params = _.pick(this._state, ['id', 'type', 'index']);
+    const params = _.pick(this._state, ['id', 'type', 'index']);
     params.body = body;
     params.ignore = ignore || [409];
 
@@ -58,13 +58,13 @@ export default function (Promise, Private, es) {
       // notify pending request for this same document that we have updates
       docFetchProm.then(function (fetchResp) {
         // use the key to compair sources
-        let key = doc._versionKey();
+        const key = doc._versionKey();
 
         // clear the queue and filter out the removed items, pushing the
         // unmatched ones back in.
-        let respondTo = requestQueue.splice(0).filter(function (req) {
-          let isDoc = req.source._getType() === 'doc';
-          let keyMatches = isDoc && req.source._versionKey() === key;
+        const respondTo = requestQueue.splice(0).filter(function (req) {
+          const isDoc = req.source._getType() === 'doc';
+          const keyMatches = isDoc && req.source._versionKey() === key;
 
           // put some request back into the queue
           if (!keyMatches) {
@@ -87,4 +87,4 @@ export default function (Promise, Private, es) {
       throw new errors.RequestFailure(err);
     });
   };
-};
+}
diff --git a/src/ui/public/courier/data_source/_normalize_sort_request.js b/src/ui/public/courier/data_source/_normalize_sort_request.js
index 7bab633bf1d4c..befe6f1d3e314 100644
--- a/src/ui/public/courier/data_source/_normalize_sort_request.js
+++ b/src/ui/public/courier/data_source/_normalize_sort_request.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 
 export default function normalizeSortRequest(config) {
-  let defaultSortOptions = config.get('sort:options');
+  const defaultSortOptions = config.get('sort:options');
 
   /**
    * Decorate queries with default parameters
@@ -9,8 +9,6 @@ export default function normalizeSortRequest(config) {
    * @returns {object}
    */
   return function (sortObject, indexPattern) {
-    let normalizedSort = [];
-
     // [].concat({}) -> [{}], [].concat([{}]) -> [{}]
     return [].concat(sortObject).map(function (sortable) {
       return normalize(sortable, indexPattern);
@@ -22,10 +20,10 @@ export default function normalizeSortRequest(config) {
     { someField: "desc" } into { someField: { "order": "desc"}}
   */
   function normalize(sortable, indexPattern) {
-    let normalized = {};
+    const normalized = {};
     let sortField = _.keys(sortable)[0];
     let sortValue = sortable[sortField];
-    let indexField = indexPattern.fields.byName[sortField];
+    const indexField = indexPattern.fields.byName[sortField];
 
     if (indexField && indexField.scripted && indexField.sortable) {
       let direction;
@@ -55,4 +53,4 @@ export default function normalizeSortRequest(config) {
     normalized[sortField] = sortValue;
     return normalized;
   }
-};
+}
diff --git a/src/ui/public/courier/data_source/_root_search_source.js b/src/ui/public/courier/data_source/_root_search_source.js
index c3cb53ffb33c1..807ec1de990db 100644
--- a/src/ui/public/courier/data_source/_root_search_source.js
+++ b/src/ui/public/courier/data_source/_root_search_source.js
@@ -1,11 +1,9 @@
 import SearchSourceProvider from 'ui/courier/data_source/search_source';
 
-export default function RootSearchSource(Private, $rootScope, timefilter, Notifier) {
-  let SearchSource = Private(SearchSourceProvider);
+export default function RootSearchSource(Private, $rootScope, timefilter) {
+  const SearchSource = Private(SearchSourceProvider);
 
-  let notify = new Notifier({ location: 'Root Search Source' });
-
-  let globalSource = new SearchSource();
+  const globalSource = new SearchSource();
   globalSource.inherits(false); // this is the final source, it has no parents
   globalSource.filter(function (globalSource) {
     // dynamic time filter will be called in the _flatten phase of things
@@ -61,4 +59,4 @@ export default function RootSearchSource(Private, $rootScope, timefilter, Notifi
       return globalSource;
     }
   };
-};
+}
diff --git a/src/ui/public/courier/data_source/doc_source.js b/src/ui/public/courier/data_source/doc_source.js
index 80be1cf7b6095..07f05076e77ff 100644
--- a/src/ui/public/courier/data_source/doc_source.js
+++ b/src/ui/public/courier/data_source/doc_source.js
@@ -19,10 +19,10 @@ import DocRequestProvider from '../fetch/request/doc';
 import DocStrategyProvider from '../fetch/strategy/doc';
 
 export default function DocSourceFactory(Private, Promise, es, sessionStorage) {
-  let sendToEs = Private(DocSendToEsProvider);
-  let SourceAbstract = Private(AbstractDataSourceProvider);
-  let DocRequest = Private(DocRequestProvider);
-  let docStrategy = Private(DocStrategyProvider);
+  const sendToEs = Private(DocSendToEsProvider);
+  const SourceAbstract = Private(AbstractDataSourceProvider);
+  const DocRequest = Private(DocRequestProvider);
+  const docStrategy = Private(DocStrategyProvider);
 
   _.class(DocSource).inherits(SourceAbstract);
   function DocSource(initialState) {
@@ -109,7 +109,7 @@ export default function DocSourceFactory(Private, Promise, es, sessionStorage) {
    * @return {string}
    */
   DocSource.prototype._versionKey = function () {
-    let state = this._state;
+    const state = this._state;
 
     if (!state.index || !state.type || !state.id) return;
     return 'DocVersion:' + (
@@ -135,10 +135,10 @@ export default function DocSourceFactory(Private, Promise, es, sessionStorage) {
    * @return {[type]} [description]
    */
   DocSource.prototype._getStoredVersion = function () {
-    let key = this._versionKey();
+    const key = this._versionKey();
     if (!key) return;
 
-    let v = sessionStorage.get(key);
+    const v = sessionStorage.get(key);
     this._version = v ? _.parseInt(v) : void 0;
     return this._version;
   };
@@ -151,7 +151,7 @@ export default function DocSourceFactory(Private, Promise, es, sessionStorage) {
   DocSource.prototype._storeVersion = function (version) {
     if (!version) return this._clearVersion();
 
-    let key = this._versionKey();
+    const key = this._versionKey();
     if (!key) return;
     this._version = version;
     sessionStorage.set(key, version);
@@ -161,10 +161,10 @@ export default function DocSourceFactory(Private, Promise, es, sessionStorage) {
    * Clears the stored version for a DocSource
    */
   DocSource.prototype._clearVersion = function () {
-    let key = this._versionKey();
+    const key = this._versionKey();
     if (!key) return;
     sessionStorage.remove(key);
   };
 
   return DocSource;
-};
+}
diff --git a/src/ui/public/courier/data_source/search_source.js b/src/ui/public/courier/data_source/search_source.js
index f4279aee4940d..18965d7f1c74e 100644
--- a/src/ui/public/courier/data_source/search_source.js
+++ b/src/ui/public/courier/data_source/search_source.js
@@ -60,13 +60,13 @@ import SegmentedRequestProvider from '../fetch/request/segmented';
 import SearchStrategyProvider from '../fetch/strategy/search';
 
 export default function SearchSourceFactory(Promise, Private, config) {
-  let SourceAbstract = Private(AbstractDataSourceProvider);
-  let SearchRequest = Private(SearchRequestProvider);
-  let SegmentedRequest = Private(SegmentedRequestProvider);
-  let searchStrategy = Private(SearchStrategyProvider);
-  let normalizeSortRequest = Private(NormalizeSortRequestProvider);
+  const SourceAbstract = Private(AbstractDataSourceProvider);
+  const SearchRequest = Private(SearchRequestProvider);
+  const SegmentedRequest = Private(SegmentedRequestProvider);
+  const searchStrategy = Private(SearchStrategyProvider);
+  const normalizeSortRequest = Private(NormalizeSortRequestProvider);
 
-  let forIp = Symbol('for which index pattern?');
+  const forIp = Symbol('for which index pattern?');
 
   function isIndexPattern(val) {
     return Boolean(val && typeof val.toIndexList === 'function');
@@ -100,11 +100,11 @@ export default function SearchSourceFactory(Promise, Private, config) {
   ];
 
   SearchSource.prototype.index = function (indexPattern) {
-    let state = this._state;
+    const state = this._state;
 
-    let hasSource = state.source;
-    let sourceCameFromIp = hasSource && state.source.hasOwnProperty(forIp);
-    let sourceIsForOurIp = sourceCameFromIp && state.source[forIp] === state.index;
+    const hasSource = state.source;
+    const sourceCameFromIp = hasSource && state.source.hasOwnProperty(forIp);
+    const sourceIsForOurIp = sourceCameFromIp && state.source[forIp] === state.index;
     if (sourceIsForOurIp) {
       delete state.source;
     }
@@ -147,7 +147,7 @@ export default function SearchSourceFactory(Promise, Private, config) {
    * @return {undefined|searchSource}
    */
   SearchSource.prototype.getParent = function (onlyHardLinked) {
-    let self = this;
+    const self = this;
     if (self._parent === false) return;
     if (self._parent) return self._parent;
     return onlyHardLinked ? undefined : Private(rootSearchSource).get();
@@ -168,9 +168,9 @@ export default function SearchSourceFactory(Promise, Private, config) {
   };
 
   SearchSource.prototype.onBeginSegmentedFetch = function (initFunction) {
-    let self = this;
+    const self = this;
     return Promise.try(function addRequest() {
-      let req = new SegmentedRequest(self, Promise.defer(), initFunction);
+      const req = new SegmentedRequest(self, Promise.defer(), initFunction);
 
       // return promises created by the completion handler so that
       // errors will bubble properly
@@ -215,7 +215,7 @@ export default function SearchSourceFactory(Promise, Private, config) {
    */
   SearchSource.prototype._mergeProp = function (state, val, key) {
     if (typeof val === 'function') {
-      let source = this;
+      const source = this;
       return Promise.cast(val(this))
       .then(function (newVal) {
         return source._mergeProp(state, newVal, key);
@@ -273,7 +273,7 @@ export default function SearchSourceFactory(Promise, Private, config) {
       // ignore if we already have a value
       if (state.body[key] == null) {
         if (key === 'query' && _.isString(val)) {
-          val = { query_string: { query: val }};
+          val = { query_string: { query: val } };
         }
 
         state.body[key] = val;
@@ -282,4 +282,4 @@ export default function SearchSourceFactory(Promise, Private, config) {
   };
 
   return SearchSource;
-};
+}
diff --git a/src/ui/public/courier/fetch/call_client.js b/src/ui/public/courier/fetch/call_client.js
index 21c130cde4809..c5ce3caf25a7b 100644
--- a/src/ui/public/courier/fetch/call_client.js
+++ b/src/ui/public/courier/fetch/call_client.js
@@ -119,4 +119,4 @@ export default function CourierFetchCallClient(Private, Promise, es) {
   }
 
   return callClient;
-};
+}
diff --git a/src/ui/public/courier/fetch/call_response_handlers.js b/src/ui/public/courier/fetch/call_response_handlers.js
index 41b4c2bc20205..5f694532d40ae 100644
--- a/src/ui/public/courier/fetch/call_response_handlers.js
+++ b/src/ui/public/courier/fetch/call_response_handlers.js
@@ -54,4 +54,4 @@ export default function CourierFetchCallResponseHandlers(Private, Promise) {
   }
 
   return callResponseHandlers;
-};
+}
diff --git a/src/ui/public/courier/fetch/continue_incomplete.js b/src/ui/public/courier/fetch/continue_incomplete.js
index 12433548a32e7..f11448a0e18a6 100644
--- a/src/ui/public/courier/fetch/continue_incomplete.js
+++ b/src/ui/public/courier/fetch/continue_incomplete.js
@@ -24,4 +24,4 @@ export default function CourierFetchContinueIncompleteRequests(Private) {
   }
 
   return continueIncompleteRequests;
-};
+}
diff --git a/src/ui/public/courier/fetch/fetch.js b/src/ui/public/courier/fetch/fetch.js
index f6bf27754073f..2a33d8caa26c2 100644
--- a/src/ui/public/courier/fetch/fetch.js
+++ b/src/ui/public/courier/fetch/fetch.js
@@ -21,7 +21,7 @@ export default function fetchService(Private, Promise) {
 
   this.fetchQueued = fetchQueued;
 
-  function fetchASource(source, strategy) {
+  function fetchASource(source) {
     const defer = Promise.defer();
 
     fetchThese([
@@ -76,4 +76,4 @@ export default function fetchService(Private, Promise) {
       }
     });
   };
-};
+}
diff --git a/src/ui/public/courier/fetch/fetch_these.js b/src/ui/public/courier/fetch/fetch_these.js
index 27b0c3cc1e36f..1c2b07b7fc660 100644
--- a/src/ui/public/courier/fetch/fetch_these.js
+++ b/src/ui/public/courier/fetch/fetch_these.js
@@ -78,4 +78,4 @@ export default function FetchTheseProvider(Private, Promise) {
   }
 
   return fetchThese;
-};
+}
diff --git a/src/ui/public/courier/fetch/for_each_strategy.js b/src/ui/public/courier/fetch/for_each_strategy.js
index 8eababd7670a5..82225c85d1019 100644
--- a/src/ui/public/courier/fetch/for_each_strategy.js
+++ b/src/ui/public/courier/fetch/for_each_strategy.js
@@ -18,4 +18,4 @@ export default function FetchForEachRequestStrategy(Private, Promise) {
   }
 
   return forEachStrategy;
-};
+}
diff --git a/src/ui/public/courier/fetch/is_request.js b/src/ui/public/courier/fetch/is_request.js
index f64ab1e1ec08d..8ce9d5398ddd5 100644
--- a/src/ui/public/courier/fetch/is_request.js
+++ b/src/ui/public/courier/fetch/is_request.js
@@ -6,4 +6,4 @@ export default function IsRequestProvider(Private) {
   return function isRequest(obj) {
     return obj instanceof AbstractRequest;
   };
-};
+}
diff --git a/src/ui/public/courier/fetch/merge_duplicate_requests.js b/src/ui/public/courier/fetch/merge_duplicate_requests.js
index 5c698f422834b..e785633329c12 100644
--- a/src/ui/public/courier/fetch/merge_duplicate_requests.js
+++ b/src/ui/public/courier/fetch/merge_duplicate_requests.js
@@ -26,4 +26,4 @@ export default function FetchMergeDuplicateRequests(Private) {
   }
 
   return mergeDuplicateRequests;
-};
+}
diff --git a/src/ui/public/courier/fetch/notifier.js b/src/ui/public/courier/fetch/notifier.js
index e839d29195125..8f00d4a1d4ba0 100644
--- a/src/ui/public/courier/fetch/notifier.js
+++ b/src/ui/public/courier/fetch/notifier.js
@@ -4,4 +4,4 @@ export default function CourierFetchNotifier() {
   return new Notifier({
     location: 'Courier Fetch'
   });
-};
+}
diff --git a/src/ui/public/courier/fetch/req_status.js b/src/ui/public/courier/fetch/req_status.js
index 06417449730e0..9c29751641bef 100644
--- a/src/ui/public/courier/fetch/req_status.js
+++ b/src/ui/public/courier/fetch/req_status.js
@@ -4,4 +4,4 @@ export default function CourierFetchRequestStatus() {
     DUPLICATE: { CourierFetchRequestStatus: 'duplicate' },
     INCOMPLETE: { CourierFetchRequestStatus: 'incomplete' }
   };
-};
+}
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented.js b/src/ui/public/courier/fetch/request/__tests__/segmented.js
index a30f3da68747b..e98286e04a902 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented.js
@@ -7,7 +7,6 @@ import SearchRequestProvider from '../search';
 
 describe('ui/courier/fetch/request/segmented', () => {
   let Promise;
-  let $rootScope;
   let SegmentedReq;
   let segmentedReq;
   let searchReqStart;
@@ -16,7 +15,6 @@ describe('ui/courier/fetch/request/segmented', () => {
 
   beforeEach(ngMock.inject((Private, $injector) => {
     Promise = $injector.get('Promise');
-    $rootScope = $injector.get('$rootScope');
     SegmentedReq = Private(SegmentedRequestProvider);
     searchReqStart = sinon.spy(Private(SearchRequestProvider).prototype, 'start');
   }));
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
index 4d35848ed846b..2a652e47f9d09 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
@@ -7,9 +7,7 @@ import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source';
 import SegmentedRequestProvider from '../segmented';
 
 describe('ui/courier/fetch/request/segmented/_createQueue', () => {
-
   let Promise;
-  let $rootScope;
   let SegmentedReq;
   let MockSource;
 
@@ -18,7 +16,6 @@ describe('ui/courier/fetch/request/segmented/_createQueue', () => {
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject((Private, $injector) => {
     Promise = $injector.get('Promise');
-    $rootScope = $injector.get('$rootScope');
     SegmentedReq = Private(SegmentedRequestProvider);
 
     MockSource = class {
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
index a302da89e7bc1..b77db74c1cd1e 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
@@ -11,7 +11,6 @@ import SegmentedRequestProvider from '../segmented';
 
 describe('Segmented Request Index Selection', function () {
   let Promise;
-  let $rootScope;
   let SegmentedReq;
   let MockSource;
   let HitSortFn;
@@ -22,7 +21,6 @@ describe('Segmented Request Index Selection', function () {
   beforeEach(ngMock.inject((Private, $injector) => {
     Promise = $injector.get('Promise');
     HitSortFn = Private(HitSortFnProv);
-    $rootScope = $injector.get('$rootScope');
     SegmentedReq = Private(SegmentedRequestProvider);
 
     MockSource = class {
@@ -78,7 +76,7 @@ describe('Segmented Request Index Selection', function () {
     });
   });
 
-  it(`sets size 0 for indices that couldn't procude hits`, async function () {
+  it('sets size 0 for indices that couldn\'t procude hits', async function () {
     const search = new MockSource();
     const indexPattern = search.get('index');
 
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
index 631308a15d6fb..51ed0a38084f6 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
@@ -1,7 +1,5 @@
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
-import { times } from 'lodash';
-import sinon from 'auto-release-sinon';
 
 import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn';
 import NoDigestPromises from 'test_utils/no_digest_promises';
@@ -10,8 +8,6 @@ import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source';
 import SegmentedRequestProvider from '../segmented';
 
 describe('Segmented Request Size Picking', function () {
-  let Promise;
-  let $rootScope;
   let SegmentedReq;
   let MockSource;
   let HitSortFn;
@@ -20,9 +16,7 @@ describe('Segmented Request Size Picking', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject((Private, $injector) => {
-    Promise = $injector.get('Promise');
     HitSortFn = Private(HitSortFnProv);
-    $rootScope = $injector.get('$rootScope');
     SegmentedReq = Private(SegmentedRequestProvider);
 
     MockSource = class {
diff --git a/src/ui/public/courier/fetch/request/doc.js b/src/ui/public/courier/fetch/request/doc.js
index bbe0d12e7ee6c..81dca200b7803 100644
--- a/src/ui/public/courier/fetch/request/doc.js
+++ b/src/ui/public/courier/fetch/request/doc.js
@@ -40,4 +40,4 @@ export default function DocRequestProvider(Private) {
   }
 
   return DocRequest;
-};
+}
diff --git a/src/ui/public/courier/fetch/request/error_handler.js b/src/ui/public/courier/fetch/request/error_handler.js
index 91e6c0929df39..19070a6642641 100644
--- a/src/ui/public/courier/fetch/request/error_handler.js
+++ b/src/ui/public/courier/fetch/request/error_handler.js
@@ -26,4 +26,4 @@ export default function RequestErrorHandlerFactory(Private) {
   }
 
   return handleError;
-};
+}
diff --git a/src/ui/public/courier/fetch/request/request.js b/src/ui/public/courier/fetch/request/request.js
index 1c7cf35abd318..c0cfee456f99d 100644
--- a/src/ui/public/courier/fetch/request/request.js
+++ b/src/ui/public/courier/fetch/request/request.js
@@ -1,8 +1,6 @@
 import _ from 'lodash';
 import moment from 'moment';
 
-import errors from 'ui/errors';
-
 import RequestQueueProvider from '../../_request_queue';
 import ErrorHandlerRequestProvider from './error_handler';
 
@@ -49,7 +47,7 @@ export default function AbstractReqProvider(Private, Promise) {
       return resp;
     }
 
-    filterError(resp) {
+    filterError() {
       return false;
     }
 
@@ -107,4 +105,4 @@ export default function AbstractReqProvider(Private, Promise) {
       return new this.constructor(this.source, this.defer);
     }
   };
-};
+}
diff --git a/src/ui/public/courier/fetch/request/search.js b/src/ui/public/courier/fetch/request/search.js
index 9ae5b8398bc7d..a571923ef8c11 100644
--- a/src/ui/public/courier/fetch/request/search.js
+++ b/src/ui/public/courier/fetch/request/search.js
@@ -14,4 +14,4 @@ export default function SearchReqProvider(Private) {
       this.strategy = searchStrategy;
     }
   };
-};
+}
diff --git a/src/ui/public/courier/fetch/request/segmented.js b/src/ui/public/courier/fetch/request/segmented.js
index 7ea9c1893a978..4689b88923121 100644
--- a/src/ui/public/courier/fetch/request/segmented.js
+++ b/src/ui/public/courier/fetch/request/segmented.js
@@ -336,4 +336,4 @@ export default function SegmentedReqProvider(es, Private, Promise, timefilter, c
   SegmentedReq.prototype.mergedSegment = notify.timed('merge response segment', SegmentedReq.prototype.mergedSegment);
 
   return SegmentedReq;
-};
+}
diff --git a/src/ui/public/courier/fetch/request/segmented_handle.js b/src/ui/public/courier/fetch/request/segmented_handle.js
index 702378d8392ae..71ea19858218f 100644
--- a/src/ui/public/courier/fetch/request/segmented_handle.js
+++ b/src/ui/public/courier/fetch/request/segmented_handle.js
@@ -37,4 +37,4 @@ export default function CourierSegmentedReqHandle(Private) {
       this[segmentedRequest].setSortFn(...args);
     }
   };
-};
+}
diff --git a/src/ui/public/courier/fetch/strategy/__tests__/search.js b/src/ui/public/courier/fetch/strategy/__tests__/search.js
index 6cad183f05785..074cfad932524 100644
--- a/src/ui/public/courier/fetch/strategy/__tests__/search.js
+++ b/src/ui/public/courier/fetch/strategy/__tests__/search.js
@@ -1,13 +1,10 @@
 import _ from 'lodash';
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 
 import SearchStrategyProvider from '../search';
 
 describe('ui/courier/fetch/strategy/search', () => {
-
-  let Promise;
   let $rootScope;
   let search;
   let reqsFetchParams;
@@ -15,7 +12,6 @@ describe('ui/courier/fetch/strategy/search', () => {
   beforeEach(ngMock.module('kibana'));
 
   beforeEach(ngMock.inject((Private, $injector) => {
-    Promise = $injector.get('Promise');
     $rootScope = $injector.get('$rootScope');
     search = Private(SearchStrategyProvider);
     reqsFetchParams = [
diff --git a/src/ui/public/courier/fetch/strategy/doc.js b/src/ui/public/courier/fetch/strategy/doc.js
index 86a46af90ca8a..1949e07dc1d25 100644
--- a/src/ui/public/courier/fetch/strategy/doc.js
+++ b/src/ui/public/courier/fetch/strategy/doc.js
@@ -22,4 +22,4 @@ export default function FetchStrategyForDoc(Promise) {
       return resp.docs;
     }
   };
-};
+}
diff --git a/src/ui/public/courier/fetch/strategy/search.js b/src/ui/public/courier/fetch/strategy/search.js
index 2c7bf3e4408b3..e1b3cd6cd7d1f 100644
--- a/src/ui/public/courier/fetch/strategy/search.js
+++ b/src/ui/public/courier/fetch/strategy/search.js
@@ -64,7 +64,7 @@ export default function FetchStrategyForSearch(Private, Promise, timefilter, kbn
       return resp.responses;
     }
   };
-};
+}
 
 function emptySearch() {
   return {
diff --git a/src/ui/public/courier/looper/_looper.js b/src/ui/public/courier/looper/_looper.js
index 8ebf2df44d497..db8e23ea09fda 100644
--- a/src/ui/public/courier/looper/_looper.js
+++ b/src/ui/public/courier/looper/_looper.js
@@ -4,7 +4,7 @@ import 'ui/promises';
 import Notifier from 'ui/notify/notifier';
 
 export default function LooperFactory($timeout, Promise) {
-  let notify = new Notifier();
+  const notify = new Notifier();
 
   function Looper(ms, fn) {
     this._fn = fn;
@@ -130,7 +130,7 @@ export default function LooperFactory($timeout, Promise) {
    * @return {undefined}
    */
   Looper.prototype._loopTheLoop = function () {
-    let self = this;
+    const self = this;
 
     if (self.active) {
       self.onHastyLoop();
@@ -184,4 +184,4 @@ export default function LooperFactory($timeout, Promise) {
   };
 
   return Looper;
-};
+}
diff --git a/src/ui/public/courier/looper/doc.js b/src/ui/public/courier/looper/doc.js
index e0f21394777c8..9c784f3febcdc 100644
--- a/src/ui/public/courier/looper/doc.js
+++ b/src/ui/public/courier/looper/doc.js
@@ -3,17 +3,17 @@ import LooperProvider from './_looper';
 import DocStrategyProvider from '../fetch/strategy/doc';
 
 export default function DocLooperService(Private) {
-  let fetch = Private(FetchProvider);
-  let Looper = Private(LooperProvider);
-  let DocStrategy = Private(DocStrategyProvider);
+  const fetch = Private(FetchProvider);
+  const Looper = Private(LooperProvider);
+  const DocStrategy = Private(DocStrategyProvider);
 
   /**
    * The Looper which will manage the doc fetch interval
    * @type {Looper}
    */
-  let docLooper = new Looper(1500, function () {
+  const docLooper = new Looper(1500, function () {
     fetch.fetchQueued(DocStrategy);
   });
 
   return docLooper;
-};
+}
diff --git a/src/ui/public/courier/looper/search.js b/src/ui/public/courier/looper/search.js
index ae6867f77d50d..c8e55efcb8ebf 100644
--- a/src/ui/public/courier/looper/search.js
+++ b/src/ui/public/courier/looper/search.js
@@ -4,18 +4,17 @@ import RequestQueueProvider from '../_request_queue';
 import LooperProvider from './_looper';
 
 export default function SearchLooperService(Private, Promise, Notifier, $rootScope) {
-  let fetch = Private(FetchProvider);
-  let searchStrategy = Private(SearchStrategyProvider);
-  let requestQueue = Private(RequestQueueProvider);
+  const fetch = Private(FetchProvider);
+  const searchStrategy = Private(SearchStrategyProvider);
+  const requestQueue = Private(RequestQueueProvider);
 
-  let Looper = Private(LooperProvider);
-  let notif = new Notifier({ location: 'Search Looper' });
+  const Looper = Private(LooperProvider);
 
   /**
    * The Looper which will manage the doc fetch interval
    * @type {Looper}
    */
-  let searchLooper = new Looper(null, function () {
+  const searchLooper = new Looper(null, function () {
     $rootScope.$broadcast('courier:searchRefresh');
     return fetch.these(
       requestQueue.getInactive(searchStrategy)
@@ -35,4 +34,4 @@ export default function SearchLooperService(Private, Promise, Notifier, $rootSco
   };
 
   return searchLooper;
-};
+}
diff --git a/src/ui/public/courier/saved_object/saved_object.js b/src/ui/public/courier/saved_object/saved_object.js
index 8cfe0fe1bb39f..6323915e8775b 100644
--- a/src/ui/public/courier/saved_object/saved_object.js
+++ b/src/ui/public/courier/saved_object/saved_object.js
@@ -21,38 +21,38 @@ import SearchSourceProvider from '../data_source/search_source';
 
 export default function SavedObjectFactory(es, kbnIndex, Promise, Private, Notifier, safeConfirm, indexPatterns) {
 
-  let DocSource = Private(DocSourceProvider);
-  let SearchSource = Private(SearchSourceProvider);
-  let mappingSetup = Private(MappingSetupProvider);
+  const DocSource = Private(DocSourceProvider);
+  const SearchSource = Private(SearchSourceProvider);
+  const mappingSetup = Private(MappingSetupProvider);
 
   function SavedObject(config) {
     if (!_.isObject(config)) config = {};
 
     // save an easy reference to this
-    let self = this;
+    const self = this;
 
     /************
      * Initialize config vars
      ************/
     // the doc which is used to store this object
-    let docSource = new DocSource();
+    const docSource = new DocSource();
 
     // type name for this object, used as the ES-type
-    let type = config.type;
+    const type = config.type;
 
     // Create a notifier for sending alerts
-    let notify = new Notifier({
+    const notify = new Notifier({
       location: 'Saved ' + type
     });
 
     // mapping definition for the fields that this object will expose
-    let mapping = mappingSetup.expandShorthand(config.mapping);
+    const mapping = mappingSetup.expandShorthand(config.mapping);
 
     // default field values, assigned when the source is loaded
-    let defaults = config.defaults || {};
+    const defaults = config.defaults || {};
 
-    let afterESResp = config.afterESResp || _.noop;
-    let customInit = config.init || _.noop;
+    const afterESResp = config.afterESResp || _.noop;
+    const customInit = config.init || _.noop;
 
     // optional search source which this object configures
     self.searchSource = config.searchSource && new SearchSource();
@@ -124,7 +124,7 @@ export default function SavedObjectFactory(es, kbnIndex, Promise, Private, Notif
 
       if (resp.found != null && !resp.found) throw new errors.SavedObjectNotFound(type, self.id);
 
-      let meta = resp._source.kibanaSavedObjectMeta || {};
+      const meta = resp._source.kibanaSavedObjectMeta || {};
       delete resp._source.kibanaSavedObjectMeta;
 
       if (!config.indexPattern && self._source.indexPattern) {
@@ -169,8 +169,8 @@ export default function SavedObjectFactory(es, kbnIndex, Promise, Private, Notif
         state = {};
       }
 
-      let oldState = self.searchSource.toJSON();
-      let fnProps = _.transform(oldState, function (dynamic, val, name) {
+      const oldState = self.searchSource.toJSON();
+      const fnProps = _.transform(oldState, function (dynamic, val, name) {
         if (_.isFunction(val)) dynamic[name] = val;
       }, {});
 
@@ -211,7 +211,7 @@ export default function SavedObjectFactory(es, kbnIndex, Promise, Private, Notif
      * @return {Object}
      */
     self.serialize = function () {
-      let body = {};
+      const body = {};
 
       _.forOwn(mapping, function (fieldMapping, fieldName) {
         if (self[fieldName] != null) {
@@ -238,7 +238,7 @@ export default function SavedObjectFactory(es, kbnIndex, Promise, Private, Notif
      */
     self.save = function () {
 
-      let body = self.serialize();
+      const body = self.serialize();
 
       // Slugify the object id
       self.id = slugifyId(self.id);
@@ -251,7 +251,7 @@ export default function SavedObjectFactory(es, kbnIndex, Promise, Private, Notif
     };
 
     self.saveSource = function (source) {
-      let finish = function (id) {
+      const finish = function (id) {
         self.id = id;
         return es.indices.refresh({
           index: kbnIndex
@@ -266,7 +266,7 @@ export default function SavedObjectFactory(es, kbnIndex, Promise, Private, Notif
       .catch(function (err) {
         // record exists, confirm overwriting
         if (_.get(err, 'origError.status') === 409) {
-          let confirmMessage = 'Are you sure you want to overwrite ' + self.title + '?';
+          const confirmMessage = 'Are you sure you want to overwrite ' + self.title + '?';
 
           return safeConfirm(confirmMessage).then(
             function () {
@@ -309,4 +309,4 @@ export default function SavedObjectFactory(es, kbnIndex, Promise, Private, Notif
   }
 
   return SavedObject;
-};
+}
diff --git a/src/ui/public/debounce/__tests__/debounce.js b/src/ui/public/debounce/__tests__/debounce.js
index 5208365c38a8f..122bfa9a40ed2 100644
--- a/src/ui/public/debounce/__tests__/debounce.js
+++ b/src/ui/public/debounce/__tests__/debounce.js
@@ -5,14 +5,12 @@ import ngMock from 'ng_mock';
 
 let debounce;
 let $timeout;
-let $timeoutSpy;
 
 function init() {
   ngMock.module('kibana');
 
   ngMock.inject(function ($injector, _$timeout_) {
     $timeout = _$timeout_;
-    $timeoutSpy = sinon.spy($timeout);
 
     debounce = $injector.get('debounce');
   });
@@ -27,14 +25,14 @@ describe('debounce service', function () {
 
   describe('API', function () {
     it('should have a cancel method', function () {
-      let bouncer = debounce(function () {}, 100);
+      const bouncer = debounce(function () {}, 100);
       expect(bouncer).to.have.property('cancel');
     });
   });
 
   describe('delayed execution', function () {
     it('should delay execution', function () {
-      let bouncer = debounce(spy, 100);
+      const bouncer = debounce(spy, 100);
       bouncer();
       expect(spy.callCount).to.be(0);
       $timeout.flush();
@@ -42,7 +40,7 @@ describe('debounce service', function () {
     });
 
     it('should fire on leading edge', function () {
-      let bouncer = debounce(spy, 100, { leading: true });
+      const bouncer = debounce(spy, 100, { leading: true });
       bouncer();
       expect(spy.callCount).to.be(1);
       $timeout.flush();
@@ -50,7 +48,7 @@ describe('debounce service', function () {
     });
 
     it('should only fire on leading edge', function () {
-      let bouncer = debounce(spy, 100, { leading: true, trailing: false });
+      const bouncer = debounce(spy, 100, { leading: true, trailing: false });
       bouncer();
       expect(spy.callCount).to.be(1);
       $timeout.flush();
@@ -58,8 +56,8 @@ describe('debounce service', function () {
     });
 
     it('should reset delayed execution', function (done) {
-      let cancelSpy = sinon.spy($timeout, 'cancel');
-      let bouncer = debounce(spy, 100);
+      const cancelSpy = sinon.spy($timeout, 'cancel');
+      const bouncer = debounce(spy, 100);
       bouncer();
       setTimeout(function () {
         bouncer();
@@ -74,8 +72,8 @@ describe('debounce service', function () {
 
   describe('cancel', function () {
     it('should cancel the $timeout', function () {
-      let cancelSpy = sinon.spy($timeout, 'cancel');
-      let bouncer = debounce(spy, 100);
+      const cancelSpy = sinon.spy($timeout, 'cancel');
+      const bouncer = debounce(spy, 100);
       bouncer();
       bouncer.cancel();
       expect(cancelSpy.callCount).to.be(1);
diff --git a/src/ui/public/debounce/debounce.js b/src/ui/public/debounce/debounce.js
index 7f8652f39d8f5..fc541e108c25e 100644
--- a/src/ui/public/debounce/debounce.js
+++ b/src/ui/public/debounce/debounce.js
@@ -3,7 +3,7 @@ import uiModules from 'ui/modules';
 // Debounce service, angularized version of lodash debounce
 // borrowed heavily from https://github.com/shahata/angular-debounce
 
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.service('debounce', ['$timeout', function ($timeout) {
   return function (func, wait, options) {
@@ -20,14 +20,14 @@ module.service('debounce', ['$timeout', function ($timeout) {
       self = this;
       args = arguments;
 
-      let later = function () {
+      const later = function () {
         timeout = null;
         if (!options.leading || options.trailing) {
           result = func.apply(self, args);
         }
       };
 
-      let callNow = options.leading && !timeout;
+      const callNow = options.leading && !timeout;
 
       if (timeout) {
         $timeout.cancel(timeout);
diff --git a/src/ui/public/directives/__tests__/auto_select_if_only_one.js b/src/ui/public/directives/__tests__/auto_select_if_only_one.js
index b414843698b9d..2749424c90a50 100644
--- a/src/ui/public/directives/__tests__/auto_select_if_only_one.js
+++ b/src/ui/public/directives/__tests__/auto_select_if_only_one.js
@@ -1,5 +1,4 @@
 
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/directives/auto_select_if_only_one';
@@ -7,16 +6,16 @@ import 'ui/directives/auto_select_if_only_one';
 describe('Auto-select if only one directive', function () {
   let $compile;
   let $rootScope;
-  let zeroOptions = [];
-  let oneOption = [{label: 'foo'}];
-  let multiOptions = [{label: 'foo'}, {label: 'bar'}];
+  const zeroOptions = [];
+  const oneOption = [{ label: 'foo' }];
+  const multiOptions = [{ label: 'foo' }, { label: 'bar' }];
 
   beforeEach(ngMock.module('kibana'));
 
   beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
     $compile = _$compile_;
     $rootScope = _$rootScope_;
-    let html = '<select ng-model="value" ng-options="option.name for option in options" auto-select-if-only-one="options"></select>';
+    const html = '<select ng-model="value" ng-options="option.name for option in options" auto-select-if-only-one="options"></select>';
     $compile(html)($rootScope);
     $rootScope.value = null;
   }));
@@ -41,7 +40,7 @@ describe('Auto-select if only one directive', function () {
 
   it('should still auto select if the collection contains 2 items but is filtered to 1', function () {
     $rootScope.options = multiOptions;
-    let html = '<select ng-model="value" ng-options="option.name for option in options | filter:{label:\'bar\'}" ' +
+    const html = '<select ng-model="value" ng-options="option.name for option in options | filter:{label:\'bar\'}" ' +
     'auto-select-if-only-one="options | filter:{label:\'bar\'}"></select>';
     $compile(html)($rootScope);
     $rootScope.value = null;
diff --git a/src/ui/public/directives/__tests__/confirm-click.js b/src/ui/public/directives/__tests__/confirm-click.js
index bdb7e7d62355e..0c651f94cf400 100644
--- a/src/ui/public/directives/__tests__/confirm-click.js
+++ b/src/ui/public/directives/__tests__/confirm-click.js
@@ -13,7 +13,7 @@ let $scope;
 
 let $elem;
 
-let init = function (text) {
+const init = function () {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/directives/__tests__/css_truncate.js b/src/ui/public/directives/__tests__/css_truncate.js
index 535200bb0abc6..e78f2f63d89fb 100644
--- a/src/ui/public/directives/__tests__/css_truncate.js
+++ b/src/ui/public/directives/__tests__/css_truncate.js
@@ -1,7 +1,6 @@
 import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import $ from 'jquery';
 import 'plugins/kibana/discover/index';
 
 let $parentScope;
@@ -10,7 +9,7 @@ let $scope;
 
 let $elem;
 
-let init = function (expandable) {
+const init = function (expandable) {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/directives/__tests__/fixed_scroll.js b/src/ui/public/directives/__tests__/fixed_scroll.js
index 7bcf4467ab740..d710e611414aa 100644
--- a/src/ui/public/directives/__tests__/fixed_scroll.js
+++ b/src/ui/public/directives/__tests__/fixed_scroll.js
@@ -4,12 +4,11 @@ import ngMock from 'ng_mock';
 import 'ui/fixed_scroll';
 import $ from 'jquery';
 import sinon from 'auto-release-sinon';
-import Promise from 'bluebird';
 
 describe('FixedScroll directive', function () {
 
   let compile;
-  let trash = [];
+  const trash = [];
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($compile, $rootScope) {
@@ -19,7 +18,7 @@ describe('FixedScroll directive', function () {
 
       // since the directive works at the sibling level we create a
       // parent for everything to happen in
-      let $parent = $('<div>').css({
+      const $parent = $('<div>').css({
         position: 'fixed',
         top: 0,
         left: 0,
@@ -30,12 +29,12 @@ describe('FixedScroll directive', function () {
       $parent.appendTo(document.body);
       trash.push($parent);
 
-      let $el = $('<div fixed-scroll></div>').css({
+      const $el = $('<div fixed-scroll></div>').css({
         'overflow-x': 'auto',
         'width': $parent.width()
       }).appendTo($parent);
 
-      let $content = $('<div>').css({
+      const $content = $('<div>').css({
         width: $parent.width() * ratioX,
         height: $parent.height() * ratioY
       }).appendTo($el);
@@ -67,26 +66,26 @@ describe('FixedScroll directive', function () {
   });
 
   it('attaches a scroller below the element when the content is larger then the container', function () {
-    let els = compile(1.5);
+    const els = compile(1.5);
     expect(els.$scroller).to.have.length(1);
   });
 
   it('copies the width of the container', function () {
-    let els = compile(1.5);
+    const els = compile(1.5);
     expect(els.$scroller.width()).to.be(els.$container.width());
   });
 
   it('mimics the scrollWidth of the element', function () {
-    let els = compile(1.5);
+    const els = compile(1.5);
     expect(els.$scroller.prop('scrollWidth')).to.be(els.$container.prop('scrollWidth'));
   });
 
   describe('scroll event handling / tug of war prevention', function () {
     it('listens when needed, unlistens when not needed', function () {
-      let on = sinon.spy($.fn, 'on');
-      let off = sinon.spy($.fn, 'off');
+      const on = sinon.spy($.fn, 'on');
+      const off = sinon.spy($.fn, 'off');
 
-      let els = compile(1.5);
+      const els = compile(1.5);
       expect(on.callCount).to.be(2);
       checkThisVals('$.fn.on', on);
 
@@ -130,12 +129,12 @@ describe('FixedScroll directive', function () {
           expect(spy.callCount).to.be(2);
 
           // first call should read the scrollLeft from the $container
-          let firstCall = spy.getCall(0);
+          const firstCall = spy.getCall(0);
           expect(firstCall.thisValue.is($from)).to.be(true);
           expect(firstCall.args).to.eql([]);
 
           // second call should be setting the scrollLeft on the $scroller
-          let secondCall = spy.getCall(1);
+          const secondCall = spy.getCall(1);
           expect(secondCall.thisValue.is($to)).to.be(true);
           expect(secondCall.args).to.eql([firstCall.returnValue]);
         });
diff --git a/src/ui/public/directives/__tests__/inequality.js b/src/ui/public/directives/__tests__/inequality.js
index cb822a9e5d616..de78b4ee98726 100644
--- a/src/ui/public/directives/__tests__/inequality.js
+++ b/src/ui/public/directives/__tests__/inequality.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/directives/inequality';
diff --git a/src/ui/public/directives/__tests__/input_focus.js b/src/ui/public/directives/__tests__/input_focus.js
index 5d30dbb52f0aa..5cd495b200c0c 100644
--- a/src/ui/public/directives/__tests__/input_focus.js
+++ b/src/ui/public/directives/__tests__/input_focus.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import $ from 'jquery';
@@ -12,7 +11,7 @@ describe('Input focus directive', function () {
   let $el;
   let selectedEl;
   let selectedText;
-  let inputValue = 'Input Text Value';
+  const inputValue = 'Input Text Value';
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (_$compile_, _$rootScope_, _$timeout_) {
diff --git a/src/ui/public/directives/__tests__/input_number.js b/src/ui/public/directives/__tests__/input_number.js
index 6592ab76174a0..7a8bfd9041056 100644
--- a/src/ui/public/directives/__tests__/input_number.js
+++ b/src/ui/public/directives/__tests__/input_number.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/directives/input_number';
@@ -6,7 +5,7 @@ import 'ui/directives/input_number';
 describe('Number input directive', function () {
   let $compile;
   let $rootScope;
-  let html = '<input type="text" ng-model="value" input-number />';
+  const html = '<input type="text" ng-model="value" input-number />';
 
   beforeEach(ngMock.module('kibana'));
 
@@ -16,7 +15,7 @@ describe('Number input directive', function () {
   }));
 
   it('should allow whole numbers', function () {
-    let element = $compile(html)($rootScope);
+    const element = $compile(html)($rootScope);
 
     $rootScope.value = '123';
     $rootScope.$digest();
@@ -32,7 +31,7 @@ describe('Number input directive', function () {
   });
 
   it('should allow numbers with decimals', function () {
-    let element = $compile(html)($rootScope);
+    const element = $compile(html)($rootScope);
 
     $rootScope.value = '123.0';
     $rootScope.$digest();
diff --git a/src/ui/public/directives/__tests__/json_input.js b/src/ui/public/directives/__tests__/json_input.js
index b82de486c974c..6946402974ad4 100644
--- a/src/ui/public/directives/__tests__/json_input.js
+++ b/src/ui/public/directives/__tests__/json_input.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/directives/json_input';
@@ -7,7 +6,7 @@ import 'ui/directives/json_input';
 describe('JSON input validation', function () {
   let $compile;
   let $rootScope;
-  let html = '<input ng-model="value" json-input require-keys=true />';
+  const html = '<input ng-model="value" json-input require-keys=true />';
   let element;
 
   beforeEach(ngMock.module('kibana'));
@@ -28,8 +27,8 @@ describe('JSON input validation', function () {
   });
 
   it('should be able to not require keys', function () {
-    let html = '<input ng-model="value" json-input require-keys=false />';
-    let element = $compile(html)($rootScope);
+    const html = '<input ng-model="value" json-input require-keys=false />';
+    const element = $compile(html)($rootScope);
 
     element.val('{}');
     element.trigger('input');
@@ -51,7 +50,7 @@ describe('JSON input validation', function () {
   it('should allow valid json', function () {
     element.val('{"foo": "bar"}');
     element.trigger('input');
-    expect($rootScope.value).to.eql({foo: 'bar'});
+    expect($rootScope.value).to.eql({ foo: 'bar' });
     expect(element.hasClass('ng-valid')).to.be.ok();
   });
 });
diff --git a/src/ui/public/directives/__tests__/paginated_selectable_list.js b/src/ui/public/directives/__tests__/paginated_selectable_list.js
index eb18304b478ff..30c5f906a5e37 100644
--- a/src/ui/public/directives/__tests__/paginated_selectable_list.js
+++ b/src/ui/public/directives/__tests__/paginated_selectable_list.js
@@ -3,7 +3,7 @@ import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import _ from 'lodash';
 
-let objectList = [
+const objectList = [
   { title: 'apple' },
   { title: 'orange' },
   { title: 'coconut' },
@@ -11,7 +11,7 @@ let objectList = [
   { title: 'grapes' }
 ];
 
-let stringList = [
+const stringList = [
   'apple',
   'orange',
   'coconut',
@@ -19,18 +19,18 @@ let stringList = [
   'grapes'
 ];
 
-let lists = [objectList, stringList, []];
+const lists = [objectList, stringList, []];
 
-var $scope;
-var $element;
-var $isolatedScope;
+let $scope;
+let $element;
+let $isolatedScope;
 
 lists.forEach(function (list) {
-  let isArrayOfObjects = list.every((item) => {
+  const isArrayOfObjects = list.every((item) => {
     return _.isPlainObject(item);
   });
 
-  let init = function (arr, willFail) {
+  const init = function (arr, willFail) {
     // Load the application
     ngMock.module('kibana');
 
@@ -83,8 +83,8 @@ lists.forEach(function (list) {
       });
 
       it('should initially sort an array of objects in ascending order', function () {
-        let property = $isolatedScope.listProperty;
-        let sortedList = property ? _.sortBy(list, property) : _.sortBy(list);
+        const property = $isolatedScope.listProperty;
+        const sortedList = property ? _.sortBy(list, property) : _.sortBy(list);
 
         expect($isolatedScope.hits).to.be.an('array');
 
@@ -104,8 +104,8 @@ lists.forEach(function (list) {
       });
 
       it('should sort an array of objects in ascending order', function () {
-        let property = $isolatedScope.listProperty;
-        let sortedList = property ? _.sortBy(list, property) : _.sortBy(list);
+        const property = $isolatedScope.listProperty;
+        const sortedList = property ? _.sortBy(list, property) : _.sortBy(list);
 
         $isolatedScope.isAscending = false;
         $isolatedScope.sortHits(list);
@@ -122,8 +122,8 @@ lists.forEach(function (list) {
       });
 
       it('should sort an array of objects in descending order', function () {
-        let property = $isolatedScope.listProperty;
-        let reversedList = property ? _.sortBy(list, property).reverse() : _.sortBy(list).reverse();
+        const property = $isolatedScope.listProperty;
+        const reversedList = property ? _.sortBy(list, property).reverse() : _.sortBy(list).reverse();
 
         $isolatedScope.isAscending = true;
         $isolatedScope.sortHits(list);
@@ -146,8 +146,8 @@ lists.forEach(function (list) {
       });
 
       it('should return the result of the function its passed', function () {
-        let property = $isolatedScope.listProperty;
-        let sortedList = property ? _.sortBy(list, property) : _.sortBy(list);
+        const property = $isolatedScope.listProperty;
+        const sortedList = property ? _.sortBy(list, property) : _.sortBy(list);
 
         $isolatedScope.hits.forEach(function (hit, index) {
           if (property) {
@@ -165,8 +165,8 @@ lists.forEach(function (list) {
       });
 
       it('should return the result of the function its passed', function () {
-        let property = $isolatedScope.listProperty;
-        let sortedList = property ? _.sortBy(list, property) : _.sortBy(list);
+        const property = $isolatedScope.listProperty;
+        const sortedList = property ? _.sortBy(list, property) : _.sortBy(list);
 
         $isolatedScope.userOnSelect = function (val) { return val; };
 
diff --git a/src/ui/public/directives/__tests__/parse_query.js b/src/ui/public/directives/__tests__/parse_query.js
index 6115bbdc20f35..e79cce2626856 100644
--- a/src/ui/public/directives/__tests__/parse_query.js
+++ b/src/ui/public/directives/__tests__/parse_query.js
@@ -1,38 +1,33 @@
 import angular from 'angular';
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 
 // Load the kibana app dependencies.
 
 let $rootScope;
-let $timeout;
 let $compile;
-let Promise;
 let Private;
 let config;
 let $elemScope;
 let $elem;
 
 let cycleIndex = 0;
-let markup = '<input ng-model="mockModel" parse-query input-focus type="text">';
+const markup = '<input ng-model="mockModel" parse-query input-focus type="text">';
 let fromUser;
 import toUser from 'ui/parse_query/lib/to_user';
 import 'ui/parse_query';
 import ParseQueryLibFromUserProvider from 'ui/parse_query/lib/from_user';
 
-let init = function () {
+const init = function () {
   // Load the application
   ngMock.module('kibana');
 
-  ngMock.module('kibana', function ($provide) {
+  ngMock.module('kibana', function () {
   });
 
   // Create the scope
-  ngMock.inject(function ($injector, _$rootScope_, _$compile_, _$timeout_, _Promise_, _Private_, _config_) {
-    $timeout = _$timeout_;
+  ngMock.inject(function ($injector, _$rootScope_, _$compile_, _$timeout_, _Private_, _config_) {
     $compile = _$compile_;
-    Promise = _Promise_;
     Private = _Private_;
     config = _config_;
 
@@ -41,7 +36,7 @@ let init = function () {
   });
 };
 
-let compile = function () {
+const compile = function () {
   $rootScope.mockModel = 'cycle' + cycleIndex++;
   $rootScope.mockQueryInput = undefined;
 
@@ -71,32 +66,32 @@ describe('parse-query directive', function () {
     });
 
     it('should return the input if passed an object', function () {
-      expect(fromUser({foo: 'bar'})).to.eql({foo: 'bar'});
+      expect(fromUser({ foo: 'bar' })).to.eql({ foo: 'bar' });
     });
 
     it('unless the object is empty, that implies a *', function () {
-      expect(fromUser({})).to.eql({query_string: {query: '*'}});
+      expect(fromUser({})).to.eql({ query_string: { query: '*' } });
     });
 
     it('should treat an empty string as a *', function () {
-      expect(fromUser('')).to.eql({query_string: {query: '*'}});
+      expect(fromUser('')).to.eql({ query_string: { query: '*' } });
     });
 
     it('should merge in the query string options', function () {
-      config.set('query:queryString:options', {analyze_wildcard: true});
-      expect(fromUser('foo')).to.eql({query_string: {query: 'foo', analyze_wildcard: true}});
-      expect(fromUser('')).to.eql({query_string: {query: '*', analyze_wildcard: true}});
+      config.set('query:queryString:options', { analyze_wildcard: true });
+      expect(fromUser('foo')).to.eql({ query_string: { query: 'foo', analyze_wildcard: true } });
+      expect(fromUser('')).to.eql({ query_string: { query: '*', analyze_wildcard: true } });
     });
 
     it('should treat input that does not start with { as a query string', function () {
-      expect(fromUser('foo')).to.eql({query_string: {query: 'foo'}});
-      expect(fromUser('400')).to.eql({query_string: {query: '400'}});
-      expect(fromUser('true')).to.eql({query_string: {query: 'true'}});
+      expect(fromUser('foo')).to.eql({ query_string: { query: 'foo' } });
+      expect(fromUser('400')).to.eql({ query_string: { query: '400' } });
+      expect(fromUser('true')).to.eql({ query_string: { query: 'true' } });
     });
 
     it('should parse valid JSON', function () {
       expect(fromUser('{}')).to.eql({});
-      expect(fromUser('{a:b}')).to.eql({query_string: {query: '{a:b}'}});
+      expect(fromUser('{a:b}')).to.eql({ query_string: { query: '{a:b}' } });
     });
   });
 
@@ -111,7 +106,7 @@ describe('parse-query directive', function () {
     });
 
     it('should present objects as strings', function () {
-      expect(toUser({foo: 'bar'})).to.be('{"foo":"bar"}');
+      expect(toUser({ foo: 'bar' })).to.be('{"foo":"bar"}');
     });
 
     it('should present query_string queries as strings', function () {
diff --git a/src/ui/public/directives/__tests__/timepicker.js b/src/ui/public/directives/__tests__/timepicker.js
index e9327a76ec079..d62f7bdf413c8 100644
--- a/src/ui/public/directives/__tests__/timepicker.js
+++ b/src/ui/public/directives/__tests__/timepicker.js
@@ -2,9 +2,7 @@ import angular from 'angular';
 import moment from 'moment';
 import expect from 'expect.js';
 import _ from 'lodash';
-import sinon from 'auto-release-sinon';
 import ngMock from 'ng_mock';
-import $ from 'jquery';
 import 'plugins/kibana/visualize/index';
 import 'plugins/kibana/dashboard/index';
 import 'plugins/kibana/discover/index';
@@ -17,16 +15,11 @@ let $parentScope;
 let $scope;
 
 let $elem;
-let anchor = '2014-01-01T06:06:06.666Z';
-let clock;
 
-let init = function () {
+const init = function () {
   // Load the application
   ngMock.module('kibana');
 
-  // Stub out the clock so 'now' doesn't move
-  clock = sinon.useFakeTimers(moment(anchor).valueOf());
-
   // Create the scope
   ngMock.inject(function ($rootScope, $compile) {
 
@@ -34,7 +27,7 @@ let init = function () {
     $parentScope = $rootScope;
 
     // Add some parameters to it
-    let timefilter = {
+    const timefilter = {
       time : {
         from: moment().subtract(15, 'minutes'),
         to: moment(),
@@ -107,14 +100,14 @@ describe('timepicker directive', function () {
 
     it('should set the interval on the courier', function (done) {
       // Change refresh interval and digest
-      $scope.setRefreshInterval({ value : 1000});
+      $scope.setRefreshInterval({ value : 1000 });
       $elem.scope().$digest();
       expect($courier.searchLooper.loopInterval()).to.be(1000);
       done();
     });
 
     it('should disable the looper when paused', function (done) {
-      $scope.setRefreshInterval({ value : 1000, pause: true});
+      $scope.setRefreshInterval({ value : 1000, pause: true });
       $elem.scope().$digest();
       expect($courier.searchLooper.loopInterval()).to.be(0);
       expect($scope.interval.value).to.be(1000);
@@ -122,20 +115,20 @@ describe('timepicker directive', function () {
     });
 
     it('but keep interval.value set', function (done) {
-      $scope.setRefreshInterval({ value : 1000, pause: true});
+      $scope.setRefreshInterval({ value : 1000, pause: true });
       $elem.scope().$digest();
       expect($scope.interval.value).to.be(1000);
       done();
     });
 
     it('should unpause when setRefreshInterval is called without pause:true', function (done) {
-      $scope.setRefreshInterval({ value : 1000, pause: true});
+      $scope.setRefreshInterval({ value : 1000, pause: true });
       expect($scope.interval.pause).to.be(true);
 
-      $scope.setRefreshInterval({ value : 1000, pause: false});
+      $scope.setRefreshInterval({ value : 1000, pause: false });
       expect($scope.interval.pause).to.be(false);
 
-      $scope.setRefreshInterval({ value : 1000});
+      $scope.setRefreshInterval({ value : 1000 });
       expect($scope.interval.pause).to.be(false);
 
       done();
@@ -174,7 +167,7 @@ describe('timepicker directive', function () {
       expect($elem.find('.kbn-timepicker-modes .active').text().trim()).to.be('quick');
 
       // Each of the 3 modes
-      let modes = ['absolute', 'relative', 'quick'];
+      const modes = ['absolute', 'relative', 'quick'];
       _.each(modes, function (mode) {
         $scope.setMode(mode);
         $scope.$digest();
@@ -215,7 +208,7 @@ describe('timepicker directive', function () {
     });
 
     it('has a preview of the "from" input', function (done) {
-      let preview = $elem.find('.kbn-timepicker-section span[ng-show="relative.preview"]');
+      const preview = $elem.find('.kbn-timepicker-section span[ng-show="relative.preview"]');
       expect(preview.text()).to.be(moment().subtract(15, 'minutes').format($scope.format));
       done();
     });
@@ -226,7 +219,7 @@ describe('timepicker directive', function () {
     });
 
     it('has a submit handler', function (done) {
-      let form = $elem.find('form[ng-submit="applyRelative()"]');
+      const form = $elem.find('form[ng-submit="applyRelative()"]');
       expect(form.length).to.be(1);
       done();
     });
@@ -247,7 +240,7 @@ describe('timepicker directive', function () {
     });
 
     it('has a dropdown bound to relative.unit that contains all of the intervals', function (done) {
-      let select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
+      const select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
       expect(select.length).to.be(1);
       expect(select.find('option').length).to.be(7);
 
@@ -259,7 +252,7 @@ describe('timepicker directive', function () {
     });
 
     it('has a checkbox that is checked when rounding is enabled', function (done) {
-      let checkbox = $elem.find('.kbn-timepicker-section input[ng-model="relative.round"]');
+      const checkbox = $elem.find('.kbn-timepicker-section input[ng-model="relative.round"]');
       expect(checkbox.length).to.be(1);
 
       // Rounding is disabled by default
@@ -335,8 +328,8 @@ describe('timepicker directive', function () {
     });
 
     it('updates the input fields when the scope variables are changed', function (done) {
-      let input = $elem.find('.kbn-timepicker-section input[ng-model="relative.count"]');
-      let select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
+      const input = $elem.find('.kbn-timepicker-section input[ng-model="relative.count"]');
+      const select = $elem.find('.kbn-timepicker-section select[ng-model="relative.unit"]');
 
       $scope.relative.count = 5;
       $scope.$digest();
diff --git a/src/ui/public/directives/__tests__/truncate.js b/src/ui/public/directives/__tests__/truncate.js
index 1ed5f4dba3aaf..a3a6df574658f 100644
--- a/src/ui/public/directives/__tests__/truncate.js
+++ b/src/ui/public/directives/__tests__/truncate.js
@@ -1,7 +1,6 @@
 import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import $ from 'jquery';
 import 'plugins/kibana/discover/index';
 
 
@@ -11,7 +10,7 @@ let $scope;
 
 let $elem;
 
-let init = function (text) {
+const init = function (text) {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/directives/__tests__/typeahead.js b/src/ui/public/directives/__tests__/typeahead.js
index 0c7424d356b3b..d9197d237ea3f 100644
--- a/src/ui/public/directives/__tests__/typeahead.js
+++ b/src/ui/public/directives/__tests__/typeahead.js
@@ -7,22 +7,20 @@ import 'plugins/kibana/discover/index';
 
 // TODO: This should not be needed, timefilter is only included here, it should move
 
-let typeaheadHistoryCount = 10;
-let typeaheadName = 'unittest';
+const typeaheadHistoryCount = 10;
+const typeaheadName = 'unittest';
 let $parentScope;
 let $typeaheadScope;
 let $elem;
-let $typeaheadInputScope;
 let typeaheadCtrl;
-let PersistedLog;
 
 let markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
   '<input type="text" placeholder="Filter..." class="form-control" ng-model="query" kbn-typeahead-input>' +
   '<kbn-typeahead-items></kbn-typeahead-items>' +
   '</div>';
-let typeaheadItems = ['abc', 'def', 'ghi'];
+const typeaheadItems = ['abc', 'def', 'ghi'];
 
-let init = function () {
+const init = function () {
   // Load the application
   ngMock.module('kibana');
 
@@ -52,8 +50,6 @@ let init = function () {
 
     $elem = angular.element(markup);
 
-    PersistedLog = $injector.get('PersistedLog');
-
     $compile($elem)($parentScope);
     $elem.scope().$digest();
     $typeaheadScope = $elem.isolateScope();
@@ -64,7 +60,7 @@ let init = function () {
 describe('typeahead directive', function () {
   describe('typeahead requirements', function () {
     describe('missing input', function () {
-      let goodMarkup = markup;
+      const goodMarkup = markup;
 
       before(function () {
         markup = '<div class="typeahead" kbn-typeahead="' + typeaheadName + '">' +
@@ -99,7 +95,7 @@ describe('typeahead directive', function () {
       });
 
       it('should not save empty entries', function () {
-        let entries = typeaheadItems.slice(0);
+        const entries = typeaheadItems.slice(0);
         entries.push('', 'jkl');
         for (let i = 0; i < entries.length; i++) {
           $typeaheadScope.inputModel.$setViewValue(entries[i]);
@@ -129,9 +125,9 @@ describe('typeahead directive', function () {
       });
 
       it('should order filtered results', function () {
-        let entries = ['ac/dc', 'anthrax', 'abba', 'phantogram', 'skrillex'];
-        let allEntries = typeaheadItems.concat(entries);
-        let startMatches = allEntries.filter(function (item) {
+        const entries = ['ac/dc', 'anthrax', 'abba', 'phantogram', 'skrillex'];
+        const allEntries = typeaheadItems.concat(entries);
+        const startMatches = allEntries.filter(function (item) {
           return /^a/.test(item);
         });
         typeaheadCtrl.history.add.returns(allEntries);
@@ -144,7 +140,7 @@ describe('typeahead directive', function () {
         typeaheadCtrl.filterItemsByQuery('a');
 
         expect($typeaheadScope.filteredItems).to.contain('phantogram');
-        let nonStarterIndex = $typeaheadScope.filteredItems.indexOf('phantogram');
+        const nonStarterIndex = $typeaheadScope.filteredItems.indexOf('phantogram');
 
         startMatches.forEach(function (item) {
           expect($typeaheadScope.filteredItems).to.contain(item);
diff --git a/src/ui/public/directives/__tests__/validate_cidr_mask.js b/src/ui/public/directives/__tests__/validate_cidr_mask.js
index 702d983ab3b35..79cd028ec1d0c 100644
--- a/src/ui/public/directives/__tests__/validate_cidr_mask.js
+++ b/src/ui/public/directives/__tests__/validate_cidr_mask.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/directives/validate_cidr_mask';
@@ -7,7 +6,7 @@ import 'ui/directives/validate_cidr_mask';
 describe('Validate CIDR mask directive', function () {
   let $compile;
   let $rootScope;
-  let html = '<input type="text" ng-model="value" validate-cidr-mask />';
+  const html = '<input type="text" ng-model="value" validate-cidr-mask />';
 
   beforeEach(ngMock.module('kibana'));
 
@@ -17,7 +16,7 @@ describe('Validate CIDR mask directive', function () {
   }));
 
   it('should allow empty input', function () {
-    let element = $compile(html)($rootScope);
+    const element = $compile(html)($rootScope);
 
     $rootScope.value = '';
     $rootScope.$digest();
@@ -33,7 +32,7 @@ describe('Validate CIDR mask directive', function () {
   });
 
   it('should allow valid CIDR masks', function () {
-    let element = $compile(html)($rootScope);
+    const element = $compile(html)($rootScope);
 
     $rootScope.value = '0.0.0.0/1';
     $rootScope.$digest();
@@ -53,7 +52,7 @@ describe('Validate CIDR mask directive', function () {
   });
 
   it('should disallow invalid CIDR masks', function () {
-    let element = $compile(html)($rootScope);
+    const element = $compile(html)($rootScope);
 
     $rootScope.value = 'hello, world';
     $rootScope.$digest();
diff --git a/src/ui/public/directives/__tests__/validate_date_math.js b/src/ui/public/directives/__tests__/validate_date_math.js
index 02385b06a4940..9064f18db5244 100644
--- a/src/ui/public/directives/__tests__/validate_date_math.js
+++ b/src/ui/public/directives/__tests__/validate_date_math.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/directives/validate_date_math';
@@ -7,7 +6,7 @@ import 'ui/directives/validate_date_math';
 describe('Validate date math directive', function () {
   let $compile;
   let $rootScope;
-  let html = '<input type="text" ng-model="value" validate-date-math />';
+  const html = '<input type="text" ng-model="value" validate-date-math />';
 
   beforeEach(ngMock.module('kibana'));
 
@@ -17,7 +16,7 @@ describe('Validate date math directive', function () {
   }));
 
   it('should allow valid date math', function () {
-    let element = $compile(html)($rootScope);
+    const element = $compile(html)($rootScope);
 
     $rootScope.value = 'now';
     $rootScope.$digest();
@@ -41,7 +40,7 @@ describe('Validate date math directive', function () {
   });
 
   it('should disallow invalid date math', function () {
-    let element = $compile(html)($rootScope);
+    const element = $compile(html)($rootScope);
 
     $rootScope.value = 'hello, world';
     $rootScope.$digest();
@@ -61,7 +60,7 @@ describe('Validate date math directive', function () {
   });
 
   it('should allow empty values', function () {
-    let element = $compile(html)($rootScope);
+    const element = $compile(html)($rootScope);
 
     $rootScope.value = '';
     $rootScope.$digest();
diff --git a/src/ui/public/directives/__tests__/validate_index_name.js b/src/ui/public/directives/__tests__/validate_index_name.js
index 3deb454077e1e..d23aa11aeea1c 100644
--- a/src/ui/public/directives/__tests__/validate_index_name.js
+++ b/src/ui/public/directives/__tests__/validate_index_name.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/directives/validate_index_name';
@@ -8,8 +7,8 @@ import 'ui/directives/validate_index_name';
 describe('Validate index name directive', function () {
   let $compile;
   let $rootScope;
-  let noWildcardHtml = '<input type="text" ng-model="indexName" validate-index-name />';
-  let allowWildcardHtml = '<input type="text" ng-model="indexName" allow-wildcard validate-index-name />';
+  const noWildcardHtml = '<input type="text" ng-model="indexName" validate-index-name />';
+  const allowWildcardHtml = '<input type="text" ng-model="indexName" allow-wildcard validate-index-name />';
 
   beforeEach(ngMock.module('kibana'));
 
@@ -20,7 +19,7 @@ describe('Validate index name directive', function () {
 
   function checkPattern(input, html) {
     $rootScope.indexName = input;
-    let element = $compile(html)($rootScope);
+    const element = $compile(html)($rootScope);
     $rootScope.$digest();
     return element;
   }
@@ -57,7 +56,7 @@ describe('Validate index name directive', function () {
 
   badPatterns.forEach(function (pattern) {
     it('should not accept index pattern: ' + pattern, function () {
-      let element = checkPattern(pattern, noWildcardHtml);
+      const element = checkPattern(pattern, noWildcardHtml);
       expect(element.hasClass('ng-invalid')).to.be(true);
       expect(element.hasClass('ng-valid')).to.not.be(true);
     });
@@ -65,7 +64,7 @@ describe('Validate index name directive', function () {
 
   goodPatterns.forEach(function (pattern) {
     it('should accept index pattern: ' + pattern, function () {
-      let element = checkPattern(pattern, noWildcardHtml);
+      const element = checkPattern(pattern, noWildcardHtml);
       expect(element.hasClass('ng-invalid')).to.not.be(true);
       expect(element.hasClass('ng-valid')).to.be(true);
     });
@@ -73,7 +72,7 @@ describe('Validate index name directive', function () {
 
   it('should disallow wildcards by default', function () {
     wildcardPatterns.forEach(function (pattern) {
-      let element = checkPattern(pattern, noWildcardHtml);
+      const element = checkPattern(pattern, noWildcardHtml);
       expect(element.hasClass('ng-invalid')).to.be(true);
       expect(element.hasClass('ng-valid')).to.not.be(true);
     });
@@ -81,7 +80,7 @@ describe('Validate index name directive', function () {
 
   it('should allow wildcards if the allow-wildcard attribute is present', function () {
     wildcardPatterns.forEach(function (pattern) {
-      let element = checkPattern(pattern, allowWildcardHtml);
+      const element = checkPattern(pattern, allowWildcardHtml);
       expect(element.hasClass('ng-invalid')).to.not.be(true);
       expect(element.hasClass('ng-valid')).to.be(true);
     });
diff --git a/src/ui/public/directives/__tests__/validate_ip.js b/src/ui/public/directives/__tests__/validate_ip.js
index 9f5066f28f8cf..122ea9676162e 100644
--- a/src/ui/public/directives/__tests__/validate_ip.js
+++ b/src/ui/public/directives/__tests__/validate_ip.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/directives/validate_ip';
@@ -7,7 +6,7 @@ import 'ui/directives/validate_ip';
 describe('Validate IP directive', function () {
   let $compile;
   let $rootScope;
-  let html = '<input type="text" ng-model="value" validate-ip />';
+  const html = '<input type="text" ng-model="value" validate-ip />';
 
   beforeEach(ngMock.module('kibana'));
 
@@ -17,7 +16,7 @@ describe('Validate IP directive', function () {
   }));
 
   it('should allow empty input', function () {
-    let element = $compile(html)($rootScope);
+    const element = $compile(html)($rootScope);
 
     $rootScope.value = '';
     $rootScope.$digest();
@@ -33,7 +32,7 @@ describe('Validate IP directive', function () {
   });
 
   it('should allow valid IP addresses', function () {
-    let element = $compile(html)($rootScope);
+    const element = $compile(html)($rootScope);
 
     $rootScope.value = '0.0.0.0';
     $rootScope.$digest();
@@ -53,7 +52,7 @@ describe('Validate IP directive', function () {
   });
 
   it('should disallow invalid IP addresses', function () {
-    let element = $compile(html)($rootScope);
+    const element = $compile(html)($rootScope);
 
     $rootScope.value = 'hello, world';
     $rootScope.$digest();
diff --git a/src/ui/public/directives/__tests__/validate_json.js b/src/ui/public/directives/__tests__/validate_json.js
index cf2616dc4baf1..69f4ea13d987e 100644
--- a/src/ui/public/directives/__tests__/validate_json.js
+++ b/src/ui/public/directives/__tests__/validate_json.js
@@ -8,23 +8,23 @@ import 'ui/directives/validate_json';
 let $parentScope;
 let $elemScope;
 let $elem;
-let mockScope = '';
+const mockScope = '';
 
-let input = {
+const input = {
   valid: '{ "test": "json input" }',
   invalid: 'strings are not json'
 };
 
-let markup = {
+const markup = {
   textarea: '<textarea ng-model="mockModel" validate-json></textarea>',
   input: '<input type="text" ng-model="mockModel" validate-json>'
 };
 
-let init = function (type) {
+const init = function (type) {
   // Load the application
   ngMock.module('kibana');
   type = type || 'input';
-  let elMarkup = markup[type];
+  const elMarkup = markup[type];
 
   // Create the scope
   ngMock.inject(function ($injector, $rootScope, $compile) {
@@ -39,7 +39,7 @@ let init = function (type) {
 };
 
 describe('validate-json directive', function () {
-  let checkValid = function (inputVal, className) {
+  const checkValid = function (inputVal, className) {
     $parentScope.mockModel = inputVal;
     $elem.scope().$digest();
     expect($elem.hasClass(className)).to.be(true);
diff --git a/src/ui/public/directives/auto_select_if_only_one.js b/src/ui/public/directives/auto_select_if_only_one.js
index 2fead2be3983c..0c77ed7d7150c 100644
--- a/src/ui/public/directives/auto_select_if_only_one.js
+++ b/src/ui/public/directives/auto_select_if_only_one.js
@@ -1,5 +1,5 @@
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.directive('autoSelectIfOnlyOne', function ($parse) {
   return {
@@ -7,7 +7,7 @@ module.directive('autoSelectIfOnlyOne', function ($parse) {
     require: 'ngModel',
     link: function (scope, element, attributes, ngModelCtrl) {
       attributes.$observe('autoSelectIfOnlyOne', function (result) {
-        let options = $parse(result)(scope);
+        const options = $parse(result)(scope);
         if (options && options.length === 1) {
           ngModelCtrl.$setViewValue(options[0]);
           ngModelCtrl.$render();
diff --git a/src/ui/public/directives/bread_crumbs.js b/src/ui/public/directives/bread_crumbs.js
index df0f9a7c5c390..612d69c4da402 100644
--- a/src/ui/public/directives/bread_crumbs.js
+++ b/src/ui/public/directives/bread_crumbs.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import chrome from 'ui/chrome/chrome';
 import breadCrumbsTemplate from 'ui/partials/bread_crumbs.html';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.directive('breadCrumbs', function () {
   return {
diff --git a/src/ui/public/directives/click_focus.js b/src/ui/public/directives/click_focus.js
index 5a005676699c8..1c84249a131af 100644
--- a/src/ui/public/directives/click_focus.js
+++ b/src/ui/public/directives/click_focus.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import $ from 'jquery';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.directive('clickFocus', function () {
   return {
@@ -11,7 +11,7 @@ module.directive('clickFocus', function () {
     restrict: 'A',
     link: function ($scope, $elem) {
       function handler() {
-        let focusElem = $.find('input[name=' + $scope.clickFocus + ']');
+        const focusElem = $.find('input[name=' + $scope.clickFocus + ']');
         if (focusElem[0]) focusElem[0].focus();
       }
 
diff --git a/src/ui/public/directives/confirm_click.js b/src/ui/public/directives/confirm_click.js
index 9c83e861ee292..fc7ae54a36499 100644
--- a/src/ui/public/directives/confirm_click.js
+++ b/src/ui/public/directives/confirm_click.js
@@ -6,9 +6,9 @@ uiModules
     restrict: 'A',
     link: function ($scope, $elem, attrs) {
       $elem.bind('click', function () {
-        let message = attrs.confirmation || 'Are you sure?';
+        const message = attrs.confirmation || 'Are you sure?';
         if (window.confirm(message)) { // eslint-disable-line no-alert
-          let action = attrs.confirmClick;
+          const action = attrs.confirmClick;
           if (action) {
             $scope.$apply($scope.$eval(action));
           }
diff --git a/src/ui/public/directives/css_truncate.js b/src/ui/public/directives/css_truncate.js
index b9541a814d2d2..37d03a374a854 100644
--- a/src/ui/public/directives/css_truncate.js
+++ b/src/ui/public/directives/css_truncate.js
@@ -1,9 +1,7 @@
-import $ from 'jquery';
-import _ from 'lodash';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
-module.directive('cssTruncate', function ($timeout) {
+module.directive('cssTruncate', function () {
   return {
     restrict: 'A',
     scope: {},
@@ -21,7 +19,7 @@ module.directive('cssTruncate', function ($timeout) {
           function () { return $elem.html(); },
           function () {
             if ($elem[0].offsetWidth < $elem[0].scrollWidth) {
-              $elem.css({'cursor': 'pointer'});
+              $elem.css({ 'cursor': 'pointer' });
               $elem.bind('click', function () {
                 $scope.toggle();
               });
@@ -32,9 +30,9 @@ module.directive('cssTruncate', function ($timeout) {
 
       $scope.toggle = function () {
         if ($elem.css('white-space') !== 'normal') {
-          $elem.css({'white-space': 'normal'});
+          $elem.css({ 'white-space': 'normal' });
         } else {
-          $elem.css({'white-space': 'nowrap'});
+          $elem.css({ 'white-space': 'nowrap' });
         }
       };
 
diff --git a/src/ui/public/directives/field_name.js b/src/ui/public/directives/field_name.js
index ffeace0af0f7c..2a1837f610b2e 100644
--- a/src/ui/public/directives/field_name.js
+++ b/src/ui/public/directives/field_name.js
@@ -1,7 +1,7 @@
 import $ from 'jquery';
 import 'ui/filters/short_dots';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.directive('fieldName', function ($compile, $rootScope, $filter) {
   return {
@@ -13,7 +13,7 @@ module.directive('fieldName', function ($compile, $rootScope, $filter) {
     },
     link: function ($scope, $el) {
 
-      let typeIcon = function (fieldType) {
+      const typeIcon = function (fieldType) {
         switch (fieldType) {
           case 'source':
             return '<i title="source" class="fa fa-file-text-o "></i>';
@@ -45,12 +45,12 @@ module.directive('fieldName', function ($compile, $rootScope, $filter) {
         'field.rowCount'
       ], function () {
 
-        let type = $scope.field ? $scope.field.type : $scope.fieldType;
-        let name = $scope.field ? $scope.field.name : $scope.fieldName;
-        let results = $scope.field ? !$scope.field.rowCount && !$scope.field.scripted : false;
-        let scripted = $scope.field ? $scope.field.scripted : false;
+        const type = $scope.field ? $scope.field.type : $scope.fieldType;
+        const name = $scope.field ? $scope.field.name : $scope.fieldName;
+        const results = $scope.field ? !$scope.field.rowCount && !$scope.field.scripted : false;
+        const scripted = $scope.field ? $scope.field.scripted : false;
 
-        let displayName = $filter('shortDots')(name);
+        const displayName = $filter('shortDots')(name);
 
         $el
           .attr('title', name)
diff --git a/src/ui/public/directives/file_upload.js b/src/ui/public/directives/file_upload.js
index 06c4752b456bf..98a3db61cf390 100644
--- a/src/ui/public/directives/file_upload.js
+++ b/src/ui/public/directives/file_upload.js
@@ -1,9 +1,9 @@
 import _ from 'lodash';
 import $ from 'jquery';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
-let html = '<span class="dropzone" ng-transclude></span>';
+const html = '<span class="dropzone" ng-transclude></span>';
 
 module.directive('fileUpload', function () {
   return {
@@ -16,17 +16,17 @@ module.directive('fileUpload', function () {
     },
     template: html,
     link: function ($scope, $elem, attrs) {
-      let $button = $elem.find($scope.uploadSelector);
-      let $dropzone = $elem.find('.dropzone');
+      const $button = $elem.find($scope.uploadSelector);
+      const $dropzone = $elem.find('.dropzone');
 
       const handleFile = (file) => {
         if (_.isUndefined(file)) return;
 
         if (_.has(attrs, 'onRead')) {
-          let reader = new FileReader();
+          const reader = new FileReader();
           reader.onload = function (e) {
             $scope.$apply(function () {
-              $scope.onRead({fileContents: e.target.result});
+              $scope.onRead({ fileContents: e.target.result });
             });
           };
           reader.readAsText(file);
@@ -66,13 +66,13 @@ module.directive('fileUpload', function () {
         $elem.append($fileInput);
 
         $fileInput.on('change', function (e) {
-          let target = e.srcElement || e.target;
+          const target = e.srcElement || e.target;
           if (_.get(target, 'files.length')) {
             handleFile(target.files[0]);
           }
         });
 
-        $button.on('click', function (e) {
+        $button.on('click', function () {
           $fileInput.val(null);
           $fileInput.trigger('click');
         });
diff --git a/src/ui/public/directives/inequality.js b/src/ui/public/directives/inequality.js
index b6e2ed72b0688..44b0d0e977652 100644
--- a/src/ui/public/directives/inequality.js
+++ b/src/ui/public/directives/inequality.js
@@ -5,8 +5,8 @@ function makeDirectiveDef(id, compare) {
     return {
       require: 'ngModel',
       link: function ($scope, $el, $attr, ngModel) {
-        let getBound = function () { return $parse($attr[id])(); };
-        let defaultVal = {
+        const getBound = function () { return $parse($attr[id])(); };
+        const defaultVal = {
           'greaterThan': -Infinity,
           'lessThan': Infinity
         }[id];
@@ -19,8 +19,8 @@ function makeDirectiveDef(id, compare) {
         });
 
         function validate(val) {
-          let bound = !isNaN(getBound()) ? +getBound() : defaultVal;
-          let valid = !isNaN(bound) && !isNaN(val) && compare(val, bound);
+          const bound = !isNaN(getBound()) ? +getBound() : defaultVal;
+          const valid = !isNaN(bound) && !isNaN(val) && compare(val, bound);
           ngModel.$setValidity(id, valid);
           return val;
         }
diff --git a/src/ui/public/directives/infinite_scroll.js b/src/ui/public/directives/infinite_scroll.js
index db1f410f56ed0..a78fbb96f3632 100644
--- a/src/ui/public/directives/infinite_scroll.js
+++ b/src/ui/public/directives/infinite_scroll.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.directive('kbnInfiniteScroll', function () {
   return {
@@ -8,21 +8,21 @@ module.directive('kbnInfiniteScroll', function () {
     scope: {
       more: '='
     },
-    link: function ($scope, $element, attrs) {
-      let $window = $(window);
+    link: function ($scope, $element) {
+      const $window = $(window);
       let checkTimer;
 
       function onScroll() {
         if (!$scope.more) return;
 
-        let winHeight = $window.height();
-        let winBottom = winHeight + $window.scrollTop();
-        let elTop = $element.offset().top;
-        let remaining = elTop - winBottom;
+        const winHeight = $window.height();
+        const winBottom = winHeight + $window.scrollTop();
+        const elTop = $element.offset().top;
+        const remaining = elTop - winBottom;
 
         if (remaining <= winHeight * 0.50) {
           $scope[$scope.$$phase ? '$eval' : '$apply'](function () {
-            let more = $scope.more();
+            $scope.more();
           });
         }
       }
diff --git a/src/ui/public/directives/input_datetime.js b/src/ui/public/directives/input_datetime.js
index 0559358e83093..53c2f21dca72f 100644
--- a/src/ui/public/directives/input_datetime.js
+++ b/src/ui/public/directives/input_datetime.js
@@ -1,8 +1,6 @@
-import $ from 'jquery';
-import _ from 'lodash';
 import moment from 'moment';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.directive('inputDatetime', function () {
   return {
@@ -10,18 +8,18 @@ module.directive('inputDatetime', function () {
     require: 'ngModel',
     link: function ($scope, $elem, attrs, ngModel) {
 
-      let format = 'YYYY-MM-DD HH:mm:ss.SSS';
+      const format = 'YYYY-MM-DD HH:mm:ss.SSS';
 
       $elem.after('<div class="input-datetime-format">' + format + '</div>');
 
       // What should I make with the input from the user?
-      let fromUser = function (text) {
-        let parsed = moment(text, format);
+      const fromUser = function (text) {
+        const parsed = moment(text, format);
         return parsed.isValid() ? parsed : undefined;
       };
 
       // How should I present the data back to the user in the input field?
-      let toUser = function (datetime) {
+      const toUser = function (datetime) {
         return moment(datetime).format(format);
       };
 
diff --git a/src/ui/public/directives/input_focus.js b/src/ui/public/directives/input_focus.js
index c6adccfd3e7b0..ce904b459e0f1 100644
--- a/src/ui/public/directives/input_focus.js
+++ b/src/ui/public/directives/input_focus.js
@@ -1,5 +1,5 @@
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.directive('inputFocus', function ($timeout) {
   return {
diff --git a/src/ui/public/directives/input_number.js b/src/ui/public/directives/input_number.js
index 51b11f0b9b44d..d7b3b79794d7e 100644
--- a/src/ui/public/directives/input_number.js
+++ b/src/ui/public/directives/input_number.js
@@ -1,5 +1,5 @@
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.directive('inputNumber', function () {
   return {
diff --git a/src/ui/public/directives/json_input.js b/src/ui/public/directives/json_input.js
index 640b5bd887906..35066233018b8 100644
--- a/src/ui/public/directives/json_input.js
+++ b/src/ui/public/directives/json_input.js
@@ -15,7 +15,7 @@ uiModules
       function fromJSON(value) {
         try {
           value = JSON.parse(value);
-          let validity = !scope.$eval(attrs.requireKeys) ? true : _.keys(value).length > 0;
+          const validity = !scope.$eval(attrs.requireKeys) ? true : _.keys(value).length > 0;
           ngModelCntrl.$setValidity('json', validity);
         } catch (e) {
           ngModelCntrl.$setValidity('json', false);
diff --git a/src/ui/public/directives/kbn_href.js b/src/ui/public/directives/kbn_href.js
index 20b4bd11a44e6..9b05fe4701a7e 100644
--- a/src/ui/public/directives/kbn_href.js
+++ b/src/ui/public/directives/kbn_href.js
@@ -1,8 +1,7 @@
 import UiModules from 'ui/modules';
-import { words, camelCase, kebabCase } from 'lodash';
+import { words, kebabCase } from 'lodash';
 
 export function kbnUrlDirective(name) {
-  const srcAttr = kebabCase(name);
   const attr = kebabCase(words(name).slice(1));
 
   UiModules
diff --git a/src/ui/public/directives/paginate.js b/src/ui/public/directives/paginate.js
index cf11e8ac6fd0d..b8202a9ec5969 100644
--- a/src/ui/public/directives/paginate.js
+++ b/src/ui/public/directives/paginate.js
@@ -2,8 +2,6 @@ import _ from 'lodash';
 import uiModules from 'ui/modules';
 import paginateControlsTemplate from 'ui/partials/paginate_controls.html';
 
-let PER_PAGE_DEFAULT = 10;
-
 uiModules.get('kibana')
 .directive('paginate', function ($parse, $compile) {
   return {
@@ -22,7 +20,7 @@ uiModules.get('kibana')
           $el.prepend($compile('<paginate-controls class="paginate-top">')($scope));
         }
 
-        let paginate = $scope.paginate;
+        const paginate = $scope.paginate;
 
         // add some getters to the controller powered by attributes
         paginate.getList = $parse(attrs.list);
@@ -42,8 +40,8 @@ uiModules.get('kibana')
     },
     controllerAs: 'paginate',
     controller: function ($scope) {
-      let self = this;
-      let ALL = 0;
+      const self = this;
+      const ALL = 0;
 
       self.sizeOptions = [
         { title: '10', value: 10 },
@@ -62,8 +60,7 @@ uiModules.get('kibana')
           self.perPageProp,
           self.otherWidthGetter
         ], function (vals, oldVals) {
-          let intChanges = vals[0] !== oldVals[0];
-          let extChanges = vals[1] !== oldVals[1];
+          const intChanges = vals[0] !== oldVals[0];
 
           if (intChanges) {
             if (!setPerPage(self.perPage)) {
@@ -102,14 +99,14 @@ uiModules.get('kibana')
         $scope.pages = [];
         if (!$scope.list) return;
 
-        let perPage = _.parseInt(self.perPage);
-        let count = perPage ? Math.ceil($scope.list.length / perPage) : 1;
+        const perPage = _.parseInt(self.perPage);
+        const count = perPage ? Math.ceil($scope.list.length / perPage) : 1;
 
         _.times(count, function (i) {
           let page;
 
           if (perPage) {
-            let start = perPage * i;
+            const start = perPage * i;
             page = $scope.list.slice(start, start + perPage);
           } else {
             page = $scope.list.slice(0);
@@ -144,7 +141,7 @@ uiModules.get('kibana')
 
         // setup the list of the other pages to link to
         $scope.otherPages = [];
-        let width = +self.otherWidthGetter($scope) || 5;
+        const width = +self.otherWidthGetter($scope) || 5;
         let left = page.i - Math.round((width - 1) / 2);
         let right = left + width - 1;
 
@@ -155,14 +152,14 @@ uiModules.get('kibana')
         }
 
         // shift extra right nums to left
-        let lastI = page.count - 1;
+        const lastI = page.count - 1;
         if (right > lastI) {
           right = lastI;
           left = right - width + 1;
         }
 
         for (let i = left; i <= right; i++) {
-          let other = $scope.pages[i];
+          const other = $scope.pages[i];
 
           if (!other) continue;
 
diff --git a/src/ui/public/directives/paginated_selectable_list.js b/src/ui/public/directives/paginated_selectable_list.js
index 18d5ec3ab6e3c..207c68300c330 100644
--- a/src/ui/public/directives/paginated_selectable_list.js
+++ b/src/ui/public/directives/paginated_selectable_list.js
@@ -8,7 +8,7 @@ function throwError(message) {
   throw new Error(message);
 }
 
-module.directive('paginatedSelectableList', function (kbnUrl) {
+module.directive('paginatedSelectableList', function () {
 
   return {
     restrict: 'E',
@@ -20,7 +20,7 @@ module.directive('paginatedSelectableList', function (kbnUrl) {
       userOnSelect: '=?'
     },
     template: paginatedSelectableListTemplate,
-    controller: function ($scope, $element, $filter) {
+    controller: function ($scope) {
       // Should specify either user-make-url or user-on-select
       if (!$scope.userMakeUrl && !$scope.userOnSelect) {
         throwError('paginatedSelectableList directive expects a makeUrl or onSelect function');
diff --git a/src/ui/public/directives/pretty_duration.js b/src/ui/public/directives/pretty_duration.js
index 4354f4d0ebaca..c1ed21d5c4344 100644
--- a/src/ui/public/directives/pretty_duration.js
+++ b/src/ui/public/directives/pretty_duration.js
@@ -4,7 +4,7 @@ import moment from 'moment';
 import 'ui/timepicker/quick_ranges';
 import 'ui/timepicker/time_units';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 
 module.directive('prettyDuration', function (config, quickRanges, timeUnits) {
@@ -15,9 +15,9 @@ module.directive('prettyDuration', function (config, quickRanges, timeUnits) {
       to: '='
     },
     link: function ($scope, $elem) {
-      let dateFormat = config.get('dateFormat');
+      const dateFormat = config.get('dateFormat');
 
-      let lookupByRange = {};
+      const lookupByRange = {};
       _.each(quickRanges, function (frame) {
         lookupByRange[frame.from + ' to ' + frame.to] = frame;
       });
@@ -26,13 +26,13 @@ module.directive('prettyDuration', function (config, quickRanges, timeUnits) {
         let text;
         // If both parts are date math, try to look up a reasonable string
         if ($scope.from && $scope.to && !moment.isMoment($scope.from) && !moment.isMoment($scope.to)) {
-          let tryLookup = lookupByRange[$scope.from.toString() + ' to ' + $scope.to.toString()];
+          const tryLookup = lookupByRange[$scope.from.toString() + ' to ' + $scope.to.toString()];
           if (tryLookup) {
             $elem.text(tryLookup.display);
           } else {
-            let fromParts = $scope.from.toString().split('-');
+            const fromParts = $scope.from.toString().split('-');
             if ($scope.to.toString() === 'now' && fromParts[0] === 'now' && fromParts[1]) {
-              let rounded = fromParts[1].split('/');
+              const rounded = fromParts[1].split('/');
               text = 'Last ' + rounded[0];
               if (rounded[1]) {
                 text = text + ' rounded to the ' + timeUnits[rounded[1]];
@@ -46,10 +46,10 @@ module.directive('prettyDuration', function (config, quickRanges, timeUnits) {
         } else {
           cantLookup();
         }
-      };
+      }
 
       function cantLookup() {
-        let display = {};
+        const display = {};
         _.each(['from', 'to'], function (time) {
           if (moment.isMoment($scope[time])) {
             display[time] = $scope[time].format(dateFormat);
@@ -57,13 +57,13 @@ module.directive('prettyDuration', function (config, quickRanges, timeUnits) {
             if ($scope[time] === 'now') {
               display[time] = 'now';
             } else {
-              let tryParse = dateMath.parse($scope[time], time === 'to' ? true : false);
+              const tryParse = dateMath.parse($scope[time], time === 'to' ? true : false);
               display[time] = moment.isMoment(tryParse) ? '~ ' + tryParse.fromNow() : $scope[time];
             }
           }
         });
         $elem.text(display.from + ' to ' + display.to);
-      };
+      }
 
       $scope.$watch('from', stringify);
       $scope.$watch('to', stringify);
diff --git a/src/ui/public/directives/rows.js b/src/ui/public/directives/rows.js
index b9bab0cdeb7c2..7909bf102e71f 100644
--- a/src/ui/public/directives/rows.js
+++ b/src/ui/public/directives/rows.js
@@ -3,10 +3,10 @@ import _ from 'lodash';
 import AggConfigResult from 'ui/vis/agg_config_result';
 import FilterBarFilterBarClickHandlerProvider from 'ui/filter_bar/filter_bar_click_handler';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.directive('kbnRows', function ($compile, $rootScope, getAppState, Private) {
-  let filterBarClickHandler = Private(FilterBarFilterBarClickHandlerProvider);
+  const filterBarClickHandler = Private(FilterBarFilterBarClickHandlerProvider);
   return {
     restrict: 'A',
     link: function ($scope, $el, attr) {
@@ -17,10 +17,10 @@ module.directive('kbnRows', function ($compile, $rootScope, getAppState, Private
         // access to it here. This may become a problem with the switch to BigNumber
         if (_.isNumeric(contents)) $cell.addClass('numeric-value');
 
-        let createAggConfigResultCell = function (aggConfigResult) {
-          let $cell = $(document.createElement('td'));
-          let $state = getAppState();
-          let clickHandler = filterBarClickHandler($state);
+        const createAggConfigResultCell = function (aggConfigResult) {
+          const $cell = $(document.createElement('td'));
+          const $state = getAppState();
+          const clickHandler = filterBarClickHandler($state);
           $cell.scope = $scope.$new();
           $cell.addClass('cell-hover');
           $cell.attr('ng-click', 'clickHandler($event)');
@@ -76,18 +76,18 @@ module.directive('kbnRows', function ($compile, $rootScope, getAppState, Private
         attr.kbnRowsMin
       ], function (vals) {
         let rows = vals[0];
-        let min = vals[1];
+        const min = vals[1];
 
         $el.empty();
 
         if (!_.isArray(rows)) rows = [];
-        let width = rows.reduce(maxRowSize, 0);
+        const width = rows.reduce(maxRowSize, 0);
 
         if (isFinite(min) && rows.length < min) {
           // clone the rows so that we can add elements to it without upsetting the original
           rows = _.clone(rows);
           // crate the empty row which will be pushed into the row list over and over
-          let emptyRow = new Array(width);
+          const emptyRow = new Array(width);
           // fill the empty row with values
           _.times(width, function (i) { emptyRow[i] = ''; });
           // push as many empty rows into the row array as needed
@@ -95,7 +95,7 @@ module.directive('kbnRows', function ($compile, $rootScope, getAppState, Private
         }
 
         rows.forEach(function (row) {
-          let $tr = $(document.createElement('tr')).appendTo($el);
+          const $tr = $(document.createElement('tr')).appendTo($el);
           row.forEach(function (cell) {
             addCell($tr, cell);
           });
diff --git a/src/ui/public/directives/saved_object_finder.js b/src/ui/public/directives/saved_object_finder.js
index d936f04342fd9..42c50870a0e3d 100644
--- a/src/ui/public/directives/saved_object_finder.js
+++ b/src/ui/public/directives/saved_object_finder.js
@@ -4,11 +4,11 @@ import keymap from 'ui/utils/key_map';
 import SavedObjectsSavedObjectRegistryProvider from 'ui/saved_objects/saved_object_registry';
 import uiModules from 'ui/modules';
 import savedObjectFinderTemplate from 'ui/partials/saved_object_finder.html';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Private, config) {
 
-  let services = Private(SavedObjectsSavedObjectRegistryProvider).byLoaderPropertiesName;
+  const services = Private(SavedObjectsSavedObjectRegistryProvider).byLoaderPropertiesName;
 
   return {
     restrict: 'E',
@@ -24,17 +24,17 @@ module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Pr
     },
     template: savedObjectFinderTemplate,
     controllerAs: 'finder',
-    controller: function ($scope, $element, $timeout) {
-      let self = this;
+    controller: function ($scope, $element) {
+      const self = this;
 
       // the text input element
-      let $input = $element.find('input[ng-model=filter]');
+      const $input = $element.find('input[ng-model=filter]');
 
       // The number of items to show in the list
       $scope.perPage = config.get('savedObjects:perPage');
 
       // the list that will hold the suggestions
-      let $list = $element.find('ul');
+      const $list = $element.find('ul');
 
       // the current filter string, used to check that returned results are still useful
       let currentFilter = $scope.filter;
@@ -97,7 +97,7 @@ module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Pr
           $scope.userOnChoose(hit, $event);
         }
 
-        let url = self.makeUrl(hit);
+        const url = self.makeUrl(hit);
         if (!url || url === '#' || url.charAt(0) !== '#') return;
 
         $event.preventDefault();
@@ -135,7 +135,7 @@ module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Pr
           case 'enter':
             if (self.hitCount !== 1) return;
 
-            let hit = self.hits[0];
+            const hit = self.hits[0];
             if (!hit) return;
 
             self.onChoose(hit, $event);
@@ -208,8 +208,8 @@ module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Pr
           case 'enter':
             if (!self.selector.enabled) break;
 
-            let hitIndex = ((page.number - 1) * paginate.perPage) + self.selector.index;
-            let hit = self.hits[hitIndex];
+            const hitIndex = ((page.number - 1) * paginate.perPage) + self.selector.index;
+            const hit = self.hits[hitIndex];
             if (!hit) break;
 
             self.onChoose(hit, $event);
@@ -223,13 +223,13 @@ module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Pr
         }
       };
 
-      self.hitBlur = function ($event) {
+      self.hitBlur = function () {
         self.selector.index = -1;
         self.selector.enabled = false;
       };
 
       self.manageObjects = function (type) {
-        $location.url('/management/kibana/objects?_a=' + rison.encode({tab: type}));
+        $location.url('/management/kibana/objects?_a=' + rison.encode({ tab: type }));
       };
 
       self.hitCountNoun = function () {
@@ -251,7 +251,7 @@ module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Pr
         // but ensure that we don't search for the same
         // thing twice. This is called from multiple places
         // and needs to be smart about when it actually searches
-        let filter = currentFilter;
+        const filter = currentFilter;
         if (prevSearch === filter) return;
 
         prevSearch = filter;
@@ -265,18 +265,6 @@ module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Pr
           }
         });
       }
-
-      function scrollIntoView($element, snapTop) {
-        let el = $element[0];
-
-        if (!el) return;
-
-        if ('scrollIntoViewIfNeeded' in el) {
-          el.scrollIntoViewIfNeeded(snapTop);
-        } else if ('scrollIntoView' in el) {
-          el.scrollIntoView(snapTop);
-        }
-      }
     }
   };
 });
diff --git a/src/ui/public/directives/truncated.js b/src/ui/public/directives/truncated.js
index 4d2773a241174..75ac91c969d3d 100644
--- a/src/ui/public/directives/truncated.js
+++ b/src/ui/public/directives/truncated.js
@@ -1,4 +1,3 @@
-import $ from 'jquery';
 import truncText from 'trunc-text';
 import truncHTML from 'trunc-html';
 import uiModules from 'ui/modules';
@@ -7,7 +6,7 @@ import 'angular-sanitize';
 
 const module = uiModules.get('kibana', ['ngSanitize']);
 
-module.directive('kbnTruncated', function ($compile) {
+module.directive('kbnTruncated', function () {
   return {
     restrict: 'E',
     scope: {
@@ -16,7 +15,7 @@ module.directive('kbnTruncated', function ($compile) {
       isHtml: '@'
     },
     template: truncatedTemplate,
-    link: function ($scope, $element, attrs) {
+    link: function ($scope) {
       const source = $scope.source;
       const max = $scope.length;
       const truncated = $scope.isHtml
diff --git a/src/ui/public/directives/validate_cidr_mask.js b/src/ui/public/directives/validate_cidr_mask.js
index 7288a9ec59dbe..2565e9305f402 100644
--- a/src/ui/public/directives/validate_cidr_mask.js
+++ b/src/ui/public/directives/validate_cidr_mask.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import CidrMask from 'ui/utils/cidr_mask';
 import uiModules from 'ui/modules';
 
diff --git a/src/ui/public/directives/validate_date_math.js b/src/ui/public/directives/validate_date_math.js
index 23c601987e7cd..ded809c8ac723 100644
--- a/src/ui/public/directives/validate_date_math.js
+++ b/src/ui/public/directives/validate_date_math.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import dateMath from '@elastic/datemath';
 import uiModules from 'ui/modules';
 
@@ -19,7 +18,7 @@ uiModules.get('kibana').directive('validateDateMath', function () {
           return null;
         }
 
-        let moment = dateMath.parse(input);
+        const moment = dateMath.parse(input);
         ngModel.$setValidity('validDateMath', moment != null && moment.isValid());
         return input;
       }
diff --git a/src/ui/public/directives/validate_index_name.js b/src/ui/public/directives/validate_index_name.js
index 10b51c4dfb8fb..8bc697ad7e575 100644
--- a/src/ui/public/directives/validate_index_name.js
+++ b/src/ui/public/directives/validate_index_name.js
@@ -15,10 +15,10 @@ uiModules
           illegalCharacters.push('*');
         }
 
-        let isValid = function (input) {
+        const isValid = function (input) {
           if (input == null || input === '' || input === '.' || input === '..') return false;
 
-          let match = _.find(illegalCharacters, function (character) {
+          const match = _.find(illegalCharacters, function (character) {
             return input.indexOf(character) >= 0;
           });
           return !match;
diff --git a/src/ui/public/directives/validate_ip.js b/src/ui/public/directives/validate_ip.js
index 9b639ae63e404..2dcd7772e099c 100644
--- a/src/ui/public/directives/validate_ip.js
+++ b/src/ui/public/directives/validate_ip.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import Ipv4Address from 'ui/utils/ipv4_address';
 import uiModules from 'ui/modules';
 
diff --git a/src/ui/public/directives/validate_json.js b/src/ui/public/directives/validate_json.js
index bf4df84f69da8..99938c5f6f88a 100644
--- a/src/ui/public/directives/validate_json.js
+++ b/src/ui/public/directives/validate_json.js
@@ -1,10 +1,8 @@
-import _ from 'lodash';
-import $ from 'jquery';
 import uiModules from 'ui/modules';
 
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
-module.directive('validateJson', function ($compile) {
+module.directive('validateJson', function () {
   return {
     restrict: 'A',
     require: 'ngModel',
@@ -15,7 +13,7 @@ module.directive('validateJson', function ($compile) {
     link: function ($scope, $elem, attr, ngModel) {
       $scope.$watch('ngModel', validator);
 
-      function validator(newValue, oldValue) {
+      function validator(newValue) {
         if (!newValue || newValue.length === 0) {
           setValid();
           return;
diff --git a/src/ui/public/doc_table/__tests__/doc_table.js b/src/ui/public/doc_table/__tests__/doc_table.js
index b5dc9c3dcbbf6..6c90372ec0b38 100644
--- a/src/ui/public/doc_table/__tests__/doc_table.js
+++ b/src/ui/public/doc_table/__tests__/doc_table.js
@@ -1,10 +1,7 @@
 import angular from 'angular';
 import expect from 'expect.js';
 import _ from 'lodash';
-import sinon from 'auto-release-sinon';
-import searchResponse from 'fixtures/search_response';
 import ngMock from 'ng_mock';
-import $ from 'jquery';
 import 'ui/private';
 import 'ui/doc_table';
 import FixturesStubbedSearchSourceProvider from 'fixtures/stubbed_search_source';
@@ -23,7 +20,7 @@ let $timeout;
 
 let searchSource;
 
-let init = function ($elem, props) {
+const init = function ($elem, props) {
   ngMock.inject(function ($rootScope, $compile, _$timeout_) {
     $timeout = _$timeout_;
     $parentScope = $rootScope;
@@ -41,7 +38,7 @@ let init = function ($elem, props) {
   });
 };
 
-let destroy = function () {
+const destroy = function () {
   $scope.$destroy();
   $parentScope.$destroy();
 };
diff --git a/src/ui/public/doc_table/__tests__/lib/get_sort.js b/src/ui/public/doc_table/__tests__/lib/get_sort.js
index 3fc141bad8336..1501d81c9129f 100644
--- a/src/ui/public/doc_table/__tests__/lib/get_sort.js
+++ b/src/ui/public/doc_table/__tests__/lib/get_sort.js
@@ -1,5 +1,5 @@
 import getSort from 'ui/doc_table/lib/get_sort';
-let defaultSort = {time: 'desc'};
+const defaultSort = { time: 'desc' };
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
@@ -8,7 +8,7 @@ let indexPattern;
 describe('docTable', function () {
   beforeEach(ngMock.module('kibana'));
 
-  beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
+  beforeEach(ngMock.inject(function (Private) {
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
   }));
 
@@ -18,10 +18,10 @@ describe('docTable', function () {
     });
 
     it('should return an object if passed a 2 item array', function () {
-      expect(getSort(['bytes', 'desc'], indexPattern)).to.eql({bytes: 'desc'});
+      expect(getSort(['bytes', 'desc'], indexPattern)).to.eql({ bytes: 'desc' });
 
       delete indexPattern.timeFieldName;
-      expect(getSort(['bytes', 'desc'], indexPattern)).to.eql({bytes: 'desc'});
+      expect(getSort(['bytes', 'desc'], indexPattern)).to.eql({ bytes: 'desc' });
     });
 
     it('should sort by the default when passed an unsortable field', function () {
@@ -29,21 +29,21 @@ describe('docTable', function () {
       expect(getSort(['lol_nope', 'asc'], indexPattern)).to.eql(defaultSort);
 
       delete indexPattern.timeFieldName;
-      expect(getSort(['_id', 'asc'], indexPattern)).to.eql({_score: 'desc'});
+      expect(getSort(['_id', 'asc'], indexPattern)).to.eql({ _score: 'desc' });
     });
 
     it('should sort in reverse chrono order otherwise on time based patterns', function () {
       expect(getSort([], indexPattern)).to.eql(defaultSort);
       expect(getSort(['foo'], indexPattern)).to.eql(defaultSort);
-      expect(getSort({foo: 'bar'}, indexPattern)).to.eql(defaultSort);
+      expect(getSort({ foo: 'bar' }, indexPattern)).to.eql(defaultSort);
     });
 
     it('should sort by score on non-time patterns', function () {
       delete indexPattern.timeFieldName;
 
-      expect(getSort([], indexPattern)).to.eql({_score: 'desc'});
-      expect(getSort(['foo'], indexPattern)).to.eql({_score: 'desc'});
-      expect(getSort({foo: 'bar'}, indexPattern)).to.eql({_score: 'desc'});
+      expect(getSort([], indexPattern)).to.eql({ _score: 'desc' });
+      expect(getSort(['foo'], indexPattern)).to.eql({ _score: 'desc' });
+      expect(getSort({ foo: 'bar' }, indexPattern)).to.eql({ _score: 'desc' });
     });
   });
 
diff --git a/src/ui/public/doc_table/__tests__/lib/rows_headers.js b/src/ui/public/doc_table/__tests__/lib/rows_headers.js
index f68527482c15e..fdef1f635351c 100644
--- a/src/ui/public/doc_table/__tests__/lib/rows_headers.js
+++ b/src/ui/public/doc_table/__tests__/lib/rows_headers.js
@@ -28,7 +28,7 @@ describe('Doc Table', function () {
   }));
 
   // Sets up the directive, take an element, and a list of properties to attach to the parent scope.
-  let init = function ($elem, props) {
+  const init = function ($elem, props) {
     ngMock.inject(function ($compile) {
       _.assign($parentScope, props);
       $compile($elem)($parentScope);
@@ -37,17 +37,17 @@ describe('Doc Table', function () {
     });
   };
 
-  let destroy = function () {
+  const destroy = function () {
     $scope.$destroy();
     $parentScope.$destroy();
   };
 
   // For testing column removing/adding for the header and the rows
   //
-  let columnTests = function (elemType, parentElem) {
+  const columnTests = function (elemType, parentElem) {
 
     it('should create a time column if the timefield is defined', function (done) {
-      let childElems = parentElem.find(elemType);
+      const childElems = parentElem.find(elemType);
       expect(childElems.length).to.be(2);
       done();
     });
@@ -79,7 +79,7 @@ describe('Doc Table', function () {
       delete parentElem.scope().indexPattern.timeFieldName;
       parentElem.scope().$digest();
 
-      let childElems = parentElem.find(elemType);
+      const childElems = parentElem.find(elemType);
       expect(childElems.length).to.be(1);
       done();
     });
@@ -89,7 +89,7 @@ describe('Doc Table', function () {
 
   describe('kbnTableHeader', function () {
 
-    let $elem = angular.element(
+    const $elem = angular.element(
       '<thead kbn-table-header columns="columns" index-pattern="indexPattern" sort="sort"></thead>'
     );
 
@@ -120,7 +120,7 @@ describe('Doc Table', function () {
       });
 
       it('should sort asc by default, then by desc if already sorting', function (done) {
-        let fields = ['bytes', '@timestamp'];
+        const fields = ['bytes', '@timestamp'];
 
         // Should not be sorted at first
         expect($scope.sorting).to.eql(undefined);
@@ -201,7 +201,7 @@ describe('Doc Table', function () {
   });
 
   describe('kbnTableRow', function () {
-    let $elem = angular.element(
+    const $elem = angular.element(
       '<tr kbn-table-row="row" ' +
       'columns="columns" ' +
       'sorting="sorting"' +
@@ -270,7 +270,7 @@ describe('Doc Table', function () {
 
   describe('kbnTableRow meta', function () {
 
-    let $elem = angular.element(
+    const $elem = angular.element(
         '<tr kbn-table-row="row" ' +
         'columns="columns" ' +
         'sorting="sorting"' +
@@ -281,8 +281,8 @@ describe('Doc Table', function () {
     let $details;
 
     beforeEach(function () {
-      let row = getFakeRow(0, mapping);
-      mapping._id = {indexed: true, type: 'string'};
+      const row = getFakeRow(0, mapping);
+      mapping._id = { indexed: true, type: 'string' };
       row._source._id = 'foo';
 
       init($elem, {
@@ -354,7 +354,7 @@ describe('Doc Table', function () {
       $root.columns.push('bytes');
       $root.$apply();
 
-      let $after = $row.find('td');
+      const $after = $row.find('td');
       expect($after).to.have.length(4);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -367,7 +367,7 @@ describe('Doc Table', function () {
       $root.columns.push('request_body');
       $root.$apply();
 
-      let $after = $row.find('td');
+      const $after = $row.find('td');
       expect($after).to.have.length(5);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -385,7 +385,7 @@ describe('Doc Table', function () {
       ];
       $root.$apply();
 
-      let $after = $row.find('td');
+      const $after = $row.find('td');
       expect($after).to.have.length(6);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -400,7 +400,7 @@ describe('Doc Table', function () {
       _.pull($root.columns, '_source');
       $root.$apply();
 
-      let $after = $row.find('td');
+      const $after = $row.find('td');
       expect($after).to.have.length(2);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -411,14 +411,14 @@ describe('Doc Table', function () {
       $root.columns.push('@timestamp');
       $root.$apply();
 
-      let $mid = $row.find('td');
+      const $mid = $row.find('td');
       expect($mid).to.have.length(4);
 
       $root.columns.pop();
       $root.columns.pop();
       $root.$apply();
 
-      let $after = $row.find('td');
+      const $after = $row.find('td');
       expect($after).to.have.length(2);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -429,7 +429,7 @@ describe('Doc Table', function () {
       $root.columns.push('@timestamp', 'bytes');
       $root.$apply();
 
-      let $mid = $row.find('td');
+      const $mid = $row.find('td');
       expect($mid).to.have.length(5);
 
       $root.columns[0] = false; // _source
@@ -437,7 +437,7 @@ describe('Doc Table', function () {
       $root.columns = $root.columns.filter(Boolean);
       $root.$apply();
 
-      let $after = $row.find('td');
+      const $after = $row.find('td');
       expect($after).to.have.length(3);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -451,7 +451,7 @@ describe('Doc Table', function () {
       $root.columns.push('request_body');
       $root.$apply();
 
-      let $after = $row.find('td');
+      const $after = $row.find('td');
       expect($after).to.have.length(4);
       expect($after.eq(2).text().trim()).to.match(/^bytes_formatted/);
       expect($after.eq(3).text().trim()).to.match(/^bytes_formatted/);
@@ -461,13 +461,13 @@ describe('Doc Table', function () {
       $root.columns.push('bytes');
       $root.$apply();
 
-      let $mid = $row.find('td');
+      const $mid = $row.find('td');
       expect($mid).to.have.length(4);
 
       $root.columns.reverse();
       $root.$apply();
 
-      let $after = $row.find('td');
+      const $after = $row.find('td');
       expect($after).to.have.length(4);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -479,13 +479,13 @@ describe('Doc Table', function () {
       $root.columns.push('bytes', 'response', '@timestamp');
       $root.$apply();
 
-      let $mid = $row.find('td');
+      const $mid = $row.find('td');
       expect($mid).to.have.length(6);
 
       $root.columns.reverse();
       $root.$apply();
 
-      let $after = $row.find('td');
+      const $after = $row.find('td');
       expect($after).to.have.length(6);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
@@ -499,7 +499,7 @@ describe('Doc Table', function () {
       $root.columns.push('bytes', 'bytes', 'bytes');
       $root.$apply();
 
-      let $after = $row.find('td');
+      const $after = $row.find('td');
       expect($after).to.have.length(6);
       expect($after[0]).to.be($before[0]);
       expect($after[1]).to.be($before[1]);
diff --git a/src/ui/public/doc_table/components/table_header.js b/src/ui/public/doc_table/components/table_header.js
index b0c0d56644d68..68013a262d5b4 100644
--- a/src/ui/public/doc_table/components/table_header.js
+++ b/src/ui/public/doc_table/components/table_header.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import 'ui/filters/short_dots';
 import headerHtml from 'ui/doc_table/components/table_header.html';
 import uiModules from 'ui/modules';
-let module = uiModules.get('app/discover');
+const module = uiModules.get('app/discover');
 
 
 module.directive('kbnTableHeader', function (shortDotsFilter) {
@@ -16,9 +16,9 @@ module.directive('kbnTableHeader', function (shortDotsFilter) {
     template: headerHtml,
     controller: function ($scope) {
 
-      let sortableField = function (field) {
+      const sortableField = function (field) {
         if (!$scope.indexPattern) return;
-        let sortable = _.get($scope.indexPattern.fields.byName[field], 'sortable');
+        const sortable = _.get($scope.indexPattern.fields.byName[field], 'sortable');
         return sortable;
       };
 
@@ -34,8 +34,8 @@ module.directive('kbnTableHeader', function (shortDotsFilter) {
       $scope.headerClass = function (column) {
         if (!sortableField(column)) return;
 
-        let sorting = $scope.sorting;
-        let defaultClass = ['fa', 'fa-sort-up', 'table-header-sortchange'];
+        const sorting = $scope.sorting;
+        const defaultClass = ['fa', 'fa-sort-up', 'table-header-sortchange'];
 
         if (!sorting || column !== sorting[0]) return defaultClass;
         return ['fa', sorting[1] === 'asc' ? 'fa-sort-up' : 'fa-sort-down'];
@@ -62,7 +62,7 @@ module.directive('kbnTableHeader', function (shortDotsFilter) {
       $scope.sort = function (column) {
         if (!column || !sortableField(column)) return;
 
-        let sorting = $scope.sorting = $scope.sorting || [];
+        const sorting = $scope.sorting = $scope.sorting || [];
 
         let direction = sorting[1] || 'asc';
         if (sorting[0] !== column) {
diff --git a/src/ui/public/doc_table/components/table_row.js b/src/ui/public/doc_table/components/table_row.js
index 7dfdfe24fa69e..d6e5432ff353b 100644
--- a/src/ui/public/doc_table/components/table_row.js
+++ b/src/ui/public/doc_table/components/table_row.js
@@ -10,12 +10,12 @@ import noWhiteSpace from 'ui/utils/no_white_space';
 import openRowHtml from 'ui/doc_table/components/table_row/open.html';
 import detailsHtml from 'ui/doc_table/components/table_row/details.html';
 import uiModules from 'ui/modules';
-let module = uiModules.get('app/discover');
+const module = uiModules.get('app/discover');
 
 
 
 // guesstimate at the minimum number of chars wide cells in the table should be
-let MIN_LINE_LENGTH = 20;
+const MIN_LINE_LENGTH = 20;
 
 /**
  * kbnTableRow directive
@@ -26,8 +26,8 @@ let MIN_LINE_LENGTH = 20;
  * ```
  */
 module.directive('kbnTableRow', function ($compile) {
-  let cellTemplate = _.template(noWhiteSpace(require('ui/doc_table/components/table_row/cell.html')));
-  let truncateByHeightTemplate = _.template(noWhiteSpace(require('ui/partials/truncate_by_height.html')));
+  const cellTemplate = _.template(noWhiteSpace(require('ui/doc_table/components/table_row/cell.html')));
+  const truncateByHeightTemplate = _.template(noWhiteSpace(require('ui/partials/truncate_by_height.html')));
 
   return {
     restrict: 'A',
@@ -41,7 +41,7 @@ module.directive('kbnTableRow', function ($compile) {
       $el.after('<tr>');
       $el.empty();
 
-      let init = function () {
+      const init = function () {
         createSummaryRow($scope.row, $scope.row._id);
       };
 
@@ -53,7 +53,7 @@ module.directive('kbnTableRow', function ($compile) {
 
       // toggle display of the rows details, a full list of the fields from each row
       $scope.toggleRow = function () {
-        let $detailsTr = $el.next();
+        const $detailsTr = $el.next();
 
         $scope.open = !$scope.open;
 
@@ -90,10 +90,10 @@ module.directive('kbnTableRow', function ($compile) {
 
       // create a tr element that lists the value for each *column*
       function createSummaryRow(row) {
-        let indexPattern = $scope.indexPattern;
+        const indexPattern = $scope.indexPattern;
 
         // We just create a string here because its faster.
-        let newHtmls = [
+        const newHtmls = [
           openRowHtml
         ];
 
@@ -114,16 +114,16 @@ module.directive('kbnTableRow', function ($compile) {
 
         let $cells = $el.children();
         newHtmls.forEach(function (html, i) {
-          let $cell = $cells.eq(i);
+          const $cell = $cells.eq(i);
           if ($cell.data('discover:html') === html) return;
 
-          let reuse = _.find($cells.slice(i + 1), function (cell) {
+          const reuse = _.find($cells.slice(i + 1), function (cell) {
             return $.data(cell, 'discover:html') === html;
           });
 
-          let $target = reuse ? $(reuse).detach() : $(html);
+          const $target = reuse ? $(reuse).detach() : $(html);
           $target.data('discover:html', html);
-          let $before = $cells.eq(i - 1);
+          const $before = $cells.eq(i - 1);
           if ($before.size()) {
             $before.after($target);
           } else {
@@ -151,7 +151,7 @@ module.directive('kbnTableRow', function ($compile) {
        * Fill an element with the value of a field
        */
       function _displayField(row, fieldName, breakWords) {
-        let indexPattern = $scope.indexPattern;
+        const indexPattern = $scope.indexPattern;
         let text = indexPattern.formatField(row, fieldName);
 
         if (breakWords) {
diff --git a/src/ui/public/doc_table/doc_table.js b/src/ui/public/doc_table/doc_table.js
index db3148a831525..a2223d1d3d73e 100644
--- a/src/ui/public/doc_table/doc_table.js
+++ b/src/ui/public/doc_table/doc_table.js
@@ -25,15 +25,15 @@ uiModules.get('kibana')
       filter: '=?',
     },
     link: function ($scope) {
-      let notify = new Notifier();
+      const notify = new Notifier();
       $scope.limit = 50;
       $scope.persist = {
         sorting: $scope.sorting,
         columns: $scope.columns
       };
 
-      let prereq = (function () {
-        let fns = [];
+      const prereq = (function () {
+        const fns = [];
 
         return function register(fn) {
           fns.push(fn);
@@ -59,7 +59,7 @@ uiModules.get('kibana')
       $scope.$watch('columns', function (columns) {
         if (columns.length !== 0) return;
 
-        let $state = getAppState();
+        const $state = getAppState();
         $scope.columns.push('_source');
         if ($state) $state.replace();
       });
@@ -73,7 +73,7 @@ uiModules.get('kibana')
       });
 
 
-      $scope.$watch('searchSource', prereq(function (searchSource) {
+      $scope.$watch('searchSource', prereq(function () {
         if (!$scope.searchSource) return;
 
         $scope.indexPattern = $scope.searchSource.get('index');
diff --git a/src/ui/public/doc_table/lib/get_sort.js b/src/ui/public/doc_table/lib/get_sort.js
index e9f99615b1fce..c0124132083c7 100644
--- a/src/ui/public/doc_table/lib/get_sort.js
+++ b/src/ui/public/doc_table/lib/get_sort.js
@@ -7,7 +7,7 @@ import _ from 'lodash';
  * @returns {object} a sort object suitable for returning to elasticsearch
  */
 function getSort(sort, indexPattern) {
-  let sortObj = {};
+  const sortObj = {};
   let field;
   let direction;
 
diff --git a/src/ui/public/doc_title/__tests__/doc_title.js b/src/ui/public/doc_title/__tests__/doc_title.js
index faf38f9521473..104b3032dcadf 100644
--- a/src/ui/public/doc_title/__tests__/doc_title.js
+++ b/src/ui/public/doc_title/__tests__/doc_title.js
@@ -6,7 +6,7 @@ import DocTitleProvider from 'ui/doc_title';
 
 describe('docTitle Service', function () {
   let initialDocTitle;
-  let MAIN_TITLE = 'Kibana 4';
+  const MAIN_TITLE = 'Kibana 4';
 
   let docTitle;
   let $rootScope;
@@ -36,9 +36,9 @@ describe('docTitle Service', function () {
 
   describe('setup', function () {
     it('resets the title when a route change begins', function () {
-      let spy = $rootScope.$on;
+      const spy = $rootScope.$on;
 
-      let found = spy.args.some(function (args) {
+      const found = spy.args.some(function (args) {
         return args[0] === '$routeChangeStart' && args[1] === docTitle.reset;
       });
 
diff --git a/src/ui/public/doc_title/doc_title.js b/src/ui/public/doc_title/doc_title.js
index 6f58e162ae5e5..d03b523dc141d 100644
--- a/src/ui/public/doc_title/doc_title.js
+++ b/src/ui/public/doc_title/doc_title.js
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import chrome from 'ui/chrome';
 import uiModules from 'ui/modules';
 
 uiModules.get('kibana')
@@ -9,16 +8,16 @@ uiModules.get('kibana')
   $rootScope.$on('$routeChangeError', docTitle.update);
   $rootScope.$on('$routeChangeSuccess', docTitle.update);
 })
-.service('docTitle', function ($rootScope) {
-  let baseTitle = document.title;
-  let self = this;
+.service('docTitle', function () {
+  const baseTitle = document.title;
+  const self = this;
 
   let lastChange;
 
   function render() {
     lastChange = lastChange || [];
 
-    let parts = [lastChange[0]];
+    const parts = [lastChange[0]];
 
     if (!lastChange[1]) parts.push(baseTitle);
 
@@ -42,4 +41,4 @@ uiModules.get('kibana')
 // return a "private module" so that it can be used both ways
 export default function DoctitleProvider(docTitle) {
   return docTitle;
-};
+}
diff --git a/src/ui/public/doc_viewer/__tests__/doc_viewer.js b/src/ui/public/doc_viewer/__tests__/doc_viewer.js
index fcd64aab90b1c..3b09a4cf182da 100644
--- a/src/ui/public/doc_viewer/__tests__/doc_viewer.js
+++ b/src/ui/public/doc_viewer/__tests__/doc_viewer.js
@@ -9,8 +9,6 @@ import Registry from 'ui/registry/_registry';
 import 'ui/doc_viewer';
 
 describe('docViewer', function () {
-  let $rootScope;
-  let $compile;
   let stubRegistry;
   let $elem;
   let init;
@@ -32,10 +30,7 @@ describe('docViewer', function () {
     });
 
     // Create the scope
-    ngMock.inject(function ($injector) {
-      $rootScope = $injector.get('$rootScope');
-      $compile = $injector.get('$compile');
-    });
+    ngMock.inject(function () {});
   });
 
   beforeEach(function () {
@@ -58,21 +53,21 @@ describe('docViewer', function () {
           title: 'exampleView',
           order: 0,
           directive: {
-            template: `Example`
+            template: 'Example'
           }
         });
       });
     }
     it('should have a tab for the view', function () {
       registerExtension();
-      registerExtension({title: 'exampleView2'});
+      registerExtension({ title: 'exampleView2' });
       init();
       expect($elem.find('.nav-tabs li').length).to.be(2);
     });
 
     it('should activate the first view in order', function () {
-      registerExtension({order: 2});
-      registerExtension({title: 'exampleView2'});
+      registerExtension({ order: 2 });
+      registerExtension({ title: 'exampleView2' });
       init();
       expect($elem.find('.nav-tabs .active').text().trim()).to.be('exampleView2');
     });
diff --git a/src/ui/public/doc_viewer/doc_viewer.js b/src/ui/public/doc_viewer/doc_viewer.js
index 009a6f8ef5bbe..5bb3b0ad45e39 100644
--- a/src/ui/public/doc_viewer/doc_viewer.js
+++ b/src/ui/public/doc_viewer/doc_viewer.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import $ from 'jquery';
 import uiModules from 'ui/modules';
 import DocViewsProvider from 'ui/registry/doc_views';
@@ -17,7 +16,7 @@ uiModules.get('kibana')
       filter: '=?',
       columns: '=?'
     },
-    template: function ($el, $attr) {
+    template: function ($el) {
       const $viewer = $('<div class="doc-viewer">');
       $el.append($viewer);
       const $tabs = $('<ul class="nav nav-tabs">');
diff --git a/src/ui/public/dom_location.js b/src/ui/public/dom_location.js
index eb9008185de0c..b29781401f34a 100644
--- a/src/ui/public/dom_location.js
+++ b/src/ui/public/dom_location.js
@@ -12,4 +12,4 @@ export default function DomLocationProvider($window) {
       return ($window.location.href = val);
     }
   };
-};
+}
diff --git a/src/ui/public/draggable/__tests__/draggable.js b/src/ui/public/draggable/__tests__/draggable.js
index 33ac5281020fc..c632a56fb7925 100644
--- a/src/ui/public/draggable/__tests__/draggable.js
+++ b/src/ui/public/draggable/__tests__/draggable.js
@@ -1,5 +1,4 @@
 import angular from 'angular';
-import sinon from 'sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 
@@ -7,7 +6,7 @@ let init;
 let $rootScope;
 let $compile;
 
-describe(`draggable_* directives`, function () {
+describe('draggable_* directives', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector) {
@@ -22,7 +21,7 @@ describe(`draggable_* directives`, function () {
       ];
 
       // create the markup
-      const $elem = angular.element(`<div draggable-container="items">`);
+      const $elem = angular.element('<div draggable-container="items">');
       $elem.html(markup);
 
       // compile the directive
@@ -35,38 +34,38 @@ describe(`draggable_* directives`, function () {
     };
   }));
 
-  describe(`draggable_container directive`, function () {
-    it(`should expose the drake`, function () {
+  describe('draggable_container directive', function () {
+    it('should expose the drake', function () {
       const { $scope } = init();
       expect($scope.drake).to.be.an(Object);
     });
 
-    it(`should expose the controller`, function () {
+    it('should expose the controller', function () {
       const { $scope } = init();
       expect($scope.draggableContainerCtrl).to.be.an(Object);
     });
 
-    it(`should pull item list from directive attribute`, function () {
+    it('should pull item list from directive attribute', function () {
       const { $scope, $parentScope } = init();
       expect($scope.draggableContainerCtrl.getList()).to.eql($parentScope.items);
     });
 
-    it(`should not be able to move extraneous DOM elements`, function () {
-      const bare = angular.element(`<div>`);
+    it('should not be able to move extraneous DOM elements', function () {
+      const bare = angular.element('<div>');
       const { $scope } = init();
       expect($scope.drake.canMove(bare[0])).to.eql(false);
     });
 
-    it(`should not be able to move non-[draggable-item] elements`, function () {
-      const bare = angular.element(`<div>`);
+    it('should not be able to move non-[draggable-item] elements', function () {
+      const bare = angular.element('<div>');
       const { $scope, $elem } = init();
       $elem.append(bare);
       expect($scope.drake.canMove(bare[0])).to.eql(false);
     });
 
-    it(`shouldn't be able to move extraneous [draggable-item] elements`, function () {
-      const anotherParent = angular.element(`<div draggable-container="items">`);
-      const item = angular.element(`<div draggable-item="items[0]">`);
+    it('shouldn\'t be able to move extraneous [draggable-item] elements', function () {
+      const anotherParent = angular.element('<div draggable-container="items">');
+      const item = angular.element('<div draggable-item="items[0]">');
       const scope = $rootScope.$new();
       anotherParent.append(item);
       $compile(anotherParent)(scope);
@@ -76,30 +75,30 @@ describe(`draggable_* directives`, function () {
       expect($scope.drake.canMove(item[0])).to.eql(false);
     });
 
-    it(`shouldn't be able to move [draggable-item] if it has a handle`, function () {
+    it('shouldn\'t be able to move [draggable-item] if it has a handle', function () {
       const { $scope, $elem } = init(`
         <div draggable-item="items[0]">
           <div draggable-handle></div>
         </div>
       `);
-      const item = $elem.find(`[draggable-item]`);
+      const item = $elem.find('[draggable-item]');
       expect($scope.drake.canMove(item[0])).to.eql(false);
     });
 
-    it(`should be able to move [draggable-item] by its handle`, function () {
+    it('should be able to move [draggable-item] by its handle', function () {
       const { $scope, $elem } = init(`
         <div draggable-item="items[0]">
           <div draggable-handle></div>
         </div>
       `);
-      const handle = $elem.find(`[draggable-handle]`);
+      const handle = $elem.find('[draggable-handle]');
       expect($scope.drake.canMove(handle[0])).to.eql(true);
     });
   });
 
-  describe(`draggable_item`, function () {
-    it(`should be required to be a child to [draggable-container]`, function () {
-      const item = angular.element(`<div draggable-item="items[0]">`);
+  describe('draggable_item', function () {
+    it('should be required to be a child to [draggable-container]', function () {
+      const item = angular.element('<div draggable-item="items[0]">');
       const scope = $rootScope.$new();
       expect(() => {
         $compile(item)(scope);
@@ -108,9 +107,9 @@ describe(`draggable_* directives`, function () {
     });
   });
 
-  describe(`draggable_handle`, function () {
+  describe('draggable_handle', function () {
     it('should be required to be a child to [draggable-item]', function () {
-      const handle = angular.element(`<div draggable-handle>`);
+      const handle = angular.element('<div draggable-handle>');
       const scope = $rootScope.$new();
       expect(() => {
         $compile(handle)(scope);
diff --git a/src/ui/public/draggable/draggable_container.js b/src/ui/public/draggable/draggable_container.js
index 1d5d6b6bd2804..bd9ba99d21523 100644
--- a/src/ui/public/draggable/draggable_container.js
+++ b/src/ui/public/draggable/draggable_container.js
@@ -14,7 +14,7 @@ uiModules
     controller($scope, $attrs, $parse) {
       this.getList = () => $parse($attrs.draggableContainer)($scope);
     },
-    link($scope, $el, attr) {
+    link($scope, $el) {
       const drake = dragula({
         containers: $el.toArray(),
         moves(el, source, handle) {
diff --git a/src/ui/public/draggable/draggable_item.js b/src/ui/public/draggable/draggable_item.js
index ff46c7a5d4de2..4ddd06adb07e6 100644
--- a/src/ui/public/draggable/draggable_item.js
+++ b/src/ui/public/draggable/draggable_item.js
@@ -23,7 +23,7 @@ uiModules
         return movable;
       };
     },
-    link($scope, $el, attr) {
+    link() {
     }
   };
 });
diff --git a/src/ui/public/elasticsearch_errors/__tests__/elasticsearch_error.js b/src/ui/public/elasticsearch_errors/__tests__/elasticsearch_error.js
index 9f82a736fbd2b..01acf3bab9877 100644
--- a/src/ui/public/elasticsearch_errors/__tests__/elasticsearch_error.js
+++ b/src/ui/public/elasticsearch_errors/__tests__/elasticsearch_error.js
@@ -1,4 +1,3 @@
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ElasticsearchError from '../elasticsearch_error';
 
@@ -24,7 +23,7 @@ describe('ElasticsearchError', () => {
     });
 
     describe('getRootCauses', () => {
-      it(`returns the root_cause array's reason values`, () => {
+      it('returns the root_cause array\'s reason values', () => {
         const rootCauses = ['a', 'b'];
         const error = createError(rootCauses);
         const esError = new ElasticsearchError(error);
@@ -33,14 +32,14 @@ describe('ElasticsearchError', () => {
     });
 
     describe('hasRootCause', () => {
-      it(`returns true if the cause occurs in the root_cause array's reasons, insensitive to case`, () => {
+      it('returns true if the cause occurs in the root_cause array\'s reasons, insensitive to case', () => {
         const rootCauses = ['a very detailed error', 'a slightly more detailed error'];
         const error = createError(rootCauses);
         const esError = new ElasticsearchError(error);
         expect(esError.hasRootCause('slightly MORE')).to.be(true);
       });
 
-      it(`returns false if the cause doesn't occur in the root_cause array's reasons`, () => {
+      it('returns false if the cause doesn\'t occur in the root_cause array\'s reasons', () => {
         const rootCauses = ['a very detailed error', 'a slightly more detailed error'];
         const error = createError(rootCauses);
         const esError = new ElasticsearchError(error);
diff --git a/src/ui/public/elasticsearch_errors/__tests__/is_term_size_zero_error.js b/src/ui/public/elasticsearch_errors/__tests__/is_term_size_zero_error.js
index ff9235f3aa801..d821248ac4106 100644
--- a/src/ui/public/elasticsearch_errors/__tests__/is_term_size_zero_error.js
+++ b/src/ui/public/elasticsearch_errors/__tests__/is_term_size_zero_error.js
@@ -1,4 +1,3 @@
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import isTermSizeZeroError from '../is_term_size_zero_error';
 
@@ -18,12 +17,12 @@ describe('isTermSizeZeroError', () => {
     expect(isTermSizeZeroError(error)).to.be(true);
   });
 
-  it(`returns false if it doesn't contain the identifying string`, () => {
+  it('returns false if it doesn\'t contain the identifying string', () => {
     const error = {
       resp: {
         error: {
           root_cause: [{
-            reason: `Some crazy Java exception`,
+            reason: 'Some crazy Java exception',
           }],
         }
       }
diff --git a/src/ui/public/error_url_overflow/error_url_overflow.js b/src/ui/public/error_url_overflow/error_url_overflow.js
index f8897beff7314..cd4d37b33c840 100644
--- a/src/ui/public/error_url_overflow/error_url_overflow.js
+++ b/src/ui/public/error_url_overflow/error_url_overflow.js
@@ -1,5 +1,4 @@
 import uiRoutes from 'ui/routes';
-import uiModules from 'ui/modules';
 import KbnUrlProvider from 'ui/url';
 
 import './error_url_overflow.less';
diff --git a/src/ui/public/errors.js b/src/ui/public/errors.js
index 5013b12c971c7..6be8837aa4abf 100644
--- a/src/ui/public/errors.js
+++ b/src/ui/public/errors.js
@@ -28,7 +28,7 @@ _.class(KbnError).inherits(Error);
  * If the error permits, propagate the error to be rendered on screen
  * @param handler the handlers that can render the error message to the screen.
  */
-KbnError.prototype.displayToScreen = function (handler) {
+KbnError.prototype.displayToScreen = function () {
   throw this;
 };
 
@@ -183,7 +183,7 @@ _.class(errors.SavedObjectNotFound).inherits(KbnError);
 /**
  * Tried to call a method that relies on SearchSource having an indexPattern assigned
  */
-errors.IndexPatternMissingIndices = function IndexPatternMissingIndices(type) {
+errors.IndexPatternMissingIndices = function IndexPatternMissingIndices() {
   KbnError.call(this,
     'IndexPattern\'s configured pattern does not match any indices',
     errors.IndexPatternMissingIndices);
@@ -193,7 +193,7 @@ _.class(errors.IndexPatternMissingIndices).inherits(KbnError);
 /**
  * Tried to call a method that relies on SearchSource having an indexPattern assigned
  */
-errors.NoDefinedIndexPatterns = function NoDefinedIndexPatterns(type) {
+errors.NoDefinedIndexPatterns = function NoDefinedIndexPatterns() {
   KbnError.call(this,
     'Define at least one index pattern to continue',
     errors.NoDefinedIndexPatterns);
@@ -204,7 +204,7 @@ _.class(errors.NoDefinedIndexPatterns).inherits(KbnError);
 /**
  * Tried to load a route besides management/kibana/index but you don't have a default index pattern!
  */
-errors.NoDefaultIndexPattern = function NoDefaultIndexPattern(type) {
+errors.NoDefaultIndexPattern = function NoDefaultIndexPattern() {
   KbnError.call(this,
     'Please specify a default index pattern',
     errors.NoDefaultIndexPattern);
@@ -212,7 +212,7 @@ errors.NoDefaultIndexPattern = function NoDefaultIndexPattern(type) {
 _.class(errors.NoDefaultIndexPattern).inherits(KbnError);
 
 
-errors.PersistedStateError = function PersistedStateError(msg) {
+errors.PersistedStateError = function PersistedStateError() {
   KbnError.call(this,
   'This container is too small to render the visualization',
   errors.ContainerTooSmall);
diff --git a/src/ui/public/events.js b/src/ui/public/events.js
index 1a6b5e39934dc..394bfde8adb00 100644
--- a/src/ui/public/events.js
+++ b/src/ui/public/events.js
@@ -107,4 +107,4 @@ export default function EventsProvider(Private, Promise) {
   };
 
   return Events;
-};
+}
diff --git a/src/ui/public/factories/__tests__/base_object.js b/src/ui/public/factories/__tests__/base_object.js
index 758ba090d679c..013fb2d3c4097 100644
--- a/src/ui/public/factories/__tests__/base_object.js
+++ b/src/ui/public/factories/__tests__/base_object.js
@@ -1,47 +1,41 @@
-import angular from 'angular';
-import _ from 'lodash';
-import sinon from 'sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/private';
 
 describe('Base Object', function () {
-  let $rootScope;
   let BaseObject;
 
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (_$rootScope_, Private) {
-    $rootScope = _$rootScope_;
+  beforeEach(ngMock.inject(function () {
     BaseObject = require('ui/utils/base_object');
   }));
 
   it('should take an inital set of values', function () {
-    let baseObject = new BaseObject({ message: 'test' });
+    const baseObject = new BaseObject({ message: 'test' });
     expect(baseObject).to.have.property('message', 'test');
   });
 
   it('should serialize _attributes to RISON', function () {
-    let baseObject = new BaseObject();
+    const baseObject = new BaseObject();
     baseObject.message = 'Testing... 1234';
-    let rison = baseObject.toRISON();
+    const rison = baseObject.toRISON();
     expect(rison).to.equal('(message:\'Testing... 1234\')');
   });
 
   it('should not serialize $$attributes to RISON', function () {
-    let baseObject = new BaseObject();
+    const baseObject = new BaseObject();
     baseObject.$$attributes = { foo: 'bar' };
     baseObject.message = 'Testing... 1234';
-    let rison = baseObject.toRISON();
+    const rison = baseObject.toRISON();
     expect(rison).to.equal('(message:\'Testing... 1234\')');
   });
 
   it('should serialize _attributes for JSON', function () {
-    let baseObject = new BaseObject();
+    const baseObject = new BaseObject();
     baseObject.message = 'Testing... 1234';
     baseObject._private = 'foo';
     baseObject.$private = 'stuff';
-    let json = JSON.stringify(baseObject);
+    const json = JSON.stringify(baseObject);
     expect(json).to.equal('{"message":"Testing... 1234"}');
   });
-
 });
diff --git a/src/ui/public/factories/__tests__/events.js b/src/ui/public/factories/__tests__/events.js
index 659490bbbb126..e95f551d43478 100644
--- a/src/ui/public/factories/__tests__/events.js
+++ b/src/ui/public/factories/__tests__/events.js
@@ -1,5 +1,4 @@
 
-import angular from 'angular';
 import _ from 'lodash';
 import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
@@ -10,22 +9,18 @@ import EventsProvider from 'ui/events';
 describe('Events', function () {
   require('test_utils/no_digest_promises').activateForSuite();
 
-  let $rootScope;
   let Events;
-  let Notifier;
   let Promise;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector, Private) {
-    $rootScope = $injector.get('$rootScope');
-    Notifier = $injector.get('Notifier');
     Promise = $injector.get('Promise');
     Events = Private(EventsProvider);
   }));
 
   it('should handle on events', function () {
-    let obj = new Events();
-    let prom = obj.on('test', function (message) {
+    const obj = new Events();
+    const prom = obj.on('test', function (message) {
       expect(message).to.equal('Hello World');
     });
 
@@ -39,9 +34,9 @@ describe('Events', function () {
     function MyEventedObject() {
       MyEventedObject.Super.call(this);
     }
-    let obj = new MyEventedObject();
+    const obj = new MyEventedObject();
 
-    let prom = obj.on('test', function (message) {
+    const prom = obj.on('test', function (message) {
       expect(message).to.equal('Hello World');
     });
 
@@ -51,7 +46,7 @@ describe('Events', function () {
   });
 
   it('should clear events when off is called', function () {
-    let obj = new Events();
+    const obj = new Events();
     obj.on('test', _.noop);
     expect(obj._listeners).to.have.property('test');
     expect(obj._listeners.test).to.have.length(1);
@@ -60,9 +55,9 @@ describe('Events', function () {
   });
 
   it('should clear a specific handler when off is called for an event', function () {
-    let obj = new Events();
-    let handler1 = sinon.stub();
-    let handler2 = sinon.stub();
+    const obj = new Events();
+    const handler1 = sinon.stub();
+    const handler2 = sinon.stub();
     obj.on('test', handler1);
     obj.on('test', handler2);
     expect(obj._listeners).to.have.property('test');
@@ -76,8 +71,8 @@ describe('Events', function () {
   });
 
   it('should clear a all handlers when off is called for an event', function () {
-    let obj = new Events();
-    let handler1 = sinon.stub();
+    const obj = new Events();
+    const handler1 = sinon.stub();
     obj.on('test', handler1);
     expect(obj._listeners).to.have.property('test');
     obj.off('test');
@@ -90,11 +85,11 @@ describe('Events', function () {
   });
 
   it('should handle mulitple identical emits in the same tick', function () {
-    let obj = new Events();
-    let handler1 = sinon.stub();
+    const obj = new Events();
+    const handler1 = sinon.stub();
 
     obj.on('test', handler1);
-    let emits = [
+    const emits = [
       obj.emit('test', 'one'),
       obj.emit('test', 'two'),
       obj.emit('test', 'three')
@@ -111,9 +106,9 @@ describe('Events', function () {
   });
 
   it('should handle emits from the handler', function () {
-    let obj = new Events();
-    let secondEmit = Promise.defer();
-    let handler1 = sinon.spy(function () {
+    const obj = new Events();
+    const secondEmit = Promise.defer();
+    const handler1 = sinon.spy(function () {
       if (handler1.calledTwice) {
         return;
       }
@@ -133,12 +128,12 @@ describe('Events', function () {
   });
 
   it('should only emit to handlers registered before emit is called', function () {
-    let obj = new Events();
-    let handler1 = sinon.stub();
-    let handler2 = sinon.stub();
+    const obj = new Events();
+    const handler1 = sinon.stub();
+    const handler2 = sinon.stub();
 
     obj.on('test', handler1);
-    let emits = [
+    const emits = [
       obj.emit('test', 'one'),
       obj.emit('test', 'two'),
       obj.emit('test', 'three')
@@ -150,7 +145,7 @@ describe('Events', function () {
 
       obj.on('test', handler2);
 
-      let emits2 = [
+      const emits2 = [
         obj.emit('test', 'four'),
         obj.emit('test', 'five'),
         obj.emit('test', 'six')
@@ -165,9 +160,9 @@ describe('Events', function () {
   });
 
   it('should pass multiple arguments from the emitter', function () {
-    let obj = new Events();
-    let handler = sinon.stub();
-    let payload = [
+    const obj = new Events();
+    const handler = sinon.stub();
+    const payload = [
       'one',
       { hello: 'tests' },
       null
@@ -183,11 +178,11 @@ describe('Events', function () {
   });
 
   it('should preserve the scope of the handler', function () {
-    let obj = new Events();
-    let expected = 'some value';
+    const obj = new Events();
+    const expected = 'some value';
     let testValue;
 
-    function handler(arg1, arg2) {
+    function handler() {
       testValue = this.getVal();
     }
     handler.getVal = _.constant(expected);
@@ -200,9 +195,9 @@ describe('Events', function () {
   });
 
   it('should always emit in the same order', function () {
-    let handler = sinon.stub();
+    const handler = sinon.stub();
 
-    let obj = new Events();
+    const obj = new Events();
     obj.on('block', _.partial(handler, 'block'));
     obj.on('last', _.partial(handler, 'last'));
 
diff --git a/src/ui/public/fancy_forms/__tests__/fancy_forms.js b/src/ui/public/fancy_forms/__tests__/fancy_forms.js
index 5fc992873c171..d76e65739f12b 100644
--- a/src/ui/public/fancy_forms/__tests__/fancy_forms.js
+++ b/src/ui/public/fancy_forms/__tests__/fancy_forms.js
@@ -8,7 +8,6 @@ describe('fancy forms', function () {
   let $compile;
   let $rootScope;
   let ngForm;
-  let ngModel;
 
   function generateEl() {
     return $('<form>').html(
@@ -28,7 +27,6 @@ describe('fancy forms', function () {
     $scope.$apply();
 
     ngForm = $el.controller('form');
-    ngModel = $el.find('input').controller('ngModel');
   }));
 
   describe('ngFormController', function () {
diff --git a/src/ui/public/fancy_forms/fancy_forms.js b/src/ui/public/fancy_forms/fancy_forms.js
index 457b1aa01442d..c89fe5ac97719 100644
--- a/src/ui/public/fancy_forms/fancy_forms.js
+++ b/src/ui/public/fancy_forms/fancy_forms.js
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import $ from 'jquery';
 import KbnFormController from 'ui/fancy_forms/kbn_form_controller';
 import uiModules from 'ui/modules';
 
@@ -12,16 +11,16 @@ uiModules
       // directive providers are arrays
       $delegate.forEach(function (directive) {
         // get metadata about all init fns
-        let chain = [directive.controller, DecorativeController].map(function (fn) {
-          let deps = $injector.annotate(fn);
+        const chain = [directive.controller, DecorativeController].map(function (fn) {
+          const deps = $injector.annotate(fn);
           return { deps: deps, fn: _.isArray(fn) ? _.last(fn) : fn };
         });
 
         // replace the controller with one that will setup the actual controller
         directive.controller = function stub() {
-          let allDeps = _.toArray(arguments);
-          return chain.reduce(function (controller, link, i) {
-            let deps = allDeps.splice(0, link.deps.length);
+          const allDeps = _.toArray(arguments);
+          return chain.reduce(function (controller, link) {
+            const deps = allDeps.splice(0, link.deps.length);
             return link.fn.apply(controller, deps) || controller;
           }, this);
         };
diff --git a/src/ui/public/fancy_forms/kbn_form_controller.js b/src/ui/public/fancy_forms/kbn_form_controller.js
index c4b9f4ef19717..3d0c08bae111c 100644
--- a/src/ui/public/fancy_forms/kbn_form_controller.js
+++ b/src/ui/public/fancy_forms/kbn_form_controller.js
@@ -7,9 +7,9 @@ import _ from 'lodash';
  * @param {$scope} $scope
  */
 function KbnFormController($scope, $element) {
-  let self = this;
+  const self = this;
 
-  self.errorCount = function (predicate) {
+  self.errorCount = function () {
     return self.$$invalidModels().length;
   };
 
@@ -21,14 +21,14 @@ function KbnFormController($scope, $element) {
   };
 
   self.describeErrors = function () {
-    let count = self.softErrorCount();
+    const count = self.softErrorCount();
     return count + ' Error' + (count === 1 ? '' : 's');
   };
 
   self.$$invalidModels = function (predicate) {
     predicate = _.callback(predicate);
 
-    let invalid = [];
+    const invalid = [];
 
     _.forOwn(self.$error, function collect(models) {
       if (!models) return;
diff --git a/src/ui/public/field_editor/__tests__/field_editor.js b/src/ui/public/field_editor/__tests__/field_editor.js
index 366fe48ea2b56..328245e4564ac 100644
--- a/src/ui/public/field_editor/__tests__/field_editor.js
+++ b/src/ui/public/field_editor/__tests__/field_editor.js
@@ -50,7 +50,7 @@ describe('FieldEditor directive', function () {
 
     it('exposes $scope.editor, a controller for the editor', function () {
       compile();
-      let editor = $scope.editor;
+      const editor = $scope.editor;
       expect(editor).to.be.an('object');
     });
   });
@@ -90,8 +90,8 @@ describe('FieldEditor directive', function () {
       });
 
       it('reflects changes to the index patterns field', function () {
-        let a = {};
-        let b = {};
+        const a = {};
+        const b = {};
 
         actual.script = a;
         expect(field.script).to.be(a);
@@ -101,7 +101,7 @@ describe('FieldEditor directive', function () {
       });
 
       it('is fully mutable, unlike the index patterns field', function () {
-        let origName = actual.name;
+        const origName = actual.name;
         actual.name = 'john';
         expect(actual.name).to.not.be('john');
         expect(actual.name).to.be(origName);
diff --git a/src/ui/public/field_editor/field_editor.js b/src/ui/public/field_editor/field_editor.js
index ed66858deaf52..be40f23624ffe 100644
--- a/src/ui/public/field_editor/field_editor.js
+++ b/src/ui/public/field_editor/field_editor.js
@@ -13,9 +13,9 @@ import './field_editor.less';
 
 uiModules
 .get('kibana', ['colorpicker.module'])
-.directive('fieldEditor', function (Private, $sce) {
-  let fieldFormats = Private(RegistryFieldFormatsProvider);
-  let Field = Private(IndexPatternsFieldProvider);
+.directive('fieldEditor', function (Private) {
+  const fieldFormats = Private(RegistryFieldFormatsProvider);
+  const Field = Private(IndexPatternsFieldProvider);
 
   const fieldTypesByLang = {
     painless: ['number', 'string', 'date', 'boolean'],
@@ -31,9 +31,9 @@ uiModules
       getField: '&field'
     },
     controllerAs: 'editor',
-    controller: function ($scope, Notifier, kbnUrl, $http, $q) {
-      let self = this;
-      let notify = new Notifier({ location: 'Field Editor' });
+    controller: function ($scope, Notifier, kbnUrl, $http) {
+      const self = this;
+      const notify = new Notifier({ location: 'Field Editor' });
 
       self.docLinks = docLinks;
       getScriptingLangs().then((langs) => {
@@ -55,9 +55,9 @@ uiModules
 
       self.cancel = redirectAway;
       self.save = function () {
-        let indexPattern = self.indexPattern;
-        let fields = indexPattern.fields;
-        let field = self.field.toActualField();
+        const indexPattern = self.indexPattern;
+        const fields = indexPattern.fields;
+        const field = self.field.toActualField();
 
         fields.remove({ name: field.name });
         fields.push(field);
@@ -76,8 +76,8 @@ uiModules
       };
 
       self.delete = function () {
-        let indexPattern = self.indexPattern;
-        let field = self.field;
+        const indexPattern = self.indexPattern;
+        const field = self.field;
 
         indexPattern.fields.remove({ name: field.name });
         return indexPattern.save()
@@ -88,9 +88,9 @@ uiModules
       };
 
       $scope.$watch('editor.selectedFormatId', function (cur, prev) {
-        let format = self.field.format;
-        let changedFormat = cur !== prev;
-        let missingFormat = cur && (!format || format.type.id !== cur);
+        const format = self.field.format;
+        const changedFormat = cur !== prev;
+        const missingFormat = cur && (!format || format.type.id !== cur);
 
         if (!changedFormat || !missingFormat) return;
 
@@ -99,7 +99,7 @@ uiModules
       });
 
       $scope.$watch('editor.formatParams', function () {
-        let FieldFormat = getFieldFormatType();
+        const FieldFormat = getFieldFormatType();
         self.field.format = new FieldFormat(self.formatParams);
       }, true);
 
@@ -107,7 +107,7 @@ uiModules
         self.defFormatType = initDefaultFormat();
         self.fieldFormatTypes = [self.defFormatType].concat(fieldFormats.byFieldType[newValue] || []);
 
-        if (_.isUndefined(_.find(self.fieldFormatTypes, {id: self.selectedFormatId}))) {
+        if (_.isUndefined(_.find(self.fieldFormatTypes, { id: self.selectedFormatId }))) {
           delete self.selectedFormatId;
         }
       });
@@ -123,8 +123,8 @@ uiModules
       // copy the defined properties of the field to a plain object
       // which is mutable, and capture the changed seperately.
       function shadowCopy(field) {
-        let changes = {};
-        let shadowProps = {
+        const changes = {};
+        const shadowProps = {
           toActualField: {
             // bring the shadow copy out of the shadows
             value: function toActualField() {
@@ -134,7 +134,7 @@ uiModules
         };
 
         Object.getOwnPropertyNames(field).forEach(function (prop) {
-          let desc = Object.getOwnPropertyDescriptor(field, prop);
+          const desc = Object.getOwnPropertyDescriptor(field, prop);
           shadowProps[prop] = {
             enumerable: desc.enumerable,
             get: function () {
@@ -168,7 +168,7 @@ uiModules
       }
 
       function initDefaultFormat() {
-        let def = Object.create(fieldFormats.getDefaultType(self.field.type));
+        const def = Object.create(fieldFormats.getDefaultType(self.field.type));
 
         // explicitly set to undefined to prevent inheritting the prototypes id
         def.id = undefined;
diff --git a/src/ui/public/field_format_editor/field_format_editor.js b/src/ui/public/field_format_editor/field_format_editor.js
index 962e1668397b0..85092ba9c6fe3 100644
--- a/src/ui/public/field_format_editor/field_format_editor.js
+++ b/src/ui/public/field_format_editor/field_format_editor.js
@@ -13,7 +13,7 @@ uiModules
     },
     controllerAs: 'editor',
     controller: function ($scope) {
-      let self = this;
+      const self = this;
 
       // bind the scope values to the controller, down with $scope.values
       $scope.editor = this;
@@ -40,7 +40,7 @@ uiModules
        * @return {undefined}
        */
       $scope.$watch('editor.field.format.type', function (FieldFormat) {
-        let opts = FieldFormat && FieldFormat.editor;
+        const opts = FieldFormat && FieldFormat.editor;
 
         if (!opts) {
           delete self.$$pseudoDirective;
@@ -67,14 +67,14 @@ uiModules
 
     },
     link: function ($scope, $el) {
-      let scopesToTeardown = [];
+      const scopesToTeardown = [];
 
       function setupScope(opts) {
         if (typeof opts !== 'object') {
           return scopesToTeardown[scopesToTeardown.push($scope.$new()) - 1];
         }
 
-        let isolate = scopesToTeardown[scopesToTeardown.push($scope.$new(true)) - 1];
+        const isolate = scopesToTeardown[scopesToTeardown.push($scope.$new(true)) - 1];
         _.forOwn(opts, function (from, to) {
           isolate.$bind(to, from, $scope);
         });
@@ -88,20 +88,20 @@ uiModules
         if (!directive) return $el.hide();
         else $el.show();
 
-        let askedForChild = !!directive.scope;
-        let reuseScope = !askedForChild && !directive.controller;
+        const askedForChild = !!directive.scope;
+        const reuseScope = !askedForChild && !directive.controller;
 
-        let $formatEditor = $('<div>').html(directive.template);
-        let $formatEditorScope = reuseScope ? $scope : setupScope(directive.scope);
+        const $formatEditor = $('<div>').html(directive.template);
+        const $formatEditorScope = reuseScope ? $scope : setupScope(directive.scope);
 
         if (directive.controller) {
           // bind the controller to the injected element
-          let cntrlAs = (directive.controllerAs ? ' as ' + directive.controllerAs : '');
+          const cntrlAs = (directive.controllerAs ? ' as ' + directive.controllerAs : '');
           $formatEditorScope.Controller = directive.controller;
           $formatEditor.attr('ng-controller', 'Controller' + cntrlAs);
         }
 
-        let attrs = {};
+        const attrs = {};
         let linkFns = directive.compile && directive.compile($el, attrs);
         if (!linkFns || _.isFunction(linkFns)) {
           linkFns = {
diff --git a/src/ui/public/field_format_editor/pattern/pattern.js b/src/ui/public/field_format_editor/pattern/pattern.js
index b13610f8c84f6..5e493c9a6807c 100644
--- a/src/ui/public/field_format_editor/pattern/pattern.js
+++ b/src/ui/public/field_format_editor/pattern/pattern.js
@@ -11,7 +11,7 @@ uiModules
     require: ['ngModel', '^fieldEditor'],
     scope: true,
     link: function ($scope, $el, attrs, cntrls) {
-      let ngModelCntrl = cntrls[0];
+      const ngModelCntrl = cntrls[0];
 
       $scope.$bind('inputs', attrs.inputs);
       $scope.$bind('placeholder', attrs.placeholder);
diff --git a/src/ui/public/field_format_editor/samples/samples.js b/src/ui/public/field_format_editor/samples/samples.js
index d391af37d1556..a0090bbc0e060 100644
--- a/src/ui/public/field_format_editor/samples/samples.js
+++ b/src/ui/public/field_format_editor/samples/samples.js
@@ -11,7 +11,7 @@ uiModules
     require: ['?^ngModel', '^fieldEditor'],
     scope: true,
     link: function ($scope, $el, attrs, cntrls) {
-      let ngModelCntrl = cntrls[0];
+      const ngModelCntrl = cntrls[0];
 
       $scope.samples = null;
       $scope.$bind('inputs', attrs.inputs);
@@ -21,14 +21,14 @@ uiModules
         '[]inputs'
       ], function () {
         $scope.samples = null;
-        let field = $scope.editor.field;
+        const field = $scope.editor.field;
 
         if (!field || !field.format) {
           return;
         }
 
         Promise.try(function () {
-          let converter = field.format.getConverterFor('html');
+          const converter = field.format.getConverterFor('html');
           $scope.samples = _.map($scope.inputs, function (input) {
             return [input, $sce.trustAsHtml(converter(input))];
           });
diff --git a/src/ui/public/field_wildcard/field_wildcard.js b/src/ui/public/field_wildcard/field_wildcard.js
index ee3ca719a4d2b..615269fe68bf2 100644
--- a/src/ui/public/field_wildcard/field_wildcard.js
+++ b/src/ui/public/field_wildcard/field_wildcard.js
@@ -1,4 +1,4 @@
-import { endsWith, escapeRegExp, memoize } from 'lodash';
+import { escapeRegExp, memoize } from 'lodash';
 
 export default function fieldWildcard(config) {
   const metaFields = config.get('metaFields');
@@ -25,4 +25,4 @@ export default function fieldWildcard(config) {
   }
 
   return { makeRegEx, fieldWildcardMatcher, fieldWildcardFilter };
-};
+}
diff --git a/src/ui/public/filter_bar/__tests__/_add_filters.js b/src/ui/public/filter_bar/__tests__/_add_filters.js
index 8265d7f2705c4..d6c6ead1a5bcf 100644
--- a/src/ui/public/filter_bar/__tests__/_add_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_add_filters.js
@@ -5,10 +5,6 @@ import ngMock from 'ng_mock';
 import MockState from 'fixtures/mock_state';
 import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
 describe('add filters', function () {
-  let storeNames = {
-    app: 'appState',
-    global: 'globalState'
-  };
   let filters;
   let queryFilter;
   let $rootScope;
@@ -88,7 +84,7 @@ describe('add filters', function () {
     });
 
     it('should fire the update and fetch events', function () {
-      let emitSpy = sinon.spy(queryFilter, 'emit');
+      const emitSpy = sinon.spy(queryFilter, 'emit');
 
       // set up the watchers, add new filters, and crank the digest loop
       $rootScope.$digest();
@@ -109,7 +105,7 @@ describe('add filters', function () {
 
   describe('filter reconciliation', function () {
     it('should de-dupe appState filters being added', function () {
-      let newFilter = _.cloneDeep(filters[1]);
+      const newFilter = _.cloneDeep(filters[1]);
       appState.filters = filters;
       $rootScope.$digest();
       expect(appState.filters.length).to.be(3);
@@ -120,7 +116,7 @@ describe('add filters', function () {
     });
 
     it('should de-dupe globalState filters being added', function () {
-      let newFilter = _.cloneDeep(filters[1]);
+      const newFilter = _.cloneDeep(filters[1]);
       globalState.filters = filters;
       $rootScope.$digest();
       expect(globalState.filters.length).to.be(3);
@@ -131,16 +127,16 @@ describe('add filters', function () {
     });
 
     it('should mutate global filters on appState filter changes', function () {
-      let idx = 1;
+      const idx = 1;
       globalState.filters = filters;
       $rootScope.$digest();
 
-      let appFilter = _.cloneDeep(filters[idx]);
+      const appFilter = _.cloneDeep(filters[idx]);
       appFilter.meta.negate = true;
       queryFilter.addFilters(appFilter);
       $rootScope.$digest();
 
-      let res = queryFilter.getFilters();
+      const res = queryFilter.getFilters();
       expect(res).to.have.length(3);
       _.each(res, function (filter, i) {
         expect(filter.$state.store).to.be('globalState');
diff --git a/src/ui/public/filter_bar/__tests__/_get_filters.js b/src/ui/public/filter_bar/__tests__/_get_filters.js
index 6c1e3ee4b140a..064ce987020bd 100644
--- a/src/ui/public/filter_bar/__tests__/_get_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_get_filters.js
@@ -4,12 +4,11 @@ import expect from 'expect.js';
 import MockState from 'fixtures/mock_state';
 import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
 describe('get filters', function () {
-  let storeNames = {
+  const storeNames = {
     app: 'appState',
     global: 'globalState'
   };
   let queryFilter;
-  let $rootScope;
   let appState;
   let globalState;
 
@@ -30,7 +29,6 @@ describe('get filters', function () {
   ));
 
   beforeEach(ngMock.inject(function (_$rootScope_, Private) {
-    $rootScope = _$rootScope_;
     queryFilter = Private(FilterBarQueryFilterProvider);
   }));
 
@@ -55,7 +53,7 @@ describe('get filters', function () {
       expect(res[1]).to.eql(filters[0]);
 
       // should return updated version of filters
-      let newFilter = { query: { match: { '_type': { query: 'nginx', type: 'phrase' } } } };
+      const newFilter = { query: { match: { '_type': { query: 'nginx', type: 'phrase' } } } };
       appState.filters.push(newFilter);
 
       res = queryFilter.getFilters();
@@ -66,13 +64,13 @@ describe('get filters', function () {
       appState.filters = [filters[0]];
       globalState.filters = [filters[1]];
 
-      let res = queryFilter.getFilters();
+      const res = queryFilter.getFilters();
       expect(res[0].$state.store).to.be(storeNames.global);
       expect(res[1].$state.store).to.be(storeNames.app);
     });
 
     it('should return non-null filters from specific states', function () {
-      let states = [
+      const states = [
         [ globalState, queryFilter.getGlobalFilters ],
         [ appState, queryFilter.getAppFilters ],
       ];
@@ -81,14 +79,14 @@ describe('get filters', function () {
         state[0].filters = filters.slice(0);
         expect(state[0].filters).to.contain(null);
 
-        let res = state[1]();
+        const res = state[1]();
         expect(res.length).to.be(state[0].filters.length);
         expect(state[0].filters).to.not.contain(null);
       });
     });
 
     it('should replace the state, not save it', function () {
-      let states = [
+      const states = [
         [ globalState, queryFilter.getGlobalFilters ],
         [ appState, queryFilter.getAppFilters ],
       ];
@@ -102,7 +100,7 @@ describe('get filters', function () {
         expect(state[0].replace.called).to.be(false);
 
         state[0].filters = filters.slice(0);
-        let res = state[1]();
+        state[1]();
         expect(state[0].save.called).to.be(false);
         expect(state[0].replace.called).to.be(true);
       });
@@ -131,11 +129,11 @@ describe('get filters', function () {
 
     it('should skip appState filters that match globalState filters', function () {
       globalState.filters = filters;
-      let appFilter = _.cloneDeep(filters[1]);
+      const appFilter = _.cloneDeep(filters[1]);
       appState.filters.push(appFilter);
 
       // global filters should be listed first
-      let res = queryFilter.getFilters();
+      const res = queryFilter.getFilters();
       expect(res).to.have.length(3);
       _.each(res, function (filter) {
         expect(filter.$state.store).to.be('globalState');
@@ -144,12 +142,12 @@ describe('get filters', function () {
 
     it('should append conflicting appState filters', function () {
       globalState.filters = filters;
-      let appFilter = _.cloneDeep(filters[1]);
+      const appFilter = _.cloneDeep(filters[1]);
       appFilter.meta.negate = true;
       appState.filters.push(appFilter);
 
       // global filters should be listed first
-      let res = queryFilter.getFilters();
+      const res = queryFilter.getFilters();
       expect(res).to.have.length(4);
       expect(res.filter(function (filter) {
         return filter.$state.store === storeNames.global;
@@ -162,7 +160,7 @@ describe('get filters', function () {
     it('should not affect disabled filters', function () {
       // test adding to globalState
       globalState.filters = _.map(filters, function (filter) {
-        let f = _.cloneDeep(filter);
+        const f = _.cloneDeep(filter);
         f.meta.disabled = true;
         return f;
       });
@@ -172,7 +170,7 @@ describe('get filters', function () {
 
       // test adding to appState
       globalState.filters = _.map(filters, function (filter) {
-        let f = _.cloneDeep(filter);
+        const f = _.cloneDeep(filter);
         f.meta.disabled = true;
         return f;
       });
diff --git a/src/ui/public/filter_bar/__tests__/_invert_filters.js b/src/ui/public/filter_bar/__tests__/_invert_filters.js
index 4148268eb4370..3765885e45e72 100644
--- a/src/ui/public/filter_bar/__tests__/_invert_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_invert_filters.js
@@ -5,10 +5,6 @@ import ngMock from 'ng_mock';
 import MockState from 'fixtures/mock_state';
 import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
 describe('invert filters', function () {
-  let storeNames = {
-    app: 'appState',
-    global: 'globalState'
-  };
   let filters;
   let queryFilter;
   let $rootScope;
@@ -76,7 +72,7 @@ describe('invert filters', function () {
     });
 
     it('should fire the update and fetch events', function () {
-      let emitSpy = sinon.spy(queryFilter, 'emit');
+      const emitSpy = sinon.spy(queryFilter, 'emit');
       appState.filters = filters;
 
       // set up the watchers
diff --git a/src/ui/public/filter_bar/__tests__/_pin_filters.js b/src/ui/public/filter_bar/__tests__/_pin_filters.js
index 4f11d7dadcd20..3eb5d9b6ec1f5 100644
--- a/src/ui/public/filter_bar/__tests__/_pin_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_pin_filters.js
@@ -5,10 +5,6 @@ import ngMock from 'ng_mock';
 import MockState from 'fixtures/mock_state';
 import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
 describe('pin filters', function () {
-  let storeNames = {
-    app: 'appState',
-    global: 'globalState'
-  };
   let filters;
   let queryFilter;
   let $rootScope;
@@ -87,7 +83,7 @@ describe('pin filters', function () {
     });
 
     it('should move filter from appState to globalState', function () {
-      let filter = appState.filters[1];
+      const filter = appState.filters[1];
 
       queryFilter.pinFilter(filter);
       expect(globalState.filters).to.contain(filter);
@@ -96,7 +92,7 @@ describe('pin filters', function () {
     });
 
     it('should move filter from globalState to appState', function () {
-      let filter = globalState.filters[1];
+      const filter = globalState.filters[1];
 
       queryFilter.pinFilter(filter);
       expect(appState.filters).to.contain(filter);
@@ -106,8 +102,8 @@ describe('pin filters', function () {
 
 
     it('should only fire the update event', function () {
-      let emitSpy = sinon.spy(queryFilter, 'emit');
-      let filter = appState.filters[1];
+      const emitSpy = sinon.spy(queryFilter, 'emit');
+      const filter = appState.filters[1];
       $rootScope.$digest();
 
       queryFilter.pinFilter(filter);
@@ -131,8 +127,8 @@ describe('pin filters', function () {
     });
 
     it('should swap the filters in both states', function () {
-      let appSample = _.sample(appState.filters);
-      let globalSample = _.sample(globalState.filters);
+      const appSample = _.sample(appState.filters);
+      const globalSample = _.sample(globalState.filters);
 
       queryFilter.pinAll();
       expect(globalState.filters).to.have.length(5);
diff --git a/src/ui/public/filter_bar/__tests__/_remove_filters.js b/src/ui/public/filter_bar/__tests__/_remove_filters.js
index 1020536be3692..097a82f40aae6 100644
--- a/src/ui/public/filter_bar/__tests__/_remove_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_remove_filters.js
@@ -5,10 +5,6 @@ import ngMock from 'ng_mock';
 import MockState from 'fixtures/mock_state';
 import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
 describe('remove filters', function () {
-  let storeNames = {
-    app: 'appState',
-    global: 'globalState'
-  };
   let filters;
   let queryFilter;
   let $rootScope;
@@ -69,7 +65,7 @@ describe('remove filters', function () {
     });
 
     it('should fire the update and fetch events', function () {
-      let emitSpy = sinon.spy(queryFilter, 'emit');
+      const emitSpy = sinon.spy(queryFilter, 'emit');
       appState.filters = filters;
       $rootScope.$digest();
 
@@ -116,7 +112,7 @@ describe('remove filters', function () {
       appState.filters.push(filters[2]);
       $rootScope.$digest();
 
-      let missedFilter = _.cloneDeep(filters[0]);
+      const missedFilter = _.cloneDeep(filters[0]);
       missedFilter.meta = {
         negate: !filters[0].meta.negate
       };
diff --git a/src/ui/public/filter_bar/__tests__/_toggle_filters.js b/src/ui/public/filter_bar/__tests__/_toggle_filters.js
index 4a7f4870654c2..0dd910c2b13f2 100644
--- a/src/ui/public/filter_bar/__tests__/_toggle_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_toggle_filters.js
@@ -5,10 +5,6 @@ import sinon from 'auto-release-sinon';
 import MockState from 'fixtures/mock_state';
 import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
 describe('toggle filters', function () {
-  let storeNames = {
-    app: 'appState',
-    global: 'globalState'
-  };
   let filters;
   let queryFilter;
   let $rootScope;
@@ -75,7 +71,7 @@ describe('toggle filters', function () {
     });
 
     it('should fire the update and fetch events', function () {
-      let emitSpy = sinon.spy(queryFilter, 'emit');
+      const emitSpy = sinon.spy(queryFilter, 'emit');
       appState.filters = filters;
       $rootScope.$digest();
 
diff --git a/src/ui/public/filter_bar/__tests__/_update_filters.js b/src/ui/public/filter_bar/__tests__/_update_filters.js
index efc813e2fff83..7a0e9dedbe76b 100644
--- a/src/ui/public/filter_bar/__tests__/_update_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_update_filters.js
@@ -1,14 +1,9 @@
 import _ from 'lodash';
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import MockState from 'fixtures/mock_state';
 import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
 describe('update filters', function () {
-  let storeNames = {
-    app: 'appState',
-    global: 'globalState'
-  };
   let queryFilter;
   let appState;
   let globalState;
diff --git a/src/ui/public/filter_bar/__tests__/filter_bar.js b/src/ui/public/filter_bar/__tests__/filter_bar.js
index 1228943506c6b..712be0d16c6e5 100644
--- a/src/ui/public/filter_bar/__tests__/filter_bar.js
+++ b/src/ui/public/filter_bar/__tests__/filter_bar.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import _ from 'lodash';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
@@ -13,10 +12,8 @@ import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
 describe('Filter Bar Directive', function () {
   let $rootScope;
   let $compile;
-  let $timeout;
   let Promise;
   let appState;
-  let queryFilter;
   let mapFilter;
   let $el;
   let $scope;
@@ -36,14 +33,13 @@ describe('Filter Bar Directive', function () {
       $provide.service('courier', require('fixtures/mock_courier'));
     });
 
-    ngMock.inject(function (Private, $injector, _$rootScope_, _$compile_, _$timeout_) {
+    ngMock.inject(function (Private, $injector, _$rootScope_, _$compile_) {
       $rootScope = _$rootScope_;
       $compile = _$compile_;
-      $timeout = _$timeout_;
       Promise = $injector.get('Promise');
       mapFilter = Private(FilterBarLibMapFilterProvider);
 
-      let queryFilter = Private(FilterBarQueryFilterProvider);
+      const queryFilter = Private(FilterBarQueryFilterProvider);
       queryFilter.getFilters = function () {
         return appState.filters;
       };
@@ -52,7 +48,7 @@ describe('Filter Bar Directive', function () {
 
   describe('Element rendering', function () {
     beforeEach(function (done) {
-      let filters = [
+      const filters = [
         { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'apache' } } } },
         { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'nginx' } } } },
         { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } },
@@ -66,7 +62,7 @@ describe('Filter Bar Directive', function () {
         $scope = $el.isolateScope();
       });
 
-      let off = $rootScope.$on('filterbar:updated', function () {
+      const off = $rootScope.$on('filterbar:updated', function () {
         off();
         // force a nextTick so it continues *after* the $digest loop completes
         setTimeout(done, 0);
@@ -77,7 +73,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should render all the filters in state', function () {
-      let filters = $el.find('.filter');
+      const filters = $el.find('.filter');
       expect(filters).to.have.length(5);
       expect($(filters[0]).find('span')[0].innerHTML).to.equal('_type:');
       expect($(filters[0]).find('span')[1].innerHTML).to.equal('"apache"');
@@ -90,7 +86,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should be able to set an alias', function () {
-      let filter = $el.find('.filter')[4];
+      const filter = $el.find('.filter')[4];
       expect($(filter).find('span')[0].innerHTML).to.equal('foo');
     });
 
diff --git a/src/ui/public/filter_bar/__tests__/filter_bar_click_handler.js b/src/ui/public/filter_bar/__tests__/filter_bar_click_handler.js
index 23b80580c5169..d8aad4ee38425 100644
--- a/src/ui/public/filter_bar/__tests__/filter_bar_click_handler.js
+++ b/src/ui/public/filter_bar/__tests__/filter_bar_click_handler.js
@@ -47,14 +47,14 @@ describe('filterBarClickHandler', function () {
     it('warns about trying to filter on a non-filterable field', function () {
       const { clickHandler, aggConfigResult } = setup();
       expect(notify._notifs).to.have.length(0);
-      clickHandler({ point: { aggConfigResult }});
+      clickHandler({ point: { aggConfigResult } });
       expect(notify._notifs).to.have.length(1);
     });
 
     it('does not warn if the event is click is being simulated', function () {
       const { clickHandler, aggConfigResult } = setup();
       expect(notify._notifs).to.have.length(0);
-      clickHandler({ point: { aggConfigResult }}, true);
+      clickHandler({ point: { aggConfigResult } }, true);
       expect(notify._notifs).to.have.length(0);
     });
   });
diff --git a/src/ui/public/filter_bar/__tests__/push_filter.js b/src/ui/public/filter_bar/__tests__/push_filter.js
index a38011f79b3c4..34b60760ddc06 100644
--- a/src/ui/public/filter_bar/__tests__/push_filter.js
+++ b/src/ui/public/filter_bar/__tests__/push_filter.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import FilterBarPushFilterProvider from 'ui/filter_bar/push_filter';
@@ -7,7 +6,7 @@ describe('Filter Bar pushFilter()', function () {
   let pushFilterFn;
 
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private, $injector) {
+  beforeEach(ngMock.inject(function (Private) {
     pushFilterFn = Private(FilterBarPushFilterProvider);
   }));
 
@@ -25,14 +24,14 @@ describe('Filter Bar pushFilter()', function () {
     let pushFilter;
     let filter;
 
-    beforeEach(ngMock.inject(function (Private, $injector) {
-      $state = {filters:[]};
+    beforeEach(ngMock.inject(function () {
+      $state = { filters:[] };
       pushFilter = pushFilterFn($state);
-      filter = {query: {query_string: {query: ''}}};
+      filter = { query: { query_string: { query: '' } } };
     }));
 
     it('should create the filters property it needed', function () {
-      let altState = {};
+      const altState = {};
       pushFilterFn(altState)(filter);
       expect(altState.filters).to.be.an(Array);
     });
diff --git a/src/ui/public/filter_bar/__tests__/query_filter.js b/src/ui/public/filter_bar/__tests__/query_filter.js
index 4d454e48fc41a..942172c5785f8 100644
--- a/src/ui/public/filter_bar/__tests__/query_filter.js
+++ b/src/ui/public/filter_bar/__tests__/query_filter.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import './_get_filters';
@@ -12,13 +11,11 @@ import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
 import EventsProvider from 'ui/events';
 let queryFilter;
 let EventEmitter;
-let $rootScope;
 
 describe('Query Filter', function () {
   describe('Module', function () {
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (_$rootScope_, Private) {
-      $rootScope = _$rootScope_;
       queryFilter = Private(FilterBarQueryFilterProvider);
       EventEmitter = Private(EventsProvider);
     }));
diff --git a/src/ui/public/filter_bar/filter_bar.js b/src/ui/public/filter_bar/filter_bar.js
index 64863b8f869c3..aab7002443b0c 100644
--- a/src/ui/public/filter_bar/filter_bar.js
+++ b/src/ui/public/filter_bar/filter_bar.js
@@ -9,23 +9,23 @@ import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filt
 import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/change_time_filter';
 import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 
 module.directive('filterBar', function (Private, Promise, getAppState) {
-  let mapAndFlattenFilters = Private(FilterBarLibMapAndFlattenFiltersProvider);
-  let mapFlattenAndWrapFilters = Private(FilterBarLibMapFlattenAndWrapFiltersProvider);
-  let extractTimeFilter = Private(FilterBarLibExtractTimeFilterProvider);
-  let filterOutTimeBasedFilter = Private(FilterBarLibFilterOutTimeBasedFilterProvider);
-  let changeTimeFilter = Private(FilterBarLibChangeTimeFilterProvider);
-  let queryFilter = Private(FilterBarQueryFilterProvider);
-  let privateFilterFieldRegex = /(^\$|meta)/;
+  const mapAndFlattenFilters = Private(FilterBarLibMapAndFlattenFiltersProvider);
+  const mapFlattenAndWrapFilters = Private(FilterBarLibMapFlattenAndWrapFiltersProvider);
+  const extractTimeFilter = Private(FilterBarLibExtractTimeFilterProvider);
+  const filterOutTimeBasedFilter = Private(FilterBarLibFilterOutTimeBasedFilterProvider);
+  const changeTimeFilter = Private(FilterBarLibChangeTimeFilterProvider);
+  const queryFilter = Private(FilterBarQueryFilterProvider);
+  const privateFilterFieldRegex = /(^\$|meta)/;
 
   return {
     restrict: 'E',
     template: template,
     scope: {},
-    link: function ($scope, $el, attrs) {
+    link: function ($scope) {
       // bind query filter actions to the scope
       [
         'addFilters',
@@ -46,7 +46,7 @@ module.directive('filterBar', function (Private, Promise, getAppState) {
 
       $scope.aceLoaded = function (editor) {
         editor.$blockScrolling = Infinity;
-        let session = editor.getSession();
+        const session = editor.getSession();
         session.setTabSize(2);
         session.setUseSoftTabs(true);
       };
@@ -139,7 +139,7 @@ module.directive('filterBar', function (Private, Promise, getAppState) {
       }
 
       function updateFilters() {
-        let filters = queryFilter.getFilters();
+        const filters = queryFilter.getFilters();
         mapAndFlattenFilters(filters).then(function (results) {
           // used to display the current filters in the state
           $scope.filters = _.sortBy(results, function (filter) {
diff --git a/src/ui/public/filter_bar/filter_bar_click_handler.js b/src/ui/public/filter_bar/filter_bar_click_handler.js
index 25c7ae1a3b1bf..c4b9f942c230e 100644
--- a/src/ui/public/filter_bar/filter_bar_click_handler.js
+++ b/src/ui/public/filter_bar/filter_bar_click_handler.js
@@ -6,7 +6,7 @@ import findByParam from 'ui/utils/find_by_param';
 export default function (Notifier) {
   return function ($state) {
     return function (event, simulate) {
-      let notify = new Notifier({
+      const notify = new Notifier({
         location: 'Filter bar'
       });
       let aggConfigResult;
@@ -23,14 +23,14 @@ export default function (Notifier) {
       }
 
       if (aggConfigResult) {
-        let isLegendLabel = !!event.point.values;
+        const isLegendLabel = !!event.point.values;
         let aggBuckets = _.filter(aggConfigResult.getPath(), { type: 'bucket' });
 
         // For legend clicks, use the last bucket in the path
         if (isLegendLabel) {
           // series data has multiple values, use aggConfig on the first
           // hierarchical data values is an object with the addConfig
-          let aggConfig = findByParam(event.point.values, 'aggConfig');
+          const aggConfig = findByParam(event.point.values, 'aggConfig');
           aggBuckets = aggBuckets.filter((result) => result.aggConfig && result.aggConfig === aggConfig);
         }
 
@@ -66,4 +66,4 @@ export default function (Notifier) {
       }
     };
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js b/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js
index cd596f04f4188..a33a92f0a4bf9 100644
--- a/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js
@@ -18,7 +18,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should change the timefilter to match the range gt/lt', function () {
-      let filter = { range: { '@timestamp': { gt: 1388559600000, lt: 1388646000000 } } };
+      const filter = { range: { '@timestamp': { gt: 1388559600000, lt: 1388646000000 } } };
       changeTimeFilter(filter);
       expect(timefilter.time.mode).to.be('absolute');
       expect(moment.isMoment(timefilter.time.to)).to.be(true);
@@ -28,7 +28,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should change the timefilter to match the range gte/lte', function () {
-      let filter = { range: { '@timestamp': { gte: 1388559600000, lte: 1388646000000 } } };
+      const filter = { range: { '@timestamp': { gte: 1388559600000, lte: 1388646000000 } } };
       changeTimeFilter(filter);
       expect(timefilter.time.mode).to.be('absolute');
       expect(moment.isMoment(timefilter.time.to)).to.be(true);
diff --git a/src/ui/public/filter_bar/lib/__tests__/dedup_filters.js b/src/ui/public/filter_bar/lib/__tests__/dedup_filters.js
index fc953a1b34049..e09308fa0f402 100644
--- a/src/ui/public/filter_bar/lib/__tests__/dedup_filters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/dedup_filters.js
@@ -4,43 +4,43 @@ describe('Filter Bar Directive', function () {
   describe('dedupFilters(existing, filters)', function () {
 
     it('should return only filters which are not in the existing', function () {
-      let existing = [
+      const existing = [
         { range: { bytes: { from: 0, to: 1024 } } },
         { query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
       ];
-      let filters = [
+      const filters = [
         { range: { bytes: { from: 1024, to: 2048 } } },
         { query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
       ];
-      let results = dedupFilters(existing, filters);
+      const results = dedupFilters(existing, filters);
       expect(results).to.contain(filters[0]);
       expect(results).to.not.contain(filters[1]);
     });
 
     it('should ignore the disabed attribute when comparing ', function () {
-      let existing = [
+      const existing = [
         { range: { bytes: { from: 0, to: 1024 } } },
         { meta: { disabled: true }, query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
       ];
-      let filters = [
+      const filters = [
         { range: { bytes: { from: 1024, to: 2048 } } },
         { query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
       ];
-      let results = dedupFilters(existing, filters);
+      const results = dedupFilters(existing, filters);
       expect(results).to.contain(filters[0]);
       expect(results).to.not.contain(filters[1]);
     });
 
     it('should ignore $state attribute', function () {
-      let existing = [
+      const existing = [
         { range: { bytes: { from: 0, to: 1024 } } },
         { $state: { store: 'appState' }, query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
       ];
-      let filters = [
+      const filters = [
         { range: { bytes: { from: 1024, to: 2048 } } },
         { $state: { store: 'globalState' }, query: { match: { _term: { query: 'apache', type: 'phrase' } } } }
       ];
-      let results = dedupFilters(existing, filters);
+      const results = dedupFilters(existing, filters);
       expect(results).to.contain(filters[0]);
       expect(results).to.not.contain(filters[1]);
     });
diff --git a/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js b/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js
index d38746497fd85..41fedfc49db4f 100644
--- a/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js
@@ -1,4 +1,3 @@
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import FilterBarLibExtractTimeFilterProvider from 'ui/filter_bar/lib/extract_time_filter';
@@ -16,13 +15,13 @@ describe('Filter Bar Directive', function () {
       }
     ));
 
-    beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
+    beforeEach(ngMock.inject(function (Private, _$rootScope_) {
       extractTimeFilter = Private(FilterBarLibExtractTimeFilterProvider);
       $rootScope = _$rootScope_;
     }));
 
     it('should return the matching filter for the defualt time field', function (done) {
-      let filters = [
+      const filters = [
         { meta: { index: 'logstash-*' }, query: { match: { _type:  { query: 'apache', type: 'phrase' } } } },
         { meta: { index: 'logstash-*' }, range: { 'time': { gt: 1388559600000, lt: 1388646000000 } } }
       ];
@@ -34,7 +33,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should not return the non-matching filter for the defualt time field', function (done) {
-      let filters = [
+      const filters = [
         { meta: { index: 'logstash-*' }, query: { match: { _type:  { query: 'apache', type: 'phrase' } } } },
         { meta: { index: 'logstash-*' }, range: { '@timestamp': { gt: 1388559600000, lt: 1388646000000 } } }
       ];
diff --git a/src/ui/public/filter_bar/lib/__tests__/filter_applied_and_unwrap.js b/src/ui/public/filter_bar/lib/__tests__/filter_applied_and_unwrap.js
index 196b0acd2bc88..356ff3c06d1b9 100644
--- a/src/ui/public/filter_bar/lib/__tests__/filter_applied_and_unwrap.js
+++ b/src/ui/public/filter_bar/lib/__tests__/filter_applied_and_unwrap.js
@@ -3,13 +3,13 @@ import filterAppliedAndUnwrap from 'ui/filter_bar/lib/filter_applied_and_unwrap'
 describe('Filter Bar Directive', function () {
   describe('filterAppliedAndUnwrap()', function () {
 
-    let filters = [
+    const filters = [
       { meta: { apply: true }, exists: { field: '_type' } },
       { meta: { apply: false }, query: { query_string: { query: 'foo:bar' } } }
     ];
 
     it('should filter the applied and unwrap the filter', function () {
-      let results = filterAppliedAndUnwrap(filters);
+      const results = filterAppliedAndUnwrap(filters);
       expect(results).to.have.length(1);
       expect(results[0]).to.eql(filters[0]);
     });
diff --git a/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js b/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js
index f4a23ce6dfc3b..51f24301c050c 100644
--- a/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js
@@ -1,6 +1,5 @@
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import sinon from 'auto-release-sinon';
 import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filter_out_time_based_filter';
 
 describe('Filter Bar Directive', function () {
@@ -17,13 +16,13 @@ describe('Filter Bar Directive', function () {
       }
     ));
 
-    beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
+    beforeEach(ngMock.inject(function (Private, _$rootScope_) {
       filterOutTimeBasedFilter = Private(FilterBarLibFilterOutTimeBasedFilterProvider);
       $rootScope = _$rootScope_;
     }));
 
     it('should return the matching filter for the defualt time field', function (done) {
-      let filters = [
+      const filters = [
         { meta: { index: 'logstash-*' }, query: { match: { _type:  { query: 'apache', type: 'phrase' } } } },
         { meta: { index: 'logstash-*' }, range: { 'time': { gt: 1388559600000, lt: 1388646000000 } } }
       ];
diff --git a/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js b/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js
index 6dc126c323a4d..43fb21bf7c7a0 100644
--- a/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js
+++ b/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js
@@ -19,13 +19,13 @@ describe('Filter Bar Directive', function () {
 
 
     it('should create a chaning function which calls the next function if the promise is rejected', function (done) {
-      let filter = {};
-      let mapping = sinon.stub();
+      const filter = {};
+      const mapping = sinon.stub();
       mapping.returns(Promise.reject(filter));
-      let mappingChainFn = generateMappingChain(mapping);
-      let next = sinon.stub();
+      const mappingChainFn = generateMappingChain(mapping);
+      const next = sinon.stub();
       next.returns(Promise.resolve('good'));
-      let chain = mappingChainFn(next);
+      const chain = mappingChainFn(next);
       chain(filter).then(function (result) {
         expect(result).to.be('good');
         sinon.assert.calledOnce(next);
@@ -35,12 +35,12 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should create a chaning function which DOES NOT call the next function if the result is resolved', function (done) {
-      let mapping = sinon.stub();
+      const mapping = sinon.stub();
       mapping.returns(Promise.resolve('good'));
-      let mappingChainFn = generateMappingChain(mapping);
-      let next = sinon.stub();
+      const mappingChainFn = generateMappingChain(mapping);
+      const next = sinon.stub();
       next.returns(Promise.resolve('bad'));
-      let chain = mappingChainFn(next);
+      const chain = mappingChainFn(next);
       chain({}).then(function (result) {
         expect(result).to.be('good');
         sinon.assert.notCalled(next);
@@ -50,11 +50,11 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should resolve result for the mapping function', function (done) {
-      let mapping = sinon.stub();
+      const mapping = sinon.stub();
       mapping.returns(Promise.resolve({ key: 'test', value: 'example' }));
-      let mappingChainFn = generateMappingChain(mapping);
-      let next = sinon.stub();
-      let chain = mappingChainFn(next);
+      const mappingChainFn = generateMappingChain(mapping);
+      const next = sinon.stub();
+      const chain = mappingChainFn(next);
       chain({}).then(function (result) {
         sinon.assert.notCalled(next);
         expect(result).to.eql({ key: 'test', value: 'example' });
@@ -64,11 +64,11 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should call the mapping function with the argument to the chain', function (done) {
-      let mapping = sinon.stub();
+      const mapping = sinon.stub();
       mapping.returns(Promise.resolve({ key: 'test', value: 'example' }));
-      let mappingChainFn = generateMappingChain(mapping);
-      let next = sinon.stub();
-      let chain = mappingChainFn(next);
+      const mappingChainFn = generateMappingChain(mapping);
+      const next = sinon.stub();
+      const chain = mappingChainFn(next);
       chain({ test: 'example' }).then(function (result) {
         sinon.assert.calledOnce(mapping);
         expect(mapping.args[0][0]).to.eql({ test: 'example' });
@@ -80,13 +80,13 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should resolve result for the next function', function (done) {
-      let filter = {};
-      let mapping = sinon.stub();
+      const filter = {};
+      const mapping = sinon.stub();
       mapping.returns(Promise.reject(filter));
-      let mappingChainFn = generateMappingChain(mapping);
-      let next = sinon.stub();
+      const mappingChainFn = generateMappingChain(mapping);
+      const next = sinon.stub();
       next.returns(Promise.resolve({ key: 'test', value: 'example' }));
-      let chain = mappingChainFn(next);
+      const chain = mappingChainFn(next);
       chain(filter).then(function (result) {
         sinon.assert.calledOnce(mapping);
         sinon.assert.calledOnce(next);
@@ -97,11 +97,11 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should reject with an error if no functions match', function (done) {
-      let filter = {};
-      let mapping = sinon.stub();
+      const filter = {};
+      const mapping = sinon.stub();
       mapping.returns(Promise.reject(filter));
-      let mappingChainFn = generateMappingChain(mapping);
-      let chain = mappingChainFn();
+      const mappingChainFn = generateMappingChain(mapping);
+      const chain = mappingChainFn();
       chain(filter).catch(function (err) {
         expect(err).to.be.an(Error);
         expect(err.message).to.be('No mappings have been found for filter.');
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js b/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js
index e3eca25525df3..77488bca33c53 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js
@@ -1,6 +1,5 @@
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import sinon from 'auto-release-sinon';
 import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters';
 
 describe('Filter Bar Directive', function () {
@@ -21,7 +20,7 @@ describe('Filter Bar Directive', function () {
       $rootScope = _$rootScope_;
     }));
 
-    let filters = [
+    const filters = [
       null,
       [
         { meta: { index: 'logstash-*' }, exists: { field: '_type' } },
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_default.js b/src/ui/public/filter_bar/lib/__tests__/map_default.js
index 3bc66ac578b24..721283f51a109 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_default.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_default.js
@@ -13,7 +13,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters', function (done) {
-      let filter = { query: { match_all: {} } };
+      const filter = { query: { match_all: {} } };
       mapDefault(filter).then(function (result) {
         expect(result).to.have.property('key', 'query');
         expect(result).to.have.property('value', '{"match_all":{}}');
@@ -23,7 +23,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should work with undefined filter types', function (done) {
-      let filter = {
+      const filter = {
         'bool': {
           'must': {
             'term': {
@@ -41,7 +41,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined if there is no valid key', function (done) {
-      let filter = { meta: {} };
+      const filter = { meta: {} };
       mapDefault(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_exists.js b/src/ui/public/filter_bar/lib/__tests__/map_exists.js
index aaaf417d5b2ac..5fea9cea76b54 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_exists.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_exists.js
@@ -13,7 +13,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters', function (done) {
-      let filter = { exists: { field: '_type' } };
+      const filter = { exists: { field: '_type' } };
       mapExists(filter).then(function (result) {
         expect(result).to.have.property('key', 'exists');
         expect(result).to.have.property('value', '_type');
@@ -23,7 +23,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      let filter = { query: { match: { query: 'foo' } } };
+      const filter = { query: { match: { query: 'foo' } } };
       mapExists(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_filter.js b/src/ui/public/filter_bar/lib/__tests__/map_filter.js
index 108bc7933cb26..338a3981c7c98 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_filter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_filter.js
@@ -1,4 +1,3 @@
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/map_filter';
@@ -23,7 +22,7 @@ describe('Filter Bar Directive', function () {
 
   describe('mapFilter()', function () {
     it('should map query filters', function (done) {
-      let before = { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'apache' } } } };
+      const before = { meta: { index: 'logstash-*' }, query: { match: { '_type': { query: 'apache' } } } };
       mapFilter(before).then(function (after) {
         expect(after).to.have.property('meta');
         expect(after.meta).to.have.property('key', '_type');
@@ -36,7 +35,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should map exists filters', function (done) {
-      let before = { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } };
+      const before = { meta: { index: 'logstash-*' }, exists: { field: '@timestamp' } };
       mapFilter(before).then(function (after) {
         expect(after).to.have.property('meta');
         expect(after.meta).to.have.property('key', 'exists');
@@ -49,7 +48,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should map missing filters', function (done) {
-      let before = { meta: { index: 'logstash-*' }, missing: { field: '@timestamp' } };
+      const before = { meta: { index: 'logstash-*' }, missing: { field: '@timestamp' } };
       mapFilter(before).then(function (after) {
         expect(after).to.have.property('meta');
         expect(after.meta).to.have.property('key', 'missing');
@@ -62,7 +61,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should map json filter', function (done) {
-      let before = { meta: { index: 'logstash-*' }, query: { match_all: {} } };
+      const before = { meta: { index: 'logstash-*' }, query: { match_all: {} } };
       mapFilter(before).then(function (after) {
         expect(after).to.have.property('meta');
         expect(after.meta).to.have.property('key', 'query');
@@ -75,7 +74,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should finish with a catch', function (done) {
-      let before = { meta: { index: 'logstash-*' }};
+      const before = { meta: { index: 'logstash-*' } };
       mapFilter(before).catch(function (error) {
         expect(error).to.be.an(Error);
         expect(error.message).to.be('No mappings have been found for filter.');
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js b/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js
index c817825457802..a307123308d00 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js
@@ -1,6 +1,5 @@
 
 import _ from 'lodash';
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import FilterBarLibMapFlattenAndWrapFiltersProvider from 'ui/filter_bar/lib/map_flatten_and_wrap_filters';
@@ -22,7 +21,7 @@ describe('Filter Bar Directive', function () {
       $rootScope = _$rootScope_;
     }));
 
-    let filters = [
+    const filters = [
       null,
       [
         { meta: { index: 'logstash-*' }, exists: { field: '_type' } },
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js b/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js
index 96e891b9e8d2e..9b1c7607e8d66 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js
@@ -1,4 +1,3 @@
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import FilterBarLibMapGeoBoundingBoxProvider from 'ui/filter_bar/lib/map_geo_bounding_box';
@@ -22,7 +21,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters with bounds', function (done) {
-      let filter = {
+      const filter = {
         meta: {
           index: 'logstash-*'
         },
@@ -50,7 +49,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      let filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
+      const filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
       mapGeoBoundingBox(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_missing.js b/src/ui/public/filter_bar/lib/__tests__/map_missing.js
index 6f45c43528225..f3cecf7dec34e 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_missing.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_missing.js
@@ -14,7 +14,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters', function (done) {
-      let filter = { missing: { field: '_type' } };
+      const filter = { missing: { field: '_type' } };
       mapMissing(filter).then(function (result) {
         expect(result).to.have.property('key', 'missing');
         expect(result).to.have.property('value', '_type');
@@ -24,7 +24,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      let filter = { query: { match: { query: 'foo' } } };
+      const filter = { query: { match: { query: 'foo' } } };
       mapMissing(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_query_string.js b/src/ui/public/filter_bar/lib/__tests__/map_query_string.js
index 2913e0b77a860..41995d99608d6 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_query_string.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_query_string.js
@@ -12,7 +12,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters', function (done) {
-      let filter = { query: { query_string: { query: 'foo:bar' } } };
+      const filter = { query: { query_string: { query: 'foo:bar' } } };
       mapQueryString(filter).then(function (result) {
         expect(result).to.have.property('key', 'query');
         expect(result).to.have.property('value', 'foo:bar');
@@ -22,7 +22,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      let filter = { query: { match: { query: 'foo' } } };
+      const filter = { query: { match: { query: 'foo' } } };
       mapQueryString(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_range.js b/src/ui/public/filter_bar/lib/__tests__/map_range.js
index 85fff761b36c4..9bab9ba74dd37 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_range.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_range.js
@@ -1,4 +1,3 @@
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import FilterBarLibMapRangeProvider from 'ui/filter_bar/lib/map_range';
@@ -22,7 +21,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters with gt/lt', function (done) {
-      let filter = { meta: { index: 'logstash-*' }, range: { bytes: { lt: 2048, gt: 1024 } } };
+      const filter = { meta: { index: 'logstash-*' }, range: { bytes: { lt: 2048, gt: 1024 } } };
       mapRange(filter).then(function (result) {
         expect(result).to.have.property('key', 'bytes');
         expect(result).to.have.property('value', '1,024 to 2,048');
@@ -32,7 +31,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return the key and value for matching filters with gte/lte', function (done) {
-      let filter = { meta: { index: 'logstash-*' }, range: { bytes: { lte: 2048, gte: 1024 } } };
+      const filter = { meta: { index: 'logstash-*' }, range: { bytes: { lte: 2048, gte: 1024 } } };
       mapRange(filter).then(function (result) {
         expect(result).to.have.property('key', 'bytes');
         expect(result).to.have.property('value', '1,024 to 2,048');
@@ -42,7 +41,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      let filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
+      const filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
       mapRange(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_script.js b/src/ui/public/filter_bar/lib/__tests__/map_script.js
index 214b14b6e63d6..4cdd6c40c6328 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_script.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_script.js
@@ -1,4 +1,3 @@
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import FilterBarLibMapScriptProvider from 'ui/filter_bar/lib/map_script';
@@ -22,9 +21,9 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters', function (done) {
-      let filter = {
+      const filter = {
         meta: { index: 'logstash-*', field: 'script number' },
-        script: {script: { inline: 'doc["script number"].value * 5', params: { value: 35}}}
+        script: { script: { inline: 'doc["script number"].value * 5', params: { value: 35 } } }
       };
       mapScript(filter).then(function (result) {
         expect(result).to.have.property('key', 'script number');
@@ -35,7 +34,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      let filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
+      const filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
       mapScript(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
@@ -44,7 +43,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return a value for a range/histogram filter from a scripted field', (done) => {
-      let filter = {
+      const filter = {
         meta: {
           index: 'logstash-*',
           formattedValue: '1,000.00 to 2,000.00',
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_terms.js b/src/ui/public/filter_bar/lib/__tests__/map_terms.js
index f2971ad91d7ce..20c219e9cf002 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_terms.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_terms.js
@@ -1,4 +1,3 @@
-import sinon from 'auto-release-sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import FilterBarLibMapTermsProvider from 'ui/filter_bar/lib/map_terms';
@@ -22,7 +21,7 @@ describe('Filter Bar Directive', function () {
     }));
 
     it('should return the key and value for matching filters', function (done) {
-      let filter = { meta: { index: 'logstash-*' }, query: { match: { _type: { query: 'apache', type: 'phrase' } } } };
+      const filter = { meta: { index: 'logstash-*' }, query: { match: { _type: { query: 'apache', type: 'phrase' } } } };
       mapTerms(filter).then(function (result) {
         expect(result).to.have.property('key', '_type');
         expect(result).to.have.property('value', 'apache');
@@ -32,7 +31,7 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return undefined for none matching', function (done) {
-      let filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
+      const filter = { meta: { index: 'logstash-*' }, query: { query_string: { query: 'foo:bar' } } };
       mapTerms(filter).catch(function (result) {
         expect(result).to.be(filter);
         done();
diff --git a/src/ui/public/filter_bar/lib/__tests__/only_disabled.js b/src/ui/public/filter_bar/lib/__tests__/only_disabled.js
index e7bc342a5d8b1..f9e170b9afd1d 100644
--- a/src/ui/public/filter_bar/lib/__tests__/only_disabled.js
+++ b/src/ui/public/filter_bar/lib/__tests__/only_disabled.js
@@ -4,71 +4,71 @@ describe('Filter Bar Directive', function () {
   describe('onlyDisabled()', function () {
 
     it('should return true if all filters are disabled', function () {
-      let filters = [
+      const filters = [
         { meta: { disabled: true } },
         { meta: { disabled: true } },
         { meta: { disabled: true } }
       ];
-      let newFilters = [{ meta: { disabled: true } }];
+      const newFilters = [{ meta: { disabled: true } }];
       expect(onlyDisabled(newFilters, filters)).to.be(true);
     });
 
     it('should return false if all filters are not disabled', function () {
-      let filters = [
+      const filters = [
         { meta: { disabled: false } },
         { meta: { disabled: false } },
         { meta: { disabled: false } }
       ];
-      let newFilters = [{ meta: { disabled: false } }];
+      const newFilters = [{ meta: { disabled: false } }];
       expect(onlyDisabled(newFilters, filters)).to.be(false);
     });
 
     it('should return false if only old filters are disabled', function () {
-      let filters = [
+      const filters = [
         { meta: { disabled: true } },
         { meta: { disabled: true } },
         { meta: { disabled: true } }
       ];
-      let newFilters = [{ meta: { disabled: false } }];
+      const newFilters = [{ meta: { disabled: false } }];
       expect(onlyDisabled(newFilters, filters)).to.be(false);
     });
 
     it('should return false if new filters are not disabled', function () {
-      let filters = [
+      const filters = [
         { meta: { disabled: false } },
         { meta: { disabled: false } },
         { meta: { disabled: false } }
       ];
-      let newFilters = [{ meta: { disabled: true } }];
+      const newFilters = [{ meta: { disabled: true } }];
       expect(onlyDisabled(newFilters, filters)).to.be(false);
     });
 
     it('should return true when all removed filters were disabled', function () {
-      let filters = [
+      const filters = [
         { meta: { disabled: true } },
         { meta: { disabled: true } },
         { meta: { disabled: true } }
       ];
-      let newFilters = [];
+      const newFilters = [];
       expect(onlyDisabled(newFilters, filters)).to.be(true);
     });
 
     it('should return false when all removed filters were not disabled', function () {
-      let filters = [
+      const filters = [
         { meta: { disabled: false } },
         { meta: { disabled: false } },
         { meta: { disabled: false } }
       ];
-      let newFilters = [];
+      const newFilters = [];
       expect(onlyDisabled(newFilters, filters)).to.be(false);
     });
 
     it('should return true if all changed filters are disabled', function () {
-      let filters = [
+      const filters = [
         { meta: { disabled: true, negate: false } },
         { meta: { disabled: true, negate: false } }
       ];
-      let newFilters = [
+      const newFilters = [
         { meta: { disabled: true, negate: true } },
         { meta: { disabled: true, negate: true } }
       ];
@@ -76,31 +76,31 @@ describe('Filter Bar Directive', function () {
     });
 
     it('should return false if all filters remove were not disabled', function () {
-      let filters = [
+      const filters = [
         { meta: { disabled: false } },
         { meta: { disabled: false } },
         { meta: { disabled: true } }
       ];
-      let newFilters = [{ meta: { disabled: false } }];
+      const newFilters = [{ meta: { disabled: false } }];
       expect(onlyDisabled(newFilters, filters)).to.be(false);
     });
 
     it('should return false when all removed filters are not disabled', function () {
-      let filters = [
+      const filters = [
         { meta: { disabled: true } },
         { meta: { disabled: false } },
         { meta: { disabled: true } }
       ];
-      let newFilters = [];
+      const newFilters = [];
       expect(onlyDisabled(newFilters, filters)).to.be(false);
     });
 
     it('should not throw with null filters', function () {
-      let filters = [
+      const filters = [
         null,
         { meta: { disabled: true } }
       ];
-      let newFilters = [];
+      const newFilters = [];
       expect(function () {
         onlyDisabled(newFilters, filters);
       }).to.not.throwError();
diff --git a/src/ui/public/filter_bar/lib/__tests__/uniq_filters.js b/src/ui/public/filter_bar/lib/__tests__/uniq_filters.js
index 391b2dc67dc65..dffe89f96f3c1 100644
--- a/src/ui/public/filter_bar/lib/__tests__/uniq_filters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/uniq_filters.js
@@ -4,16 +4,16 @@ describe('Filter Bar Directive', function () {
   describe('uniqFilter', function () {
 
     it('should filter out dups', function () {
-      let before = [
+      const before = [
         { query: { _type: { match: { query: 'apache', type: 'phrase' } } } },
         { query: { _type: { match: { query: 'apache', type: 'phrase' } } } }
       ];
-      let results = uniqFilters(before);
+      const results = uniqFilters(before);
       expect(results).to.have.length(1);
     });
 
     it('should filter out duplicates, ignoring meta attributes', function () {
-      let before = [
+      const before = [
         {
           meta: { negate: true },
           query: { _type: { match: { query: 'apache', type: 'phrase' } } }
@@ -23,12 +23,12 @@ describe('Filter Bar Directive', function () {
           query: { _type: { match: { query: 'apache', type: 'phrase' } } }
         }
       ];
-      let results = uniqFilters(before);
+      const results = uniqFilters(before);
       expect(results).to.have.length(1);
     });
 
     it('should filter out duplicates, ignoring $state attributes', function () {
-      let before = [
+      const before = [
         {
           $state: { store: 'appState' },
           query: { _type: { match: { query: 'apache', type: 'phrase' } } }
@@ -38,7 +38,7 @@ describe('Filter Bar Directive', function () {
           query: { _type: { match: { query: 'apache', type: 'phrase' } } }
         }
       ];
-      let results = uniqFilters(before);
+      const results = uniqFilters(before);
       expect(results).to.have.length(1);
     });
   });
diff --git a/src/ui/public/filter_bar/lib/change_time_filter.js b/src/ui/public/filter_bar/lib/change_time_filter.js
index 47e991eabe7be..8fa3ced67b24f 100644
--- a/src/ui/public/filter_bar/lib/change_time_filter.js
+++ b/src/ui/public/filter_bar/lib/change_time_filter.js
@@ -2,10 +2,10 @@ import moment from 'moment';
 import _ from 'lodash';
 export default function changeTimeFilterProvider(timefilter) {
   return function (filter) {
-    let key = _.keys(filter.range)[0];
-    let values = filter.range[key];
+    const key = _.keys(filter.range)[0];
+    const values = filter.range[key];
     timefilter.time.from = moment(values.gt || values.gte);
     timefilter.time.to = moment(values.lt || values.lte);
     timefilter.time.mode = 'absolute';
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/compare_filters.js b/src/ui/public/filter_bar/lib/compare_filters.js
index 2cfa19e6d5345..2345845fea582 100644
--- a/src/ui/public/filter_bar/lib/compare_filters.js
+++ b/src/ui/public/filter_bar/lib/compare_filters.js
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import angular from 'angular';
 let excludedAttributes;
 let comparators;
 
@@ -21,10 +20,10 @@ export default function (first, second, comparatorOptions) {
   if (!comparators.state) excludedAttributes.push('$state');
 
   return _.isEqual(mapFilter(first), mapFilter(second));
-};
+}
 
 function mapFilter(filter) {
-  let cleaned = _.omit(filter, excludedAttributes);
+  const cleaned = _.omit(filter, excludedAttributes);
   if (comparators.negate) cleaned.negate = filter.meta && !!filter.meta.negate;
   if (comparators.disabled) cleaned.disabled = filter.meta && !!filter.meta.disabled;
   return cleaned;
diff --git a/src/ui/public/filter_bar/lib/dedup_filters.js b/src/ui/public/filter_bar/lib/dedup_filters.js
index cfcc2ac91351e..9d3823b2caebe 100644
--- a/src/ui/public/filter_bar/lib/dedup_filters.js
+++ b/src/ui/public/filter_bar/lib/dedup_filters.js
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import angular from 'angular';
 import compareFilters from 'ui/filter_bar/lib/compare_filters';
 
 /**
@@ -17,4 +16,4 @@ export default function (existingFilters, filters, comparatorOptions) {
       return compareFilters(existingFilter, filter, comparatorOptions);
     });
   });
-};
+}
diff --git a/src/ui/public/filter_bar/lib/extract_time_filter.js b/src/ui/public/filter_bar/lib/extract_time_filter.js
index c13b96a4ffa25..e6f3dd5dd3485 100644
--- a/src/ui/public/filter_bar/lib/extract_time_filter.js
+++ b/src/ui/public/filter_bar/lib/extract_time_filter.js
@@ -3,12 +3,12 @@ export default function extractTimeFilterProvider(courier, Promise) {
   return Promise.method(function (filters) {
     // Assume all the index patterns are the same since they will be added
     // from the same visualization.
-    let id = _.get(filters, '[0].meta.index');
+    const id = _.get(filters, '[0].meta.index');
     if (id == null) return;
 
     return courier.indexPatterns.get(id).then(function (indexPattern) {
-      let filter = _.find(filters, function (obj) {
-        let key = _.keys(obj.range)[0];
+      const filter = _.find(filters, function (obj) {
+        const key = _.keys(obj.range)[0];
         return key === indexPattern.timeFieldName;
       });
       if (filter && filter.range) {
@@ -16,4 +16,4 @@ export default function extractTimeFilterProvider(courier, Promise) {
       }
     });
   });
-};
+}
diff --git a/src/ui/public/filter_bar/lib/filter_applied_and_unwrap.js b/src/ui/public/filter_bar/lib/filter_applied_and_unwrap.js
index d45c8856ff364..9164d379ff86d 100644
--- a/src/ui/public/filter_bar/lib/filter_applied_and_unwrap.js
+++ b/src/ui/public/filter_bar/lib/filter_applied_and_unwrap.js
@@ -1,5 +1,5 @@
 import _ from 'lodash';
 export default function (filters) {
   return _.filter(filters, 'meta.apply');
-};
+}
 
diff --git a/src/ui/public/filter_bar/lib/filter_out_time_based_filter.js b/src/ui/public/filter_bar/lib/filter_out_time_based_filter.js
index bd033b15fd8d5..4d58775f97aaa 100644
--- a/src/ui/public/filter_bar/lib/filter_out_time_based_filter.js
+++ b/src/ui/public/filter_bar/lib/filter_out_time_based_filter.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 export default function filterOutTimeBaseFilter(courier, Promise) {
   return Promise.method(function (filters) {
-    let id = _.get(filters, '[0].meta.index');
+    const id = _.get(filters, '[0].meta.index');
     if (id == null) return;
 
     return courier.indexPatterns.get(id).then(function (indexPattern) {
@@ -10,4 +10,4 @@ export default function filterOutTimeBaseFilter(courier, Promise) {
       });
     });
   });
-};
+}
diff --git a/src/ui/public/filter_bar/lib/generate_mapping_chain.js b/src/ui/public/filter_bar/lib/generate_mapping_chain.js
index e857804a37775..d6bdad219f980 100644
--- a/src/ui/public/filter_bar/lib/generate_mapping_chain.js
+++ b/src/ui/public/filter_bar/lib/generate_mapping_chain.js
@@ -1,7 +1,6 @@
-import _ from 'lodash';
 export default function generateMappingChainProvider(Promise) {
 
-  let noop = function () {
+  const noop = function () {
     return Promise.reject(new Error('No mappings have been found for filter.'));
   };
 
@@ -19,4 +18,4 @@ export default function generateMappingChainProvider(Promise) {
     };
   };
 
-};
+}
diff --git a/src/ui/public/filter_bar/lib/map_and_flatten_filters.js b/src/ui/public/filter_bar/lib/map_and_flatten_filters.js
index f48706eb68f88..fc17d3dadc646 100644
--- a/src/ui/public/filter_bar/lib/map_and_flatten_filters.js
+++ b/src/ui/public/filter_bar/lib/map_and_flatten_filters.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/map_filter';
 export default function mapAndFlattenFiltersProvider(Private, Promise) {
-  let mapFilter = Private(FilterBarLibMapFilterProvider);
+  const mapFilter = Private(FilterBarLibMapFilterProvider);
   return function (filters) {
     return _(filters)
     .flatten()
@@ -10,4 +10,4 @@ export default function mapAndFlattenFiltersProvider(Private, Promise) {
     .thru(Promise.all)
     .value();
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/map_default.js b/src/ui/public/filter_bar/lib/map_default.js
index e9f53ed21710e..68b9fad97e979 100644
--- a/src/ui/public/filter_bar/lib/map_default.js
+++ b/src/ui/public/filter_bar/lib/map_default.js
@@ -2,17 +2,17 @@ import angular from 'angular';
 import _ from 'lodash';
 export default function mapDefaultProvider(Promise) {
 
-  let metaProperty = /(^\$|meta)/;
+  const metaProperty = /(^\$|meta)/;
 
   return function (filter) {
-    let key = _.find(_.keys(filter), function (key) {
+    const key = _.find(_.keys(filter), function (key) {
       return !key.match(metaProperty);
     });
 
     if (key) {
-      let value = angular.toJson(filter[key]);
+      const value = angular.toJson(filter[key]);
       return Promise.resolve({ key: key, value: value });
     }
     return Promise.reject(filter);
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/map_exists.js b/src/ui/public/filter_bar/lib/map_exists.js
index 84021d9d9add9..ae34f385c72cd 100644
--- a/src/ui/public/filter_bar/lib/map_exists.js
+++ b/src/ui/public/filter_bar/lib/map_exists.js
@@ -9,4 +9,4 @@ export default function mapExistsProvider(Promise) {
     }
     return Promise.reject(filter);
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/map_filter.js b/src/ui/public/filter_bar/lib/map_filter.js
index 5ff047813f9ef..fbe8834eecbda 100644
--- a/src/ui/public/filter_bar/lib/map_filter.js
+++ b/src/ui/public/filter_bar/lib/map_filter.js
@@ -11,7 +11,7 @@ import MapScriptProvider from './map_script';
 import MapDefaultProvider from './map_default';
 export default function mapFilterProvider(Promise, Private) {
 
-  let generateMappingChain = Private(GenerateMappingChainProvider);
+  const generateMappingChain = Private(GenerateMappingChainProvider);
 
   /** Mappers **/
 
@@ -29,7 +29,7 @@ export default function mapFilterProvider(Promise, Private) {
   // To create a new mapper you just need to create a function
   // that either handles the mapping operation or not
   // and add it here. ProTip: These are executed in order listed
-  let mappers = [
+  const mappers = [
     Private(MapMatchAllProvider),
     Private(MapTermsProvider),
     Private(MapRangeProvider),
@@ -41,14 +41,14 @@ export default function mapFilterProvider(Promise, Private) {
     Private(MapDefaultProvider)
   ];
 
-  let noop = function () {
+  const noop = function () {
     return Promise.reject(new Error('No mappings have been found for filter.'));
   };
 
   // Create a chain of responsibility by reducing all the
   // mappers down into one function.
-  let mapFn = _.reduceRight(mappers, function (memo, map) {
-    let filterChainFn = generateMappingChain(map);
+  const mapFn = _.reduceRight(mappers, function (memo, map) {
+    const filterChainFn = generateMappingChain(map);
     return filterChainFn(memo);
   }, noop);
 
@@ -70,4 +70,4 @@ export default function mapFilterProvider(Promise, Private) {
       return filter;
     });
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/map_flatten_and_wrap_filters.js b/src/ui/public/filter_bar/lib/map_flatten_and_wrap_filters.js
index f86b5a6e566b1..7b449468f44ea 100644
--- a/src/ui/public/filter_bar/lib/map_flatten_and_wrap_filters.js
+++ b/src/ui/public/filter_bar/lib/map_flatten_and_wrap_filters.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters';
 export default function mapFlattenAndWrapFilters(Private) {
-  let mapAndFlattenFilters = Private(FilterBarLibMapAndFlattenFiltersProvider);
+  const mapAndFlattenFilters = Private(FilterBarLibMapAndFlattenFiltersProvider);
   return function (filters) {
     return mapAndFlattenFilters(filters).then(function (filters) {
       return _.map(filters, function (filter) {
@@ -11,4 +11,4 @@ export default function mapFlattenAndWrapFilters(Private) {
       });
     });
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/map_geo_bounding_box.js b/src/ui/public/filter_bar/lib/map_geo_bounding_box.js
index 3418186d0656a..acfcf47fd6353 100644
--- a/src/ui/public/filter_bar/lib/map_geo_bounding_box.js
+++ b/src/ui/public/filter_bar/lib/map_geo_bounding_box.js
@@ -20,4 +20,4 @@ export default function mapGeoBoundBoxProvider(Promise, courier) {
     }
     return Promise.reject(filter);
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/map_match_all.js b/src/ui/public/filter_bar/lib/map_match_all.js
index 32e21ac03471d..925a6ce172279 100644
--- a/src/ui/public/filter_bar/lib/map_match_all.js
+++ b/src/ui/public/filter_bar/lib/map_match_all.js
@@ -7,4 +7,4 @@ export default function mapMatchAllProvider(Promise) {
     }
     return Promise.reject(filter);
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/map_missing.js b/src/ui/public/filter_bar/lib/map_missing.js
index 154cec7adb703..cb60c43f72e5e 100644
--- a/src/ui/public/filter_bar/lib/map_missing.js
+++ b/src/ui/public/filter_bar/lib/map_missing.js
@@ -9,4 +9,4 @@ export default function mapMissingProvider(Promise) {
     }
     return Promise.reject(filter);
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/map_query_string.js b/src/ui/public/filter_bar/lib/map_query_string.js
index 32e471f46f988..5adf8139378a5 100644
--- a/src/ui/public/filter_bar/lib/map_query_string.js
+++ b/src/ui/public/filter_bar/lib/map_query_string.js
@@ -9,4 +9,4 @@ export default function mapQueryStringProvider(Promise) {
     }
     return Promise.reject(filter);
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/map_range.js b/src/ui/public/filter_bar/lib/map_range.js
index 5e710b0dd4560..ce2d19f4237c5 100644
--- a/src/ui/public/filter_bar/lib/map_range.js
+++ b/src/ui/public/filter_bar/lib/map_range.js
@@ -1,4 +1,4 @@
-import {has} from 'lodash';
+import { has } from 'lodash';
 export default function mapRangeProvider(Promise, courier) {
   return function (filter) {
     if (!filter.range) return Promise.reject(filter);
@@ -7,9 +7,9 @@ export default function mapRangeProvider(Promise, courier) {
     .indexPatterns
     .get(filter.meta.index)
     .then(function (indexPattern) {
-      let key = Object.keys(filter.range)[0];
-      let convert = indexPattern.fields.byName[key].format.getConverterFor('text');
-      let range = filter.range[key];
+      const key = Object.keys(filter.range)[0];
+      const convert = indexPattern.fields.byName[key].format.getConverterFor('text');
+      const range = filter.range[key];
 
       let left = has(range, 'gte') ? range.gte : range.gt;
       if (left == null) left = -Infinity;
@@ -24,4 +24,4 @@ export default function mapRangeProvider(Promise, courier) {
     });
 
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/map_script.js b/src/ui/public/filter_bar/lib/map_script.js
index 0cbe74a6b1b35..2a3f9694a7e6d 100644
--- a/src/ui/public/filter_bar/lib/map_script.js
+++ b/src/ui/public/filter_bar/lib/map_script.js
@@ -1,27 +1,25 @@
-define(function () {
-  return function mapScriptProvider(Promise, courier) {
-    return function (filter) {
-      let key;
-      let value;
-      let field;
-      if (filter.script) {
-        return courier
-        .indexPatterns
-        .get(filter.meta.index).then(function (indexPattern) {
-          key = filter.meta.field;
-          field = indexPattern.fields.byName[key];
+export default function mapScriptProvider(Promise, courier) {
+  return function (filter) {
+    let key;
+    let value;
+    let field;
+    if (filter.script) {
+      return courier
+      .indexPatterns
+      .get(filter.meta.index).then(function (indexPattern) {
+        key = filter.meta.field;
+        field = indexPattern.fields.byName[key];
 
-          if (filter.meta.formattedValue) {
-            value = filter.meta.formattedValue;
-          } else {
-            value = filter.script.script.params.value;
-            value = field.format.convert(value);
-          }
+        if (filter.meta.formattedValue) {
+          value = filter.meta.formattedValue;
+        } else {
+          value = filter.script.script.params.value;
+          value = field.format.convert(value);
+        }
 
-          return { key: key, value: value };
-        });
-      }
-      return Promise.reject(filter);
-    };
+        return { key: key, value: value };
+      });
+    }
+    return Promise.reject(filter);
   };
-});
+}
diff --git a/src/ui/public/filter_bar/lib/map_terms.js b/src/ui/public/filter_bar/lib/map_terms.js
index 8bd009a4be3a1..b7584b55eeefb 100644
--- a/src/ui/public/filter_bar/lib/map_terms.js
+++ b/src/ui/public/filter_bar/lib/map_terms.js
@@ -17,4 +17,4 @@ export default function mapTermsProvider(Promise, courier) {
     }
     return Promise.reject(filter);
   };
-};
+}
diff --git a/src/ui/public/filter_bar/lib/only_disabled.js b/src/ui/public/filter_bar/lib/only_disabled.js
index 8bb7cbf23ee91..4938e2240a9c1 100644
--- a/src/ui/public/filter_bar/lib/only_disabled.js
+++ b/src/ui/public/filter_bar/lib/only_disabled.js
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 
-let pluckDisabled = function (filter) {
+const pluckDisabled = function (filter) {
   return _.get(filter, 'meta.disabled');
 };
 
@@ -12,4 +12,4 @@ export default function (newFilters, oldFilters) {
   return _.every(newFilters.concat(oldFilters), function (newFilter) {
     return pluckDisabled(newFilter);
   });
-};
+}
diff --git a/src/ui/public/filter_bar/lib/only_state_changed.js b/src/ui/public/filter_bar/lib/only_state_changed.js
index 8fe0cceec830a..55560cf6f600a 100644
--- a/src/ui/public/filter_bar/lib/only_state_changed.js
+++ b/src/ui/public/filter_bar/lib/only_state_changed.js
@@ -1,16 +1,16 @@
 import _ from 'lodash';
 import compareFilters from 'ui/filter_bar/lib/compare_filters';
-let compareOptions = { disabled: true, negate: true };
+const compareOptions = { disabled: true, negate: true };
 
 /**
  * Checks to see if only disabled filters have been changed
  * @returns {bool} Only disabled filters
  */
 export default function (newFilters, oldFilters) {
-  return _.every(newFilters, function (newFilter, i) {
-    let match = _.find(oldFilters, function (oldFilter) {
+  return _.every(newFilters, function (newFilter) {
+    const match = _.find(oldFilters, function (oldFilter) {
       return compareFilters(newFilter, oldFilter, compareOptions);
     });
     return !!match;
   });
-};
+}
diff --git a/src/ui/public/filter_bar/lib/remap_filters.js b/src/ui/public/filter_bar/lib/remap_filters.js
index 081b692a3d0b1..161597d3ca68e 100644
--- a/src/ui/public/filter_bar/lib/remap_filters.js
+++ b/src/ui/public/filter_bar/lib/remap_filters.js
@@ -5,5 +5,5 @@
  */
 export default function (filter) {
   return filter.filter;
-};
+}
 
diff --git a/src/ui/public/filter_bar/lib/uniq_filters.js b/src/ui/public/filter_bar/lib/uniq_filters.js
index cdaa896b55a09..312b42259c5c1 100644
--- a/src/ui/public/filter_bar/lib/uniq_filters.js
+++ b/src/ui/public/filter_bar/lib/uniq_filters.js
@@ -12,4 +12,4 @@ export default function (filters, comparatorOptions) {
     results = _.union(results, dedupFilters(results, [filter], comparatorOptions));
   });
   return results;
-};
+}
diff --git a/src/ui/public/filter_bar/push_filter.js b/src/ui/public/filter_bar/push_filter.js
index 6375791b05826..6f1cccbc84cdc 100644
--- a/src/ui/public/filter_bar/push_filter.js
+++ b/src/ui/public/filter_bar/push_filter.js
@@ -7,11 +7,11 @@ export default function () {
       // Hierarchical and tabular data set their aggConfigResult parameter
       // differently because of how the point is rewritten between the two. So
       // we need to check if the point.orig is set, if not use try the point.aggConfigResult
-      let filters = _.clone($state.filters || []);
-      let pendingFilter = { meta: { negate: negate, index: index }};
+      const filters = _.clone($state.filters || []);
+      const pendingFilter = { meta: { negate: negate, index: index } };
       _.extend(pendingFilter, filter);
       filters.push(pendingFilter);
       $state.filters = filters;
     };
   };
-};
+}
diff --git a/src/ui/public/filter_bar/query_filter.js b/src/ui/public/filter_bar/query_filter.js
index 7647586b0c44f..9a7e719af4411 100644
--- a/src/ui/public/filter_bar/query_filter.js
+++ b/src/ui/public/filter_bar/query_filter.js
@@ -8,21 +8,21 @@ import EventsProvider from 'ui/events';
 import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters';
 
 export default function (Private, $rootScope, getAppState, globalState, config) {
-  let EventEmitter = Private(EventsProvider);
-  let mapAndFlattenFilters = Private(FilterBarLibMapAndFlattenFiltersProvider);
+  const EventEmitter = Private(EventsProvider);
+  const mapAndFlattenFilters = Private(FilterBarLibMapAndFlattenFiltersProvider);
 
-  let queryFilter = new EventEmitter();
+  const queryFilter = new EventEmitter();
 
   queryFilter.getFilters = function () {
-    let compareOptions = { disabled: true, negate: true };
-    let appFilters = queryFilter.getAppFilters();
-    let globalFilters = queryFilter.getGlobalFilters();
+    const compareOptions = { disabled: true, negate: true };
+    const appFilters = queryFilter.getAppFilters();
+    const globalFilters = queryFilter.getGlobalFilters();
 
     return uniqFilters(globalFilters.concat(appFilters), compareOptions);
   };
 
   queryFilter.getAppFilters = function () {
-    let appState = getAppState();
+    const appState = getAppState();
     if (!appState || !appState.filters) return [];
 
     // Work around for https://github.com/elastic/kibana/issues/5896
@@ -49,7 +49,7 @@ export default function (Private, $rootScope, getAppState, globalState, config)
   queryFilter.addFilters = function (filters, global) {
 
     if (global === undefined) {
-      let configDefault = config.get('filters:pinnedByDefault');
+      const configDefault = config.get('filters:pinnedByDefault');
 
       if (configDefault === false || configDefault === true) {
         global = configDefault;
@@ -57,8 +57,8 @@ export default function (Private, $rootScope, getAppState, globalState, config)
     }
 
     // Determine the state for the new filter (whether to pass the filter through other apps or not)
-    let appState = getAppState();
-    let filterState = (global) ? globalState : appState;
+    const appState = getAppState();
+    const filterState = (global) ? globalState : appState;
 
     if (!_.isArray(filters)) {
       filters = [filters];
@@ -79,8 +79,8 @@ export default function (Private, $rootScope, getAppState, globalState, config)
    * @param {object} matchFilter The filter to remove
    */
   queryFilter.removeFilter = function (matchFilter) {
-    let appState = getAppState();
-    let filter = _.omit(matchFilter, ['$$hashKey']);
+    const appState = getAppState();
+    const filter = _.omit(matchFilter, ['$$hashKey']);
     let state;
     let index;
 
@@ -108,11 +108,11 @@ export default function (Private, $rootScope, getAppState, globalState, config)
   * @returns {object} Promise that resolves to the new filter on a successful merge
   */
   queryFilter.updateFilter = function (filter) {
-    let mergedFilter = _.assign({}, filter.source, filter.model);
+    const mergedFilter = _.assign({}, filter.source, filter.model);
     mergedFilter.meta.alias = filter.alias;
     //If the filter type is changed we want to discard the old type
     //when merging changes back in
-    let filterTypeReplaced = filter.model[filter.type] !== mergedFilter[filter.type];
+    const filterTypeReplaced = filter.model[filter.type] !== mergedFilter[filter.type];
     if (filterTypeReplaced) {
       delete mergedFilter[filter.type];
     }
@@ -124,7 +124,7 @@ export default function (Private, $rootScope, getAppState, globalState, config)
    * Removes all filters
    */
   queryFilter.removeAll = function () {
-    let appState = getAppState();
+    const appState = getAppState();
     appState.filters = [];
     globalState.filters = [];
   };
@@ -137,7 +137,7 @@ export default function (Private, $rootScope, getAppState, globalState, config)
    */
   queryFilter.toggleFilter = function (filter, force) {
     // Toggle the disabled flag
-    let disabled = _.isUndefined(force) ? !filter.meta.disabled : !!force;
+    const disabled = _.isUndefined(force) ? !filter.meta.disabled : !!force;
     filter.meta.disabled = disabled;
     return filter;
   };
@@ -182,20 +182,20 @@ export default function (Private, $rootScope, getAppState, globalState, config)
    * @returns {object} updated filter
    */
   queryFilter.pinFilter = function (filter, force) {
-    let appState = getAppState();
+    const appState = getAppState();
     if (!appState) return filter;
 
     // ensure that both states have a filters property
     if (!_.isArray(globalState.filters)) globalState.filters = [];
     if (!_.isArray(appState.filters)) appState.filters = [];
 
-    let appIndex = _.indexOf(appState.filters, filter);
+    const appIndex = _.indexOf(appState.filters, filter);
 
     if (appIndex !== -1 && force !== false) {
       appState.filters.splice(appIndex, 1);
       globalState.filters.push(filter);
     } else {
-      let globalIndex = _.indexOf(globalState.filters, filter);
+      const globalIndex = _.indexOf(globalState.filters, filter);
 
       if (globalIndex === -1 || force === true) return filter;
 
@@ -226,7 +226,7 @@ export default function (Private, $rootScope, getAppState, globalState, config)
    * Rids filter list of null values and replaces state if any nulls are found
    */
   function validateStateFilters(state) {
-    let compacted = _.compact(state.filters);
+    const compacted = _.compact(state.filters);
     if (state.filters.length !== compacted.length) {
       state.filters = compacted;
       state.replace();
@@ -240,7 +240,7 @@ export default function (Private, $rootScope, getAppState, globalState, config)
    * @returns {object} Resulting filter list, app and global combined
    */
   function saveState() {
-    let appState = getAppState();
+    const appState = getAppState();
     if (appState) appState.save();
     globalState.save();
   }
@@ -256,7 +256,7 @@ export default function (Private, $rootScope, getAppState, globalState, config)
 
   // helper to run a function on all filters in all states
   function executeOnFilters(fn) {
-    let appState = getAppState();
+    const appState = getAppState();
     let globalFilters = [];
     let appFilters = [];
 
@@ -268,13 +268,13 @@ export default function (Private, $rootScope, getAppState, globalState, config)
 
   function mergeStateFilters(gFilters, aFilters, compareOptions) {
     // ensure we don't mutate the filters passed in
-    let globalFilters = gFilters ? _.cloneDeep(gFilters) : [];
-    let appFilters = aFilters ? _.cloneDeep(aFilters) : [];
+    const globalFilters = gFilters ? _.cloneDeep(gFilters) : [];
+    const appFilters = aFilters ? _.cloneDeep(aFilters) : [];
     compareOptions = _.defaults(compareOptions || {}, { disabled: true });
 
     // existing globalFilters should be mutated by appFilters
     _.each(appFilters, function (filter, i) {
-      let match = _.find(globalFilters, function (globalFilter) {
+      const match = _.find(globalFilters, function (globalFilter) {
         return compareFilters(globalFilter, filter, compareOptions);
       });
 
@@ -306,7 +306,7 @@ export default function (Private, $rootScope, getAppState, globalState, config)
 
     function initAppStateWatchers() {
       // multi watch on the app and global states
-      let stateWatchers = [{
+      const stateWatchers = [{
         fn: $rootScope.$watch,
         deep: true,
         get: queryFilter.getGlobalFilters
@@ -325,14 +325,14 @@ export default function (Private, $rootScope, getAppState, globalState, config)
         let doFetch = false;
 
         // reconcile filter in global and app states
-        let filters = mergeStateFilters(next[0], next[1]);
-        let globalFilters = filters[0];
-        let appFilters = filters[1];
-        let appState = getAppState();
+        const filters = mergeStateFilters(next[0], next[1]);
+        const globalFilters = filters[0];
+        const appFilters = filters[1];
+        const appState = getAppState();
 
         // save the state, as it may have updated
-        let globalChanged = !_.isEqual(next[0], globalFilters);
-        let appChanged = !_.isEqual(next[1], appFilters);
+        const globalChanged = !_.isEqual(next[0], globalFilters);
+        const appChanged = !_.isEqual(next[1], appFilters);
 
         // the filters were changed, apply to state (re-triggers this watcher)
         if (globalChanged || appChanged) {
@@ -359,8 +359,8 @@ export default function (Private, $rootScope, getAppState, globalState, config)
           let oldFilters = [];
 
           stateWatchers.forEach(function (watcher, i) {
-            let nextVal = next[i];
-            let prevVal = prev[i];
+            const nextVal = next[i];
+            const prevVal = prev[i];
             newFilters = newFilters.concat(nextVal);
             oldFilters = oldFilters.concat(prevVal);
 
@@ -382,4 +382,4 @@ export default function (Private, $rootScope, getAppState, globalState, config)
       });
     }
   }
-};
+}
diff --git a/src/ui/public/filter_manager/__tests__/filter_manager.js b/src/ui/public/filter_manager/__tests__/filter_manager.js
index a27b56ff6926c..48eaffa85de45 100644
--- a/src/ui/public/filter_manager/__tests__/filter_manager.js
+++ b/src/ui/public/filter_manager/__tests__/filter_manager.js
@@ -5,14 +5,13 @@ import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import FilterManagerProvider from 'ui/filter_manager';
 import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
-let $rootScope;
 let queryFilter;
 let filterManager;
 let appState;
 
 function checkAddFilters(length, comps, idx) {
   idx = idx || 0;
-  let filters = queryFilter.addFilters.getCall(idx).args[0];
+  const filters = queryFilter.addFilters.getCall(idx).args[0];
 
   expect(filters.length).to.be(length);
   if (!_.isArray(comps)) return;
@@ -37,7 +36,6 @@ describe('Filter Manager', function () {
   ));
 
   beforeEach(ngMock.inject(function (_$rootScope_, Private) {
-    $rootScope = _$rootScope_;
     filterManager = Private(FilterManagerProvider);
 
     // mock required queryFilter methods, used in the manager
@@ -63,7 +61,7 @@ describe('Filter Manager', function () {
     expect(queryFilter.addFilters.callCount).to.be(1);
     checkAddFilters(1, [{
       meta: { index: 'myIndex', negate: false },
-      query: { match: { myField: { query: 1, type: 'phrase'} } }
+      query: { match: { myField: { query: 1, type: 'phrase' } } }
     }]);
   });
 
@@ -72,13 +70,13 @@ describe('Filter Manager', function () {
     expect(queryFilter.addFilters.callCount).to.be(1);
     checkAddFilters(3, [{
       meta: { index: 'myIndex', negate: false },
-      query: { match: { myField: { query: 1, type: 'phrase'} } }
+      query: { match: { myField: { query: 1, type: 'phrase' } } }
     }, {
       meta: { index: 'myIndex', negate: false },
-      query: { match: { myField: { query: 2, type: 'phrase'} } }
+      query: { match: { myField: { query: 2, type: 'phrase' } } }
     }, {
       meta: { index: 'myIndex', negate: false },
-      query: { match: { myField: { query: 3, type: 'phrase'} } }
+      query: { match: { myField: { query: 3, type: 'phrase' } } }
     }]);
   });
 
@@ -94,7 +92,7 @@ describe('Filter Manager', function () {
     filterManager.add('myField', 1, '+', 'myIndex');
     checkAddFilters(1, [{
       meta: { index: 'myIndex', negate: false },
-      query: { match: { myField: { query: 1, type: 'phrase'} } }
+      query: { match: { myField: { query: 1, type: 'phrase' } } }
     }], 0);
     expect(appState.filters).to.have.length(1);
 
@@ -114,15 +112,15 @@ describe('Filter Manager', function () {
     checkAddFilters(0, null, 3);
     expect(appState.filters).to.have.length(2);
 
-    let scriptedField = {name: 'scriptedField', scripted: true, script: 1, lang: 'painless'};
+    const scriptedField = { name: 'scriptedField', scripted: true, script: 1, lang: 'painless' };
     filterManager.add(scriptedField, 1, '+', 'myIndex');
     checkAddFilters(1, [{
-      meta: {index: 'myIndex', negate: false, field: 'scriptedField'},
+      meta: { index: 'myIndex', negate: false, field: 'scriptedField' },
       script: {
         script: {
           inline: '(' + scriptedField.script + ') == params.value',
           lang: scriptedField.lang,
-          params: {value: 1}
+          params: { value: 1 }
         }
       }
     }], 4);
diff --git a/src/ui/public/filter_manager/filter_manager.js b/src/ui/public/filter_manager/filter_manager.js
index 6d8486f39dbcd..369e707e286f8 100644
--- a/src/ui/public/filter_manager/filter_manager.js
+++ b/src/ui/public/filter_manager/filter_manager.js
@@ -2,21 +2,21 @@ import _ from 'lodash';
 import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
 // Adds a filter to a passed state
 export default function (Private) {
-  let queryFilter = Private(FilterBarQueryFilterProvider);
-  let filterManager = {};
+  const queryFilter = Private(FilterBarQueryFilterProvider);
+  const filterManager = {};
 
   filterManager.add = function (field, values, operation, index) {
     values = _.isArray(values) ? values : [values];
-    let fieldName = _.isObject(field) ? field.name : field;
-    let filters = _.flatten([queryFilter.getAppFilters()]);
-    let newFilters = [];
+    const fieldName = _.isObject(field) ? field.name : field;
+    const filters = _.flatten([queryFilter.getAppFilters()]);
+    const newFilters = [];
 
-    let negate = (operation === '-');
+    const negate = (operation === '-');
 
     // TODO: On array fields, negating does not negate the combination, rather all terms
     _.each(values, function (value) {
       let filter;
-      let existing = _.find(filters, function (filter) {
+      const existing = _.find(filters, function (filter) {
         if (!filter) return;
 
         if (fieldName === '_exists_' && filter.exists) {
@@ -83,5 +83,5 @@ export default function (Private) {
   };
 
   return filterManager;
-};
+}
 
diff --git a/src/ui/public/filter_manager/lib/__tests__/phrase.js b/src/ui/public/filter_manager/lib/__tests__/phrase.js
index c21b4768715a0..0b83c1fa4d06f 100644
--- a/src/ui/public/filter_manager/lib/__tests__/phrase.js
+++ b/src/ui/public/filter_manager/lib/__tests__/phrase.js
@@ -9,7 +9,7 @@ let expected;
 describe('Filter Manager', function () {
   describe('Phrase filter builder', function () {
     beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
+    beforeEach(ngMock.inject(function (Private) {
       indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
       expected = _.cloneDeep(require('fixtures/filter_skeleton'));
     }));
diff --git a/src/ui/public/filter_manager/lib/__tests__/query.js b/src/ui/public/filter_manager/lib/__tests__/query.js
index 703514a4fa8ac..8c8a215e03c34 100644
--- a/src/ui/public/filter_manager/lib/__tests__/query.js
+++ b/src/ui/public/filter_manager/lib/__tests__/query.js
@@ -9,7 +9,7 @@ let expected;
 describe('Filter Manager', function () {
   describe('Phrase filter builder', function () {
     beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
+    beforeEach(ngMock.inject(function (Private) {
       indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
       expected = _.cloneDeep(require('fixtures/filter_skeleton'));
     }));
@@ -22,7 +22,7 @@ describe('Filter Manager', function () {
       expected.query = {
         foo: 'bar'
       };
-      expect(fn({foo: 'bar'}, indexPattern.id)).to.eql(expected);
+      expect(fn({ foo: 'bar' }, indexPattern.id)).to.eql(expected);
     });
 
   });
diff --git a/src/ui/public/filter_manager/lib/__tests__/range.js b/src/ui/public/filter_manager/lib/__tests__/range.js
index 94bee0426f4b6..0e85d37d50b8f 100644
--- a/src/ui/public/filter_manager/lib/__tests__/range.js
+++ b/src/ui/public/filter_manager/lib/__tests__/range.js
@@ -9,7 +9,7 @@ let expected;
 describe('Filter Manager', function () {
   describe('Range filter builder', function () {
     beforeEach(ngMock.module('kibana'));
-    beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
+    beforeEach(ngMock.inject(function (Private) {
       indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
       expected = _.cloneDeep(require('fixtures/filter_skeleton'));
     }));
@@ -25,7 +25,7 @@ describe('Filter Manager', function () {
           lte: 3
         }
       };
-      expect(fn(indexPattern.fields.byName.bytes, {gte: 1, lte: 3}, indexPattern)).to.eql(expected);
+      expect(fn(indexPattern.fields.byName.bytes, { gte: 1, lte: 3 }, indexPattern)).to.eql(expected);
     });
 
     it('should return a script filter when passed a scripted field', function () {
@@ -40,23 +40,23 @@ describe('Filter Manager', function () {
           lte: 3
         }
       });
-      expect(fn(indexPattern.fields.byName['script number'], {gte: 1, lte: 3}, indexPattern)).to.eql(expected);
+      expect(fn(indexPattern.fields.byName['script number'], { gte: 1, lte: 3 }, indexPattern)).to.eql(expected);
     });
 
     it('should throw an error when gte and gt, or lte and lt are both passed', function () {
       expect(function () {
-        fn(indexPattern.fields.byName['script number'], {gte: 1, gt: 3}, indexPattern);
+        fn(indexPattern.fields.byName['script number'], { gte: 1, gt: 3 }, indexPattern);
       }).to.throwError();
       expect(function () {
-        fn(indexPattern.fields.byName['script number'], {lte: 1, lt: 3}, indexPattern);
+        fn(indexPattern.fields.byName['script number'], { lte: 1, lt: 3 }, indexPattern);
       }).to.throwError();
     });
 
     it('to use the right operator for each of gte, gt, lt and lte', function () {
-      _.each({gte: '>=', gt: '>', lte: '<=', lt: '<'}, function (operator, key) {
-        let params = {};
+      _.each({ gte: '>=', gt: '>', lte: '<=', lt: '<' }, function (operator, key) {
+        const params = {};
         params[key] = 5;
-        let filter = fn(indexPattern.fields.byName['script number'], params, indexPattern);
+        const filter = fn(indexPattern.fields.byName['script number'], params, indexPattern);
 
         expect(filter.script.script.inline).to.be('(' + indexPattern.fields.byName['script number'].script + ')' + operator + key);
         expect(filter.script.script.params[key]).to.be(5);
diff --git a/src/ui/public/filter_manager/lib/phrase.js b/src/ui/public/filter_manager/lib/phrase.js
index b9e9cc92fa573..39db2c4ef514c 100644
--- a/src/ui/public/filter_manager/lib/phrase.js
+++ b/src/ui/public/filter_manager/lib/phrase.js
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 export default function buildPhraseFilter(field, value, indexPattern) {
-  let filter = { meta: { index: indexPattern.id} };
+  const filter = { meta: { index: indexPattern.id } };
 
   if (field.scripted) {
     // painless expects params.value while groovy and expression languages expect value.
@@ -33,4 +33,4 @@ export default function buildPhraseFilter(field, value, indexPattern) {
     };
   }
   return filter;
-};
+}
diff --git a/src/ui/public/filter_manager/lib/query.js b/src/ui/public/filter_manager/lib/query.js
index 886bb08b925c6..e176c5a9d67fa 100644
--- a/src/ui/public/filter_manager/lib/query.js
+++ b/src/ui/public/filter_manager/lib/query.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 export default function buildQueryFilter(query, index) {
   return {
     query: query,
@@ -6,4 +5,4 @@ export default function buildQueryFilter(query, index) {
       index: index
     }
   };
-};
+}
diff --git a/src/ui/public/filter_manager/lib/range.js b/src/ui/public/filter_manager/lib/range.js
index deec58b703199..9ae8f49766831 100644
--- a/src/ui/public/filter_manager/lib/range.js
+++ b/src/ui/public/filter_manager/lib/range.js
@@ -53,4 +53,4 @@ export default function buildRangeFilter(field, params, indexPattern, formattedV
   }
 
   return filter;
-};
+}
diff --git a/src/ui/public/filters/__tests__/field_type.js b/src/ui/public/filters/__tests__/field_type.js
index 215a34be2c206..8c640ca3f3a17 100644
--- a/src/ui/public/filters/__tests__/field_type.js
+++ b/src/ui/public/filters/__tests__/field_type.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import _ from 'lodash';
 import ngMock from 'ng_mock';
@@ -9,20 +8,20 @@ let filter;
 
 let types;
 
-let init = function (expandable) {
+const init = function () {
   // Load the application
   ngMock.module('kibana');
 
   types = [
-    {name: 's1', type: 'string'},
-    {name: 's2', type: 'string'},
-    {name: 's3', type: 'string'},
+    { name: 's1', type: 'string' },
+    { name: 's2', type: 'string' },
+    { name: 's3', type: 'string' },
 
-    {name: 'n1', type: 'number'},
-    {name: 'n2', type: 'number'},
+    { name: 'n1', type: 'number' },
+    { name: 'n2', type: 'number' },
 
-    {name: 'i1', type: 'ip'},
-    {name: 'd1', type: 'date'},
+    { name: 'i1', type: 'ip' },
+    { name: 'd1', type: 'date' },
   ];
 
   // Create the scope
@@ -59,7 +58,7 @@ describe('fieldType array filter', function () {
   });
 
   it('should allow negation', function () {
-    let resultNames = _.pluck(filter(types, '!string'), 'name');
+    const resultNames = _.pluck(filter(types, '!string'), 'name');
     expect(resultNames).to.eql(['n1', 'n2', 'i1', 'd1']);
   });
 });
diff --git a/src/ui/public/filters/__tests__/label.js b/src/ui/public/filters/__tests__/label.js
index 920f6fb90f0bd..d42dee9788021 100644
--- a/src/ui/public/filters/__tests__/label.js
+++ b/src/ui/public/filters/__tests__/label.js
@@ -1,7 +1,4 @@
-import angular from 'angular';
 import expect from 'expect.js';
-import _ from 'lodash';
-import faker from 'faker';
 import ngMock from 'ng_mock';
 import 'plugins/kibana/discover/index';
 
@@ -9,7 +6,7 @@ import 'plugins/kibana/discover/index';
 
 let filter;
 
-let init = function (expandable) {
+const init = function () {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/filters/__tests__/moment.js b/src/ui/public/filters/__tests__/moment.js
index 1d4a330251e5b..070a17cb58a54 100644
--- a/src/ui/public/filters/__tests__/moment.js
+++ b/src/ui/public/filters/__tests__/moment.js
@@ -1,6 +1,4 @@
-import angular from 'angular';
 import expect from 'expect.js';
-import sinon from 'auto-release-sinon';
 import moment from 'moment';
 import ngMock from 'ng_mock';
 import 'ui/filters/moment';
@@ -8,20 +6,13 @@ import 'ui/filters/moment';
 
 let filter;
 
-let config;
-let anchor = '2014-01-01T06:06:06.666';
-let clock;
-
-let init = function (expandable) {
+const init = function () {
   // Load the application
   ngMock.module('kibana');
 
-  clock = sinon.useFakeTimers(moment(anchor).valueOf());
-
   // Create the scope
-  ngMock.inject(function ($filter, _config_) {
+  ngMock.inject(function ($filter) {
     filter = $filter('moment');
-    config = _config_;
   });
 };
 
diff --git a/src/ui/public/filters/__tests__/rison.js b/src/ui/public/filters/__tests__/rison.js
index 2412d032da994..222f09fca88f9 100644
--- a/src/ui/public/filters/__tests__/rison.js
+++ b/src/ui/public/filters/__tests__/rison.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'plugins/kibana/discover/index';
@@ -8,7 +7,7 @@ import 'plugins/kibana/discover/index';
 let rison;
 let risonDecode;
 
-let init = function (expandable) {
+const init = function () {
   // Load the application
   ngMock.module('kibana');
 
@@ -20,13 +19,13 @@ let init = function (expandable) {
 };
 
 describe('rison filters', function () {
-  let testObj = {
+  const testObj = {
     time: {
       from: 'now-15m',
       to: 'now'
     }
   };
-  let testRison = '(time:(from:now-15m,to:now))';
+  const testRison = '(time:(from:now-15m,to:now))';
 
   beforeEach(function () {
     init();
diff --git a/src/ui/public/filters/__tests__/short_dots.js b/src/ui/public/filters/__tests__/short_dots.js
index cacfab16b8676..c73072ce1d594 100644
--- a/src/ui/public/filters/__tests__/short_dots.js
+++ b/src/ui/public/filters/__tests__/short_dots.js
@@ -1,6 +1,4 @@
-import angular from 'angular';
 import expect from 'expect.js';
-import _ from 'lodash';
 import ngMock from 'ng_mock';
 import 'plugins/kibana/discover/index';
 import 'ui/filters/short_dots';
@@ -10,7 +8,7 @@ let filter;
 
 let config;
 
-let init = function (expandable) {
+const init = function () {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/filters/__tests__/start_from.js b/src/ui/public/filters/__tests__/start_from.js
index 3f03605c27f3d..037ff883116e4 100644
--- a/src/ui/public/filters/__tests__/start_from.js
+++ b/src/ui/public/filters/__tests__/start_from.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/filters/start_from';
@@ -6,7 +5,7 @@ import 'ui/filters/start_from';
 
 let filter;
 
-let init = function (expandable) {
+const init = function () {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/filters/__tests__/uriescape.js b/src/ui/public/filters/__tests__/uriescape.js
index 8baa7469ccf5c..114afdd5edd12 100644
--- a/src/ui/public/filters/__tests__/uriescape.js
+++ b/src/ui/public/filters/__tests__/uriescape.js
@@ -1,13 +1,11 @@
-import angular from 'angular';
 import expect from 'expect.js';
-import _ from 'lodash';
 import ngMock from 'ng_mock';
 import 'plugins/kibana/discover/index';
 
 
 let filter;
 
-let init = function (expandable) {
+const init = function () {
   // Load the application
   ngMock.module('kibana');
 
diff --git a/src/ui/public/filters/_prop_filter.js b/src/ui/public/filters/_prop_filter.js
index 19d817df80662..f2893127edf9b 100644
--- a/src/ui/public/filters/_prop_filter.js
+++ b/src/ui/public/filters/_prop_filter.js
@@ -23,7 +23,7 @@ function propFilter(prop) {
     if (!_.isArray(filters)) filters = filters.split(',');
     if (_.contains(filters, '*')) return list;
 
-    let options = filters.reduce(function (options, filter) {
+    const options = filters.reduce(function (options, filter) {
       let type = 'include';
       let value = filter;
 
@@ -38,12 +38,12 @@ function propFilter(prop) {
     }, {});
 
     return list.filter(function (item) {
-      let value = item[prop];
+      const value = item[prop];
 
-      let excluded = options.exclude && _.contains(options.exclude, value);
+      const excluded = options.exclude && _.contains(options.exclude, value);
       if (excluded) return false;
 
-      let included = !options.include || _.contains(options.include, value);
+      const included = !options.include || _.contains(options.include, value);
       if (included) return true;
 
       return false;
diff --git a/src/ui/public/filters/comma_list.js b/src/ui/public/filters/comma_list.js
index febe90384585f..2b5943dae3100 100644
--- a/src/ui/public/filters/comma_list.js
+++ b/src/ui/public/filters/comma_list.js
@@ -13,12 +13,12 @@ uiModules
    * @return {String}
    */
   return function (input, inclusive) {
-    let list = _.commaSeperatedList(input);
+    const list = _.commaSeperatedList(input);
     if (list.length < 2) {
       return list.join('');
     }
 
-    let conj = inclusive ? ' and ' : ' or ';
+    const conj = inclusive ? ' and ' : ' or ';
     return list.slice(0, -1).join(', ') + conj + _.last(list);
 
   };
diff --git a/src/ui/public/filters/field_type.js b/src/ui/public/filters/field_type.js
index a39efe771a06a..8bf26934b0f41 100644
--- a/src/ui/public/filters/field_type.js
+++ b/src/ui/public/filters/field_type.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import propFilter from 'ui/filters/_prop_filter';
 import uiModules from 'ui/modules';
 // Gets all fields of a given type.
diff --git a/src/ui/public/filters/rison.js b/src/ui/public/filters/rison.js
index a41864390dc76..264fef2373a78 100644
--- a/src/ui/public/filters/rison.js
+++ b/src/ui/public/filters/rison.js
@@ -1,6 +1,6 @@
 import rison from 'rison-node';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.filter('rison', function () {
   return function (str) {
diff --git a/src/ui/public/filters/trust_as_html.js b/src/ui/public/filters/trust_as_html.js
index e622294557d33..9ad90d604fe3c 100644
--- a/src/ui/public/filters/trust_as_html.js
+++ b/src/ui/public/filters/trust_as_html.js
@@ -1,6 +1,5 @@
-import angular from 'angular';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 // Simple filter to allow using ng-bind-html without explicitly calling $sce.trustAsHtml in a controller
 // (See http://goo.gl/mpj9o2)
diff --git a/src/ui/public/filters/unique.js b/src/ui/public/filters/unique.js
index 643ae819f591d..e85087ecb1ba8 100644
--- a/src/ui/public/filters/unique.js
+++ b/src/ui/public/filters/unique.js
@@ -6,7 +6,7 @@ uiModules
   .get('kibana')
   .filter('unique', function () {
     return function (arr) {
-      let list = _.unique(arr);
+      const list = _.unique(arr);
       return list;
     };
   });
diff --git a/src/ui/public/fixed_scroll.js b/src/ui/public/fixed_scroll.js
index 786645af80ad4..5679cd1dbbf65 100644
--- a/src/ui/public/fixed_scroll.js
+++ b/src/ui/public/fixed_scroll.js
@@ -6,7 +6,7 @@ const SCROLLER_HEIGHT = 20;
 
 uiModules
 .get('kibana')
-.directive('fixedScroll', function ($timeout) {
+.directive('fixedScroll', function () {
   return {
     restrict: 'A',
     link: function ($scope, $el) {
diff --git a/src/ui/public/highlight/__tests__/highlight.js b/src/ui/public/highlight/__tests__/highlight.js
index 050cd99d92c27..70a403c169e92 100644
--- a/src/ui/public/highlight/__tests__/highlight.js
+++ b/src/ui/public/highlight/__tests__/highlight.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/highlight';
@@ -15,7 +14,7 @@ describe('Highlight', function () {
     tags = highlightTags;
   }));
 
-  let text = '' +
+  const text = '' +
     'Bacon ipsum dolor amet pork loin pork cow pig beef chuck ground round shankle sirloin landjaeger kevin ' +
     'venison sausage ribeye tongue. Chicken bacon ball tip pork. Brisket pork capicola spare ribs pastrami rump ' +
     'sirloin, t-bone ham shoulder jerky turducken bresaola. Chicken cow beef picanha. Picanha hamburger alcatra ' +
@@ -28,27 +27,27 @@ describe('Highlight', function () {
   });
 
   it('should highlight a single result', function () {
-    let highlights = [
+    const highlights = [
       tags.pre + 'hamburger' + tags.post + ' alcatra cupim. Salami capicola boudin pork belly shank picanha.'
     ];
-    let result = filter(text, highlights);
+    const result = filter(text, highlights);
     expect(result.indexOf('<mark>hamburger</mark>')).to.be.greaterThan(-1);
     expect(result.split('<mark>hamburger</mark>').length).to.be(text.split('hamburger').length);
   });
 
   it('should highlight multiple results', function () {
-    let highlights = [
+    const highlights = [
       'kevin venison sausage ribeye tongue. ' + tags.pre + 'Chicken' + tags.post + ' bacon ball tip pork. Brisket ' +
       'pork capicola spare ribs pastrami rump sirloin, t-bone ham shoulder jerky turducken bresaola. ' + tags.pre +
       'Chicken' + tags.post + ' cow beef picanha. Picanha'
     ];
-    let result = filter(text, highlights);
+    const result = filter(text, highlights);
     expect(result.indexOf('<mark>Chicken</mark>')).to.be.greaterThan(-1);
     expect(result.split('<mark>Chicken</mark>').length).to.be(text.split('Chicken').length);
   });
 
   it('should highlight multiple hits in a result', function () {
-    let highlights = [
+    const highlights = [
       'Bacon ipsum dolor amet ' + tags.pre + 'pork' + tags.post + ' loin ' +
         '' + tags.pre + 'pork' + tags.post + ' cow pig beef chuck ground round shankle ' +
         'sirloin landjaeger',
@@ -58,14 +57,14 @@ describe('Highlight', function () {
       'hamburger alcatra cupim. Salami capicola boudin ' + tags.pre + 'pork' + tags.post + ' ' +
         'belly shank picanha.'
     ];
-    let result = filter(text, highlights);
+    const result = filter(text, highlights);
     expect(result.indexOf('<mark>pork</mark>')).to.be.greaterThan(-1);
     expect(result.split('<mark>pork</mark>').length).to.be(text.split('pork').length);
   });
 
   it('should accept an object and return a string containing its properties', function () {
-    let obj = {foo: 1, bar: 2};
-    let result = filter(obj, null);
+    const obj = { foo: 1, bar: 2 };
+    const result = filter(obj, null);
     expect(result.indexOf('' + obj)).to.be(-1);
     expect(result.indexOf('foo')).to.be.greaterThan(-1);
     expect(result.indexOf('bar')).to.be.greaterThan(-1);
diff --git a/src/ui/public/highlight/highlight.js b/src/ui/public/highlight/highlight.js
index f51a3ae2bfb52..e75d433e8a6d1 100644
--- a/src/ui/public/highlight/highlight.js
+++ b/src/ui/public/highlight/highlight.js
@@ -3,7 +3,7 @@ import _ from 'lodash';
 import angular from 'angular';
 import uiModules from 'ui/modules';
 
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.filter('highlight', function (highlightTags) {
   return function (formatted, highlight) {
@@ -13,12 +13,12 @@ module.filter('highlight', function (highlightTags) {
       section = _.escape(section);
 
       // Strip out the highlight tags to compare against the formatted string
-      let untagged = section
+      const untagged = section
         .split(highlightTags.pre).join('')
         .split(highlightTags.post).join('');
 
       // Replace all highlight tags with proper html tags
-      let tagged = section
+      const tagged = section
         .split(highlightTags.pre).join('<mark>')
         .split(highlightTags.post).join('</mark>');
 
diff --git a/src/ui/public/highlight/highlight_tags.js b/src/ui/public/highlight/highlight_tags.js
index 350357ec35b59..19e8a26c43a12 100644
--- a/src/ui/public/highlight/highlight_tags.js
+++ b/src/ui/public/highlight/highlight_tags.js
@@ -1,5 +1,5 @@
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 // By default, ElasticSearch surrounds matched values in <em></em>. This is not ideal because it is possible that
 // the value could contain <em></em> in the value. We define these custom tags that we would never expect to see
diff --git a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js
index 60a4b93ba6d77..99c7d63b44f94 100644
--- a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js
+++ b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js
@@ -3,11 +3,9 @@ import ngMock from 'ng_mock';
 import expect from 'expect.js';
 import IndexPatternsCastMappingTypeProvider from 'ui/index_patterns/_cast_mapping_type';
 describe('type normalizer (castMappingType)', function () {
-
   let fn;
-  let fields;
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private, $injector) {
+  beforeEach(ngMock.inject(function (Private) {
     fn = Private(IndexPatternsCastMappingTypeProvider);
   }));
 
@@ -20,7 +18,7 @@ describe('type normalizer (castMappingType)', function () {
   });
 
   it('should cast numeric types to "number"', function () {
-    let types = [
+    const types = [
       'float',
       'double',
       'integer',
@@ -36,7 +34,7 @@ describe('type normalizer (castMappingType)', function () {
   });
 
   it('should treat non-numeric known types as what they are', function () {
-    let types = [
+    const types = [
       'date',
       'boolean',
       'ip',
@@ -53,7 +51,7 @@ describe('type normalizer (castMappingType)', function () {
   });
 
   it('should cast text and keyword types to "string"', function () {
-    let types = [
+    const types = [
       'keyword',
       'text'
     ];
@@ -66,5 +64,4 @@ describe('type normalizer (castMappingType)', function () {
   it('should treat everything else as a string', function () {
     expect(fn('fooTypeIsNotReal')).to.be('string');
   });
-
 });
diff --git a/src/ui/public/index_patterns/__tests__/_field_format.js b/src/ui/public/index_patterns/__tests__/_field_format.js
index fd8eb22e9dd97..ca8fb8d90fcdf 100644
--- a/src/ui/public/index_patterns/__tests__/_field_format.js
+++ b/src/ui/public/index_patterns/__tests__/_field_format.js
@@ -24,14 +24,14 @@ describe('FieldFormat class', function () {
 
   describe('params', function () {
     it('accepts its params via the constructor', function () {
-      let f = new TestFormat({ foo: 'bar' });
+      const f = new TestFormat({ foo: 'bar' });
       expect(f.param('foo')).to.be('bar');
     });
 
     it('allows reading a clone of the params', function () {
-      let params = { foo: 'bar' };
-      let f = new TestFormat(params);
-      let output = f.params();
+      const params = { foo: 'bar' };
+      const f = new TestFormat(params);
+      const output = f.params();
       expect(output).to.eql(params);
       expect(output).to.not.be(params);
     });
@@ -39,29 +39,29 @@ describe('FieldFormat class', function () {
 
   describe('type', function () {
     it('links the constructor class to instances as the `type`', function () {
-      let f = new TestFormat();
+      const f = new TestFormat();
       expect(f.type).to.be(TestFormat);
     });
   });
 
   describe('toJSON', function () {
     it('serializes to a version a basic id and param pair', function () {
-      let f = new TestFormat({ foo: 'bar' });
-      let ser = JSON.parse(JSON.stringify(f));
+      const f = new TestFormat({ foo: 'bar' });
+      const ser = JSON.parse(JSON.stringify(f));
       expect(ser).to.eql({ id: 'test-format', params: { foo: 'bar' } });
     });
 
     it('removes param values that match the defaults', function () {
       TestFormat.paramDefaults = { foo: 'bar' };
 
-      let f = new TestFormat({ foo: 'bar', baz: 'bar' });
-      let ser = JSON.parse(JSON.stringify(f));
+      const f = new TestFormat({ foo: 'bar', baz: 'bar' });
+      const ser = JSON.parse(JSON.stringify(f));
       expect(ser.params).to.eql({ baz: 'bar' });
     });
 
     it('removes the params entirely if they are empty', function () {
-      let f = new TestFormat();
-      let ser = JSON.parse(JSON.stringify(f));
+      const f = new TestFormat();
+      const ser = JSON.parse(JSON.stringify(f));
       expect(ser).to.not.have.property('params');
     });
   });
@@ -69,7 +69,7 @@ describe('FieldFormat class', function () {
   describe('converters', function () {
     describe('#getConverterFor', function () {
       it('returns a converter for a specific content type', function () {
-        let f = new TestFormat();
+        const f = new TestFormat();
         expect(f.getConverterFor('html')()).to.be.a('string');
         expect(f.getConverterFor('text')()).to.be.a('string');
       });
@@ -81,9 +81,9 @@ describe('FieldFormat class', function () {
           return 'formatted';
         };
 
-        let f = new TestFormat();
-        let text = f.getConverterFor('text');
-        let html = f.getConverterFor('html');
+        const f = new TestFormat();
+        const text = f.getConverterFor('text');
+        const html = f.getConverterFor('html');
         expect(text).to.not.be(html);
         expect(text('formatted')).to.be('formatted');
         expect(html('formatted')).to.be('formatted');
@@ -95,9 +95,9 @@ describe('FieldFormat class', function () {
           html: _.constant('formatted html'),
         };
 
-        let f = new TestFormat();
-        let text = f.getConverterFor('text');
-        let html = f.getConverterFor('html');
+        const f = new TestFormat();
+        const text = f.getConverterFor('text');
+        const html = f.getConverterFor('html');
         expect(text).to.not.be(html);
         expect(text('formatted text')).to.be('formatted text');
         expect(html('formatted html')).to.be('formatted html');
@@ -105,13 +105,13 @@ describe('FieldFormat class', function () {
 
       it('does not escape the output of the text converter', function () {
         TestFormat.prototype._convert = _.constant('<script>alert("xxs");</script>');
-        let f = new TestFormat();
+        const f = new TestFormat();
         expect(f.convert('', 'text')).to.contain('<');
       });
 
       it('does escape the output of the text converter if used in an html context', function () {
         TestFormat.prototype._convert = _.constant('<script>alert("xxs");</script>');
-        let f = new TestFormat();
+        const f = new TestFormat();
         expect(f.convert('', 'html')).to.not.contain('<');
       });
 
@@ -121,7 +121,7 @@ describe('FieldFormat class', function () {
           html: _.constant('<img>'),
         };
 
-        let f = new TestFormat();
+        const f = new TestFormat();
         expect(f.convert('', 'text')).to.be('<img>');
         expect(f.convert('', 'html')).to.be('<img>');
       });
@@ -134,7 +134,7 @@ describe('FieldFormat class', function () {
           html: _.constant('html'),
         };
 
-        let f = new TestFormat();
+        const f = new TestFormat();
         expect(f.convert('val')).to.be('text');
       });
 
@@ -144,12 +144,12 @@ describe('FieldFormat class', function () {
           html: _.constant('html'),
         };
 
-        let f = new TestFormat();
+        const f = new TestFormat();
         expect(f.convert('val', 'html')).to.be('html');
       });
 
       it('formats a value as " - " when no value is specified', function () {
-        let f = new TestFormat();
+        const f = new TestFormat();
         expect(f.convert()).to.be(' - ');
       });
     });
diff --git a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js
index 7f38326d9117c..d4fae2bb1b65b 100644
--- a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js
+++ b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
@@ -10,7 +9,7 @@ describe('get computed fields', function () {
 
   let fn;
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private, $injector) {
+  beforeEach(ngMock.inject(function (Private) {
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
     getComputedFields = require('ui/index_patterns/_get_computed_fields');
     indexPattern.getComputedFields = getComputedFields.bind(indexPattern);
diff --git a/src/ui/public/index_patterns/__tests__/_index_pattern.js b/src/ui/public/index_patterns/__tests__/_index_pattern.js
index 98b26aea61b06..dbe803424b0b6 100644
--- a/src/ui/public/index_patterns/__tests__/_index_pattern.js
+++ b/src/ui/public/index_patterns/__tests__/_index_pattern.js
@@ -22,18 +22,14 @@ describe('index pattern', function () {
   let mappingSetup;
   let mockLogstashFields;
   let DocSource;
-  let config;
   let docSourceResponse;
-  let indexPatternId = 'test-pattern';
+  const indexPatternId = 'test-pattern';
   let indexPattern;
   let calculateIndices;
-  let $rootScope;
   let intervals;
 
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private, $injector, _config_) {
-    $rootScope = $injector.get('$rootScope');
-    config = _config_;
+  beforeEach(ngMock.inject(function (Private) {
     mockLogstashFields = Private(FixturesLogstashFieldsProvider);
     docSourceResponse = Private(FixturesStubbedDocSourceResponseProvider);
 
@@ -155,11 +151,9 @@ describe('index pattern', function () {
     // override the default indexPattern, with a truncated field list
     const indexPatternId = 'test-pattern';
     let indexPattern;
-    let fieldLength;
     let customFields;
 
     beforeEach(function () {
-      fieldLength = mockLogstashFields.length;
       customFields = [{
         analyzed: true,
         count: 30,
@@ -225,7 +219,7 @@ describe('index pattern', function () {
         // called to append scripted fields to the response from mapper.getFieldsForIndexPattern
         expect(scriptedFieldsSpy.callCount).to.equal(1);
 
-        const expected = _.filter(indexPattern.fields, {scripted: true});
+        const expected = _.filter(indexPattern.fields, { scripted: true });
         expect(_.pluck(expected, 'name')).to.eql(['script number']);
       });
     });
@@ -301,7 +295,7 @@ describe('index pattern', function () {
     });
 
     it('should decrement the poplarity count', function () {
-      indexPattern.fields.forEach(function (field, i) {
+      indexPattern.fields.forEach(function (field) {
         const oldCount = field.count;
         const incrementAmount = 4;
         const decrementAmount = -2;
@@ -471,7 +465,7 @@ describe('index pattern', function () {
       });
 
       it('is fulfilled by id', async function () {
-        let indexList = await indexPattern.toIndexList();
+        const indexList = await indexPattern.toIndexList();
         expect(indexList).to.equal(indexPattern.id);
       });
     });
diff --git a/src/ui/public/index_patterns/__tests__/_map_field.js b/src/ui/public/index_patterns/__tests__/_map_field.js
index 3384e9c530a7c..4832d85a354d6 100644
--- a/src/ui/public/index_patterns/__tests__/_map_field.js
+++ b/src/ui/public/index_patterns/__tests__/_map_field.js
@@ -18,25 +18,25 @@ describe('field mapping normalizer (mapField)', function () {
   });
 
   it('should return a modified copy of the object, not modify the original', function () {
-    let pristine = _.cloneDeep(fields['foo.bar']);
-    let mapped = fn(fields['foo.bar'], 'foo.bar');
+    const pristine = _.cloneDeep(fields['foo.bar']);
+    const mapped = fn(fields['foo.bar'], 'foo.bar');
 
     expect(fields['foo.bar']).to.not.eql(mapped);
     expect(fields['foo.bar']).to.eql(pristine);
   });
 
   it('should not consider _id indexed unless it is', function () {
-    let mapped = fn(fields._id, '_id');
+    const mapped = fn(fields._id, '_id');
     expect(mapped.indexed).to.be(false);
 
-    let mapping = _.cloneDeep(fields._id);
+    const mapping = _.cloneDeep(fields._id);
     mapping.mapping._id.index = 'not_analyzed';
-    let mapped2 = fn(mapping, '_id');
+    const mapped2 = fn(mapping, '_id');
     expect(mapped2.indexed).to.be(true);
   });
 
   it('should always consider _timestamp to be an indexed date', function () {
-    let mapped = fn(fields._timestamp, '_timestamp');
+    const mapped = fn(fields._timestamp, '_timestamp');
     expect(mapped.indexed).to.be(true);
     expect(mapped.type).to.be('date');
   });
@@ -51,7 +51,7 @@ describe('field mapping normalizer (mapField)', function () {
   });
 
   it('should treat other values for index as true', function () {
-    let mapped = fn(fields.not_analyzed_field, 'not_analyzed_field');
+    const mapped = fn(fields.not_analyzed_field, 'not_analyzed_field');
     expect(mapped.indexed).to.be(true);
   });
 
diff --git a/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js b/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js
index e2313bce95759..39f688a74fa7a 100644
--- a/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js
+++ b/src/ui/public/index_patterns/__tests__/_pattern_to_wildcard.js
@@ -1,7 +1,7 @@
 import expect from 'expect.js';
 describe('Index pattern to wildcard', function () {
 
-  let fn = require('ui/index_patterns/_pattern_to_wildcard')();
+  const fn = require('ui/index_patterns/_pattern_to_wildcard')();
 
 
   it('should be a function', function () {
diff --git a/src/ui/public/index_patterns/__tests__/calculate_indices.js b/src/ui/public/index_patterns/__tests__/calculate_indices.js
index aefd7f458faa8..3465f24918cd6 100644
--- a/src/ui/public/index_patterns/__tests__/calculate_indices.js
+++ b/src/ui/public/index_patterns/__tests__/calculate_indices.js
@@ -6,8 +6,6 @@ import ngMock from 'ng_mock';
 import moment from 'moment';
 import IndexPatternsCalculateIndicesProvider from 'ui/index_patterns/_calculate_indices';
 describe('ui/index_patterns/_calculate_indices', () => {
-
-  let Promise;
   let $rootScope;
   let calculateIndices;
   let es;
@@ -36,7 +34,6 @@ describe('ui/index_patterns/_calculate_indices', () => {
   beforeEach(ngMock.inject((Private, $injector) => {
     $rootScope = $injector.get('$rootScope');
     es = $injector.get('es');
-    Promise = $injector.get('Promise');
     calculateIndices = Private(IndexPatternsCalculateIndicesProvider);
   }));
 
diff --git a/src/ui/public/index_patterns/__tests__/flatten_hit.js b/src/ui/public/index_patterns/__tests__/flatten_hit.js
index 632e959b263cc..dd32e243e0108 100644
--- a/src/ui/public/index_patterns/__tests__/flatten_hit.js
+++ b/src/ui/public/index_patterns/__tests__/flatten_hit.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import IndexPatternsFlattenHitProvider from 'ui/index_patterns/_flatten_hit';
@@ -13,7 +12,7 @@ describe('IndexPattern#flattenHit()', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private, $injector) {
-    let indexPattern = {
+    const indexPattern = {
       fields: {
         byName: {
           'message': { type: 'string' },
diff --git a/src/ui/public/index_patterns/__tests__/intervals.js b/src/ui/public/index_patterns/__tests__/intervals.js
index ff486c86a68c4..0e73dbad13a01 100644
--- a/src/ui/public/index_patterns/__tests__/intervals.js
+++ b/src/ui/public/index_patterns/__tests__/intervals.js
@@ -1,5 +1,4 @@
 import moment from 'moment';
-import { pluck } from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import IndexPatternsIntervalsProvider from 'ui/index_patterns/_intervals';
@@ -14,10 +13,10 @@ describe('Index Patterns', function () {
     }));
 
     it('should return correct indices for hourly [logstash-]YYYY.MM.DD.HH', function () {
-      let start = moment.utc('2014-01-01T07:00:00Z');
-      let end = moment.utc('2014-01-01T08:30:00Z');
-      let interval = { name: 'hours', startOf: 'hour', display: 'Hourly' };
-      let list = intervals.toIndexList('[logstash-]YYYY.MM.DD.HH', interval, start, end);
+      const start = moment.utc('2014-01-01T07:00:00Z');
+      const end = moment.utc('2014-01-01T08:30:00Z');
+      const interval = { name: 'hours', startOf: 'hour', display: 'Hourly' };
+      const list = intervals.toIndexList('[logstash-]YYYY.MM.DD.HH', interval, start, end);
       expect(list).to.eql([
         {
           index: 'logstash-2014.01.01.07',
@@ -33,10 +32,10 @@ describe('Index Patterns', function () {
     });
 
     it('should return correct indices for daily [logstash-]YYYY.MM.DD', function () {
-      let start = moment(1418244231248);
-      let end = moment(1418849261281);
-      let interval = { name: 'days', startOf: 'day', display: 'Daily' };
-      let list = intervals.toIndexList('[logstash-]YYYY.MM.DD', interval, start, end);
+      const start = moment(1418244231248);
+      const end = moment(1418849261281);
+      const interval = { name: 'days', startOf: 'day', display: 'Daily' };
+      const list = intervals.toIndexList('[logstash-]YYYY.MM.DD', interval, start, end);
       expect(list).to.eql([
         {
           index: 'logstash-2014.12.10',
@@ -82,10 +81,10 @@ describe('Index Patterns', function () {
     });
 
     it('should return correct indices for monthly [logstash-]YYYY.MM', function () {
-      let start = moment.utc('2014-12-01');
-      let end = moment.utc('2015-02-01');
-      let interval = { name: 'months', startOf: 'month', display: 'Monthly' };
-      let list = intervals.toIndexList('[logstash-]YYYY.MM', interval, start, end);
+      const start = moment.utc('2014-12-01');
+      const end = moment.utc('2015-02-01');
+      const interval = { name: 'months', startOf: 'month', display: 'Monthly' };
+      const list = intervals.toIndexList('[logstash-]YYYY.MM', interval, start, end);
       expect(list).to.eql([
         {
           index: 'logstash-2014.12',
@@ -106,10 +105,10 @@ describe('Index Patterns', function () {
     });
 
     it('should return correct indices for yearly [logstash-]YYYY', function () {
-      let start = moment.utc('2014-12-01');
-      let end = moment.utc('2015-02-01');
-      let interval = { name: 'years', startOf: 'year', display: 'Yearly' };
-      let list = intervals.toIndexList('[logstash-]YYYY', interval, start, end);
+      const start = moment.utc('2014-12-01');
+      const end = moment.utc('2015-02-01');
+      const interval = { name: 'years', startOf: 'year', display: 'Yearly' };
+      const list = intervals.toIndexList('[logstash-]YYYY', interval, start, end);
       expect(list).to.eql([
         {
           index: 'logstash-2014',
@@ -126,10 +125,10 @@ describe('Index Patterns', function () {
 
     context('with sortDirection=asc', function () {
       it('returns values in ascending order', function () {
-        let start = moment.utc('2014-12-01');
-        let end = moment.utc('2015-02-01');
-        let interval = { name: 'years', startOf: 'year', display: 'Yearly' };
-        let list = intervals.toIndexList('[logstash-]YYYY', interval, start, end, 'asc');
+        const start = moment.utc('2014-12-01');
+        const end = moment.utc('2015-02-01');
+        const interval = { name: 'years', startOf: 'year', display: 'Yearly' };
+        const list = intervals.toIndexList('[logstash-]YYYY', interval, start, end, 'asc');
         expect(list).to.eql([
           {
             index: 'logstash-2014',
@@ -147,10 +146,10 @@ describe('Index Patterns', function () {
 
     context('with sortDirection=desc', function () {
       it('returns values in descending order', function () {
-        let start = moment.utc('2014-12-01');
-        let end = moment.utc('2015-02-01');
-        let interval = { name: 'years', startOf: 'year', display: 'Yearly' };
-        let list = intervals.toIndexList('[logstash-]YYYY', interval, start, end, 'desc');
+        const start = moment.utc('2014-12-01');
+        const end = moment.utc('2015-02-01');
+        const interval = { name: 'years', startOf: 'year', display: 'Yearly' };
+        const list = intervals.toIndexList('[logstash-]YYYY', interval, start, end, 'desc');
         expect(list).to.eql([
           {
             index: 'logstash-2015',
diff --git a/src/ui/public/index_patterns/_calculate_indices.js b/src/ui/public/index_patterns/_calculate_indices.js
index 16659646a9a00..60778ce4f3d79 100644
--- a/src/ui/public/index_patterns/_calculate_indices.js
+++ b/src/ui/public/index_patterns/_calculate_indices.js
@@ -32,7 +32,7 @@ export default function CalculateIndicesFactory(Promise, es) {
     return getFieldStats(pattern, timeFieldName, start, stop)
     .then(resp => omitIndicesWithoutTimeField(resp.indices, timeFieldName))
     .then(indices => sortIndexStats(indices, timeFieldName, sortDirection));
-  };
+  }
 
   // creates the configuration hash that must be passed to the elasticsearch
   // client
@@ -78,4 +78,4 @@ export default function CalculateIndicesFactory(Promise, es) {
   }
 
   return calculateIndices;
-};
+}
diff --git a/src/ui/public/index_patterns/_cast_mapping_type.js b/src/ui/public/index_patterns/_cast_mapping_type.js
index bfeab98c2a171..ffe53f258915a 100644
--- a/src/ui/public/index_patterns/_cast_mapping_type.js
+++ b/src/ui/public/index_patterns/_cast_mapping_type.js
@@ -36,9 +36,9 @@ export default function CastMappingTypeFn() {
   function castMappingType(name) {
     if (!name) return 'unknown';
 
-    let match = castMappingType.types.byName[name];
+    const match = castMappingType.types.byName[name];
     return match ? match.type : 'string';
   }
 
   return castMappingType;
-};
+}
diff --git a/src/ui/public/index_patterns/_conflict_tracker.js b/src/ui/public/index_patterns/_conflict_tracker.js
index 358559493c92a..096e550be89d6 100644
--- a/src/ui/public/index_patterns/_conflict_tracker.js
+++ b/src/ui/public/index_patterns/_conflict_tracker.js
@@ -26,4 +26,4 @@ export class ConflictTracker {
       return indices;
     });
   }
-};
+}
diff --git a/src/ui/public/index_patterns/_ensure_some.js b/src/ui/public/index_patterns/_ensure_some.js
index 640046b108fcd..c867224c128aa 100644
--- a/src/ui/public/index_patterns/_ensure_some.js
+++ b/src/ui/public/index_patterns/_ensure_some.js
@@ -1,7 +1,4 @@
-import errors from 'ui/errors';
 export default function EnsureSomeIndexPatternsFn(Private, Notifier, $location, kbnUrl) {
-  let notify = new Notifier();
-
   return function ensureSomeIndexPatterns() {
     return function promiseHandler(patterns) {
       if (!patterns || patterns.length === 0) {
@@ -12,4 +9,4 @@ export default function EnsureSomeIndexPatternsFn(Private, Notifier, $location,
       return patterns;
     };
   };
-};
+}
diff --git a/src/ui/public/index_patterns/_field.js b/src/ui/public/index_patterns/_field.js
index 875463bdaeb56..ff983d56de68d 100644
--- a/src/ui/public/index_patterns/_field.js
+++ b/src/ui/public/index_patterns/_field.js
@@ -3,10 +3,10 @@ import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_fiel
 import IndexPatternsFieldTypesProvider from 'ui/index_patterns/_field_types';
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 export default function FieldObjectProvider(Private, shortDotsFilter, $rootScope, Notifier) {
-  let notify = new Notifier({ location: 'IndexPattern Field' });
-  let FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
-  let fieldTypes = Private(IndexPatternsFieldTypesProvider);
-  let fieldFormats = Private(RegistryFieldFormatsProvider);
+  const notify = new Notifier({ location: 'IndexPattern Field' });
+  const FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
+  const fieldTypes = Private(IndexPatternsFieldTypesProvider);
+  const fieldFormats = Private(RegistryFieldFormatsProvider);
 
   function Field(indexPattern, spec) {
     // unwrap old instances of Field
@@ -15,7 +15,7 @@ export default function FieldObjectProvider(Private, shortDotsFilter, $rootScope
     // constuct this object using ObjDefine class, which
     // extends the Field.prototype but gets it's properties
     // defined using the logic below
-    let obj = new ObjDefine(spec, Field.prototype);
+    const obj = new ObjDefine(spec, Field.prototype);
 
     if (spec.name === '_source') {
       spec.type = '_source';
@@ -38,13 +38,13 @@ export default function FieldObjectProvider(Private, shortDotsFilter, $rootScope
       format = indexPattern.fieldFormatMap[spec.name] || fieldFormats.getDefaultInstance(spec.type);
     }
 
-    let indexed = !!spec.indexed;
-    let scripted = !!spec.scripted;
-    let sortable = spec.name === '_score' || ((indexed || scripted) && type.sortable);
-    let filterable = spec.name === '_id' || scripted || (indexed && type.filterable);
-    let searchable = !!spec.searchable || scripted;
-    let aggregatable = !!spec.aggregatable || scripted;
-    let visualizable = aggregatable;
+    const indexed = !!spec.indexed;
+    const scripted = !!spec.scripted;
+    const sortable = spec.name === '_score' || ((indexed || scripted) && type.sortable);
+    const filterable = spec.name === '_id' || scripted || (indexed && type.filterable);
+    const searchable = !!spec.searchable || scripted;
+    const aggregatable = !!spec.aggregatable || scripted;
+    const visualizable = aggregatable;
 
     obj.fact('name');
     obj.fact('type');
@@ -86,4 +86,4 @@ export default function FieldObjectProvider(Private, shortDotsFilter, $rootScope
   };
 
   return Field;
-};
+}
diff --git a/src/ui/public/index_patterns/_field_format/content_types.js b/src/ui/public/index_patterns/_field_format/content_types.js
index ed82f0210c1f0..35ec77160a780 100644
--- a/src/ui/public/index_patterns/_field_format/content_types.js
+++ b/src/ui/public/index_patterns/_field_format/content_types.js
@@ -3,7 +3,7 @@ import angular from 'angular';
 import 'ui/highlight';
 export default function contentTypesProvider(highlightFilter) {
 
-  let types = {
+  const types = {
     html: function (format, convert) {
       return function recurse(value, field, hit) {
         if (value == null) {
@@ -14,10 +14,10 @@ export default function contentTypesProvider(highlightFilter) {
           return convert.call(format, value, field, hit);
         }
 
-        let subVals = value.map(function (v) {
+        const subVals = value.map(function (v) {
           return recurse(v, field, hit);
         });
-        let useMultiLine = subVals.some(function (sub) {
+        const useMultiLine = subVals.some(function (sub) {
           return sub.indexOf('\n') > -1;
         });
 
@@ -42,7 +42,7 @@ export default function contentTypesProvider(highlightFilter) {
   }
 
   function fallbackHtml(value, field, hit) {
-    let formatted = _.escape(this.convert(value, 'text'));
+    const formatted = _.escape(this.convert(value, 'text'));
 
     if (!hit || !hit.highlight || !hit.highlight[field.name]) {
       return formatted;
@@ -52,8 +52,8 @@ export default function contentTypesProvider(highlightFilter) {
   }
 
   function setup(format) {
-    let src = format._convert || {};
-    let converters = format._convert = {};
+    const src = format._convert || {};
+    const converters = format._convert = {};
 
     converters.text = types.text(format, src.text || fallbackText);
     converters.html = types.html(format, src.html || fallbackHtml);
@@ -65,4 +65,4 @@ export default function contentTypesProvider(highlightFilter) {
     types: types,
     setup: setup
   };
-};
+}
diff --git a/src/ui/public/index_patterns/_field_format/field_format.js b/src/ui/public/index_patterns/_field_format/field_format.js
index 53b48c69985bd..8a6bf156e59e8 100644
--- a/src/ui/public/index_patterns/_field_format/field_format.js
+++ b/src/ui/public/index_patterns/_field_format/field_format.js
@@ -1,10 +1,10 @@
 import _ from 'lodash';
 import IndexPatternsFieldFormatContentTypesProvider from 'ui/index_patterns/_field_format/content_types';
 export default function FieldFormatClassProvider(config, $rootScope, Private) {
-  let contentTypes = Private(IndexPatternsFieldFormatContentTypesProvider);
+  const contentTypes = Private(IndexPatternsFieldFormatContentTypesProvider);
 
   function FieldFormat(params) {
-    let self = this;
+    const self = this;
 
     // give the constructor a more appropriate name
     self.type = self.constructor;
@@ -59,7 +59,7 @@ export default function FieldFormatClassProvider(config, $rootScope, Private) {
    * @return {any}
    */
   FieldFormat.prototype.param = function (name) {
-    let val = this._params[name];
+    const val = this._params[name];
     if (val || val === false || val === 0) {
       // truthy, false, or 0 are fine
       // '', NaN, null, undefined, etc are not
@@ -84,8 +84,8 @@ export default function FieldFormatClassProvider(config, $rootScope, Private) {
    * @return {object}
    */
   FieldFormat.prototype.toJSON = function () {
-    let type = this.type;
-    let defaults = this._paramDefaults;
+    const type = this.type;
+    const defaults = this._paramDefaults;
 
     let params = _.transform(this._params, function (uniqParams, val, param) {
       if (val !== defaults[param]) {
@@ -104,4 +104,4 @@ export default function FieldFormatClassProvider(config, $rootScope, Private) {
   };
 
   return FieldFormat;
-};
+}
diff --git a/src/ui/public/index_patterns/_field_list.js b/src/ui/public/index_patterns/_field_list.js
index 438159f334de6..1e1149ef8e770 100644
--- a/src/ui/public/index_patterns/_field_list.js
+++ b/src/ui/public/index_patterns/_field_list.js
@@ -2,7 +2,7 @@ import IndexedArray from 'ui/indexed_array';
 import _ from 'lodash';
 import IndexPatternsFieldProvider from 'ui/index_patterns/_field';
 export default function FieldListProvider(Private) {
-  let Field = Private(IndexPatternsFieldProvider);
+  const Field = Private(IndexPatternsFieldProvider);
 
   _.class(FieldList).inherits(IndexedArray);
   function FieldList(indexPattern, specs) {
@@ -16,4 +16,4 @@ export default function FieldListProvider(Private) {
   }
 
   return FieldList;
-};
+}
diff --git a/src/ui/public/index_patterns/_field_types.js b/src/ui/public/index_patterns/_field_types.js
index 3ff7f290e5315..8f47c05083996 100644
--- a/src/ui/public/index_patterns/_field_types.js
+++ b/src/ui/public/index_patterns/_field_types.js
@@ -20,4 +20,4 @@ export default function IndexPatternFieldTypes() {
       { name: '_source',    sortable: false,  filterable: false },
     ]
   });
-};
+}
diff --git a/src/ui/public/index_patterns/_flatten_hit.js b/src/ui/public/index_patterns/_flatten_hit.js
index 7d137cfd070e6..818eb2eb95a7c 100644
--- a/src/ui/public/index_patterns/_flatten_hit.js
+++ b/src/ui/public/index_patterns/_flatten_hit.js
@@ -9,10 +9,10 @@ export default function FlattenHitProvider(config) {
   });
 
   function flattenHit(indexPattern, hit) {
-    let flat = {};
+    const flat = {};
 
     // recursively merge _source
-    let fields = indexPattern.fields.byName;
+    const fields = indexPattern.fields.byName;
     (function flatten(obj, keyPrefix) {
       keyPrefix = keyPrefix ? keyPrefix + '.' : '';
       _.forOwn(obj, function (val, key) {
@@ -20,8 +20,8 @@ export default function FlattenHitProvider(config) {
 
         if (flat[key] !== void 0) return;
 
-        let hasValidMapping = (fields[key] && fields[key].type !== 'conflict');
-        let isValue = !_.isPlainObject(val);
+        const hasValidMapping = (fields[key] && fields[key].type !== 'conflict');
+        const isValue = !_.isPlainObject(val);
 
         if (hasValidMapping || isValue) {
           flat[key] = val;
@@ -56,5 +56,5 @@ export default function FlattenHitProvider(config) {
 
     return cachedFlatten;
   };
-};
+}
 
diff --git a/src/ui/public/index_patterns/_format_hit.js b/src/ui/public/index_patterns/_format_hit.js
index d188952f33532..010492d760eac 100644
--- a/src/ui/public/index_patterns/_format_hit.js
+++ b/src/ui/public/index_patterns/_format_hit.js
@@ -5,7 +5,7 @@ import _ from 'lodash';
 export default function (indexPattern, defaultFormat) {
 
   function convert(hit, val, fieldName) {
-    let field = indexPattern.fields.byName[fieldName];
+    const field = indexPattern.fields.byName[fieldName];
     if (!field) return defaultFormat.convert(val, 'html');
     return field.format.getConverterFor('html')(val, field, hit);
   }
@@ -15,12 +15,12 @@ export default function (indexPattern, defaultFormat) {
 
     // use and update the partial cache, but don't rewrite it. _source is stored in partials
     // but not $$_formatted
-    let partials = hit.$$_partialFormatted || (hit.$$_partialFormatted = {});
-    let cache = hit.$$_formatted = {};
+    const partials = hit.$$_partialFormatted || (hit.$$_partialFormatted = {});
+    const cache = hit.$$_formatted = {};
 
     _.forOwn(indexPattern.flattenHit(hit), function (val, fieldName) {
       // sync the formatted and partial cache
-      let formatted = partials[fieldName] == null ? convert(hit, val, fieldName) : partials[fieldName];
+      const formatted = partials[fieldName] == null ? convert(hit, val, fieldName) : partials[fieldName];
       cache[fieldName] = partials[fieldName] = formatted;
     });
 
@@ -37,10 +37,10 @@ export default function (indexPattern, defaultFormat) {
       partials = hit.$$_partialFormatted = {};
     }
 
-    let val = fieldName === '_source' ? hit._source : indexPattern.flattenHit(hit)[fieldName];
+    const val = fieldName === '_source' ? hit._source : indexPattern.flattenHit(hit)[fieldName];
     return partials[fieldName] = convert(hit, val, fieldName);
   };
 
   return formatHit;
-};
+}
 
diff --git a/src/ui/public/index_patterns/_get_computed_fields.js b/src/ui/public/index_patterns/_get_computed_fields.js
index 3038c5e55468e..988597437e236 100644
--- a/src/ui/public/index_patterns/_get_computed_fields.js
+++ b/src/ui/public/index_patterns/_get_computed_fields.js
@@ -2,8 +2,8 @@ import _ from 'lodash';
 // Takes a hit, merges it with any stored/scripted fields, and with the metaFields
 // returns a flattened version
 export default function () {
-  let self = this;
-  let scriptFields = {};
+  const self = this;
+  const scriptFields = {};
   let docvalueFields = [];
 
   docvalueFields = _.map(_.reject(self.fields.byType.date, 'scripted'), 'name');
@@ -23,4 +23,4 @@ export default function () {
     docvalueFields: docvalueFields
   };
 
-};
+}
diff --git a/src/ui/public/index_patterns/_get_ids.js b/src/ui/public/index_patterns/_get_ids.js
index b499b1dd3859d..33e69ce10ddda 100644
--- a/src/ui/public/index_patterns/_get_ids.js
+++ b/src/ui/public/index_patterns/_get_ids.js
@@ -5,7 +5,7 @@ export default function GetIndexPatternIdsFn(es, kbnIndex) {
   // didn't incorportate with the indexPattern cache to prevent id collisions.
   let cachedPromise;
 
-  let getIds = function () {
+  const getIds = function () {
     if (cachedPromise) {
       // retrun a clone of the cached response
       return cachedPromise.then(function (cachedResp) {
@@ -37,4 +37,4 @@ export default function GetIndexPatternIdsFn(es, kbnIndex) {
   };
 
   return getIds;
-};
+}
diff --git a/src/ui/public/index_patterns/_index_pattern.js b/src/ui/public/index_patterns/_index_pattern.js
index d0bb4a21cd5d6..bc724f06f5da7 100644
--- a/src/ui/public/index_patterns/_index_pattern.js
+++ b/src/ui/public/index_patterns/_index_pattern.js
@@ -383,4 +383,4 @@ export default function IndexPatternFactory(Private, Notifier, config, kbnIndex,
   }
 
   return IndexPattern;
-};
+}
diff --git a/src/ui/public/index_patterns/_intervals.js b/src/ui/public/index_patterns/_intervals.js
index 89617306db719..9a1d850ad02b8 100644
--- a/src/ui/public/index_patterns/_intervals.js
+++ b/src/ui/public/index_patterns/_intervals.js
@@ -3,7 +3,7 @@ import moment from 'moment';
 import IndexedArray from 'ui/indexed_array';
 export default function IndexNameIntervalsService(timefilter) {
 
-  let intervals = new IndexedArray({
+  const intervals = new IndexedArray({
     index: ['name'],
     initialSet: [
       {
@@ -40,10 +40,10 @@ export default function IndexNameIntervalsService(timefilter) {
     // setup the range that the list will span, return two moment objects that
     // are in proper order. a and b can be numbers to specify to go before or after now (respectively)
     // a certain number of times, based on the interval
-    let range = [[a, 'min', 'startOf'], [b, 'max', 'startOf']].map(function (v) {
+    const range = [[a, 'min', 'startOf'], [b, 'max', 'startOf']].map(function (v) {
       let val = v[0];
-      let bound = v[1];
-      let extend = v[2];
+      const bound = v[1];
+      const extend = v[2];
 
       // grab a bound from the time filter
       if (val == null) {
@@ -64,12 +64,12 @@ export default function IndexNameIntervalsService(timefilter) {
       if (!interval) throw new Error('Interval must be one of ' + _.pluck(intervals, 'name'));
     }
 
-    let indexList = [];
+    const indexList = [];
     let start = range.shift();
     // turn stop into milliseconds to that it's not constantly converted by the while condition
-    let stop = range.shift().valueOf();
+    const stop = range.shift().valueOf();
 
-    let add = sortDirection === 'desc' ? 'unshift' : 'push';
+    const add = sortDirection === 'desc' ? 'unshift' : 'push';
 
     while (start <= stop) {
       const index = start.format(format);
@@ -91,4 +91,4 @@ export default function IndexNameIntervalsService(timefilter) {
   };
 
   return intervals;
-};
+}
diff --git a/src/ui/public/index_patterns/_local_cache.js b/src/ui/public/index_patterns/_local_cache.js
index 64ec26847600a..921d6031cb4cb 100644
--- a/src/ui/public/index_patterns/_local_cache.js
+++ b/src/ui/public/index_patterns/_local_cache.js
@@ -1,20 +1,19 @@
-import _ from 'lodash';
 import angular from 'angular';
 
 export default function LocalCacheFactory() {
   function LocalCache(opts) {
     opts = opts || {};
-    let _id = opts.id || function (o) { return '' + o; };
+    const _id = opts.id || function (o) { return '' + o; };
     let _cache = {};
 
     this.get = function (obj) {
-      let id = _id(obj);
+      const id = _id(obj);
       return _cache[id] ? JSON.parse(_cache[id]) : null;
     };
 
     this.set = function (obj, val) {
-      let id = _id(obj);
-      let clean = !_cache.hasOwnProperty(id);
+      const id = _id(obj);
+      const clean = !_cache.hasOwnProperty(id);
       _cache[id] = angular.toJson(val);
       return clean;
     };
@@ -25,11 +24,11 @@ export default function LocalCacheFactory() {
         return;
       }
 
-      let id = _id(obj);
+      const id = _id(obj);
       delete _cache[id];
     };
   }
 
   return LocalCache;
-};
+}
 
diff --git a/src/ui/public/index_patterns/_map_field.js b/src/ui/public/index_patterns/_map_field.js
index b4d3a4aa42f78..7b77db62654f1 100644
--- a/src/ui/public/index_patterns/_map_field.js
+++ b/src/ui/public/index_patterns/_map_field.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import IndexPatternsCastMappingTypeProvider from 'ui/index_patterns/_cast_mapping_type';
 export default function MapFieldFn(Private, config) {
-  let castMappingType = Private(IndexPatternsCastMappingTypeProvider);
+  const castMappingType = Private(IndexPatternsCastMappingTypeProvider);
 
   /**
    * Accepts a field object and its name, and tries to give it a mapping
@@ -10,11 +10,11 @@ export default function MapFieldFn(Private, config) {
    * @return {Object} - the resulting field after overrides and tweaking
    */
   return function mapField(field, name) {
-    let keys = Object.keys(field.mapping);
+    const keys = Object.keys(field.mapping);
     if (keys.length === 0 || (name[0] === '_') && !_.contains(config.get('metaFields'), name)) return;
 
     // Override the mapping, even if elasticsearch says otherwise
-    let mappingOverrides = {
+    const mappingOverrides = {
       _source: { type: '_source' },
       _index: { type: 'string' },
       _type: { type: 'string' },
@@ -29,7 +29,7 @@ export default function MapFieldFn(Private, config) {
       }
     };
 
-    let mapping = _.cloneDeep(field.mapping[keys.shift()]);
+    const mapping = _.cloneDeep(field.mapping[keys.shift()]);
 
     if (!mapping.index || mapping.index === 'no') {
       // elasticsearch responds with false sometimes and 'no' others
@@ -48,4 +48,4 @@ export default function MapFieldFn(Private, config) {
 
     return mapping;
   };
-};
+}
diff --git a/src/ui/public/index_patterns/_mapper.js b/src/ui/public/index_patterns/_mapper.js
index b3a0d5b4584e2..68d0f940a2285 100644
--- a/src/ui/public/index_patterns/_mapper.js
+++ b/src/ui/public/index_patterns/_mapper.js
@@ -3,25 +3,22 @@ import _ from 'lodash';
 import moment from 'moment';
 import EnhanceFieldsWithCapabilitiesProvider from 'ui/index_patterns/_enhance_fields_with_capabilities';
 import IndexPatternsTransformMappingIntoFieldsProvider from 'ui/index_patterns/_transform_mapping_into_fields';
-import IndexPatternsIntervalsProvider from 'ui/index_patterns/_intervals';
 import IndexPatternsPatternToWildcardProvider from 'ui/index_patterns/_pattern_to_wildcard';
 import IndexPatternsLocalCacheProvider from 'ui/index_patterns/_local_cache';
 export default function MapperService(Private, Promise, es, config, kbnIndex) {
+  const enhanceFieldsWithCapabilities = Private(EnhanceFieldsWithCapabilitiesProvider);
+  const transformMappingIntoFields = Private(IndexPatternsTransformMappingIntoFieldsProvider);
+  const patternToWildcard = Private(IndexPatternsPatternToWildcardProvider);
 
-  let enhanceFieldsWithCapabilities = Private(EnhanceFieldsWithCapabilitiesProvider);
-  let transformMappingIntoFields = Private(IndexPatternsTransformMappingIntoFieldsProvider);
-  let intervals = Private(IndexPatternsIntervalsProvider);
-  let patternToWildcard = Private(IndexPatternsPatternToWildcardProvider);
-
-  let LocalCache = Private(IndexPatternsLocalCacheProvider);
+  const LocalCache = Private(IndexPatternsLocalCacheProvider);
 
   function Mapper() {
 
     // Save a reference to mapper
-    let self = this;
+    const self = this;
 
     // proper-ish cache, keeps a clean copy of the object, only returns copies of it's copy
-    let fieldCache = self.cache = new LocalCache();
+    const fieldCache = self.cache = new LocalCache();
 
     /**
      * Gets an object containing all fields with their mappings
@@ -31,9 +28,9 @@ export default function MapperService(Private, Promise, es, config, kbnIndex) {
      * @async
      */
     self.getFieldsForIndexPattern = function (indexPattern, skipIndexPatternCache) {
-      let id = indexPattern.id;
+      const id = indexPattern.id;
 
-      let cache = fieldCache.get(id);
+      const cache = fieldCache.get(id);
       if (cache) return Promise.resolve(cache);
 
       if (!skipIndexPatternCache) {
@@ -85,7 +82,7 @@ export default function MapperService(Private, Promise, es, config, kbnIndex) {
       })
       .then(function (resp) {
         // let all = Object.keys(resp).sort();
-        let all = _(resp)
+        const all = _(resp)
         .map(function (index, key) {
           if (index.aliases) {
             return [Object.keys(index.aliases), key];
@@ -98,8 +95,8 @@ export default function MapperService(Private, Promise, es, config, kbnIndex) {
         .uniq(true)
         .value();
 
-        let matches = all.filter(function (existingIndex) {
-          let parsed = moment(existingIndex, indexPattern.id);
+        const matches = all.filter(function (existingIndex) {
+          const parsed = moment(existingIndex, indexPattern.id);
           return existingIndex === parsed.format(indexPattern.id);
         });
 
@@ -134,4 +131,4 @@ export default function MapperService(Private, Promise, es, config, kbnIndex) {
   }
 
   return new Mapper();
-};
+}
diff --git a/src/ui/public/index_patterns/_pattern_cache.js b/src/ui/public/index_patterns/_pattern_cache.js
index e9f57f5188e0a..a2e5ead0338bf 100644
--- a/src/ui/public/index_patterns/_pattern_cache.js
+++ b/src/ui/public/index_patterns/_pattern_cache.js
@@ -1,9 +1,8 @@
-import _ from 'lodash';
 export default function PatternCache() {
 
-  let vals = {};
+  const vals = {};
 
-  let validId = function (id) {
+  const validId = function (id) {
     return typeof id !== 'object';
   };
 
@@ -19,4 +18,4 @@ export default function PatternCache() {
   this.clear = this.delete = function (id) {
     if (validId(id)) delete vals[id];
   };
-};
+}
diff --git a/src/ui/public/index_patterns/_pattern_to_wildcard.js b/src/ui/public/index_patterns/_pattern_to_wildcard.js
index 447af376c807d..81e0fa5adfa68 100644
--- a/src/ui/public/index_patterns/_pattern_to_wildcard.js
+++ b/src/ui/public/index_patterns/_pattern_to_wildcard.js
@@ -5,7 +5,7 @@ export default function PatternToWildcardFn() {
     let inPattern = false;
 
     for (let i = 0; i < format.length; i++) {
-      let ch = format.charAt(i);
+      const ch = format.charAt(i);
       switch (ch) {
         case '[':
           inPattern = false;
@@ -34,4 +34,4 @@ export default function PatternToWildcardFn() {
 
     return wildcard;
   };
-};
+}
diff --git a/src/ui/public/index_patterns/_transform_mapping_into_fields.js b/src/ui/public/index_patterns/_transform_mapping_into_fields.js
index 24184ad2a607b..48d6db416f4af 100644
--- a/src/ui/public/index_patterns/_transform_mapping_into_fields.js
+++ b/src/ui/public/index_patterns/_transform_mapping_into_fields.js
@@ -3,7 +3,7 @@ import IndexPatternsMapFieldProvider from 'ui/index_patterns/_map_field';
 import { ConflictTracker } from 'ui/index_patterns/_conflict_tracker';
 
 export default function transformMappingIntoFields(Private, kbnIndex, config) {
-  let mapField = Private(IndexPatternsMapFieldProvider);
+  const mapField = Private(IndexPatternsMapFieldProvider);
 
   /**
    * Convert the ES response into the simple map for fields to
@@ -15,17 +15,17 @@ export default function transformMappingIntoFields(Private, kbnIndex, config) {
    *                    use-cases
    */
   return function (response) {
-    let fields = {};
+    const fields = {};
     const conflictTracker = new ConflictTracker();
 
     _.each(response, function (index, indexName) {
       if (indexName === kbnIndex) return;
       _.each(index.mappings, function (mappings) {
         _.each(mappings, function (field, name) {
-          let keys = Object.keys(field.mapping);
+          const keys = Object.keys(field.mapping);
           if (keys.length === 0 || (name[0] === '_') && !_.contains(config.get('metaFields'), name)) return;
 
-          let mapping = mapField(field, name);
+          const mapping = mapField(field, name);
           // track the name, type and index for every field encountered so that the source
           // of conflicts can be described later
           conflictTracker.trackField(name, mapping.type, indexName);
@@ -46,7 +46,7 @@ export default function transformMappingIntoFields(Private, kbnIndex, config) {
     config.get('metaFields').forEach(function (meta) {
       if (fields[meta]) return;
 
-      let field = { mapping: {} };
+      const field = { mapping: {} };
       field.mapping[meta] = {};
       fields[meta] = mapField(field, meta);
     });
@@ -61,4 +61,4 @@ export default function transformMappingIntoFields(Private, kbnIndex, config) {
       return mapping;
     });
   };
-};
+}
diff --git a/src/ui/public/index_patterns/index_patterns.js b/src/ui/public/index_patterns/index_patterns.js
index 18ea1b7c95cfd..a89ad7e3ba7e4 100644
--- a/src/ui/public/index_patterns/index_patterns.js
+++ b/src/ui/public/index_patterns/index_patterns.js
@@ -1,5 +1,4 @@
 import 'ui/filters/short_dots';
-import _ from 'lodash';
 import errors from 'ui/errors';
 import IndexPatternsIndexPatternProvider from 'ui/index_patterns/_index_pattern';
 import IndexPatternsPatternCacheProvider from 'ui/index_patterns/_pattern_cache';
@@ -9,20 +8,18 @@ import IndexPatternsMapperProvider from 'ui/index_patterns/_mapper';
 import IndexPatternsPatternToWildcardProvider from 'ui/index_patterns/_pattern_to_wildcard';
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana/index_patterns');
+const module = uiModules.get('kibana/index_patterns');
 
 function IndexPatternsProvider(es, Notifier, Private, Promise, kbnIndex) {
-  let self = this;
+  const self = this;
 
-  let IndexPattern = Private(IndexPatternsIndexPatternProvider);
-  let patternCache = Private(IndexPatternsPatternCacheProvider);
-
-  let notify = new Notifier({ location: 'IndexPatterns Service'});
+  const IndexPattern = Private(IndexPatternsIndexPatternProvider);
+  const patternCache = Private(IndexPatternsPatternCacheProvider);
 
   self.get = function (id) {
     if (!id) return self.make();
 
-    let cache = patternCache.get(id);
+    const cache = patternCache.get(id);
     return cache || patternCache.set(id, self.make(id));
   };
 
diff --git a/src/ui/public/index_patterns/route_setup/load_default.js b/src/ui/public/index_patterns/route_setup/load_default.js
index 270e163c06c92..6e76fb2650be8 100644
--- a/src/ui/public/index_patterns/route_setup/load_default.js
+++ b/src/ui/public/index_patterns/route_setup/load_default.js
@@ -1,29 +1,29 @@
 import _ from 'lodash';
 import Notifier from 'ui/notify/notifier';
-import { NoDefaultIndexPattern, NoDefinedIndexPatterns } from 'ui/errors';
+import { NoDefaultIndexPattern } from 'ui/errors';
 import GetIdsProvider from '../_get_ids';
 import CourierDataSourceRootSearchSourceProvider from 'ui/courier/data_source/_root_search_source';
 import uiRoutes from 'ui/routes';
-let notify = new Notifier({
+const notify = new Notifier({
   location: 'Index Patterns'
 });
 
 module.exports = function (opts) {
   opts = opts || {};
-  let whenMissingRedirectTo = opts.whenMissingRedirectTo || null;
+  const whenMissingRedirectTo = opts.whenMissingRedirectTo || null;
   let defaultRequiredToasts = null;
 
   uiRoutes
   .addSetupWork(function loadDefaultIndexPattern(Private, Promise, $route, config, indexPatterns) {
-    let getIds = Private(GetIdsProvider);
-    let rootSearchSource = Private(CourierDataSourceRootSearchSourceProvider);
-    let route = _.get($route, 'current.$$route');
+    const getIds = Private(GetIdsProvider);
+    const rootSearchSource = Private(CourierDataSourceRootSearchSourceProvider);
+    const route = _.get($route, 'current.$$route');
 
     return getIds()
     .then(function (patterns) {
       let defaultId = config.get('defaultIndex');
       let defined = !!defaultId;
-      let exists = _.contains(patterns, defaultId);
+      const exists = _.contains(patterns, defaultId);
 
       if (defined && !exists) {
         config.remove('defaultIndex');
@@ -48,7 +48,7 @@ module.exports = function (opts) {
 
     // failure
     function (err, kbnUrl) {
-      let hasDefault = !(err instanceof NoDefaultIndexPattern);
+      const hasDefault = !(err instanceof NoDefaultIndexPattern);
       if (hasDefault || !whenMissingRedirectTo) throw err; // rethrow
 
       kbnUrl.change(whenMissingRedirectTo);
diff --git a/src/ui/public/indexed_array/__tests__/indexed_array.js b/src/ui/public/indexed_array/__tests__/indexed_array.js
index 69820fbe8bba4..e31c0b9d29fc5 100644
--- a/src/ui/public/indexed_array/__tests__/indexed_array.js
+++ b/src/ui/public/indexed_array/__tests__/indexed_array.js
@@ -4,7 +4,7 @@ import expect from 'expect.js';
 import IndexedArray from 'ui/indexed_array';
 
 // this is generally a data-structure that IndexedArray is good for managing
-let users = [
+const users = [
   { name: 'John', id: 69, username: 'beast', group: 'admins' },
   { name: 'Anon', id:  0, username: 'shhhh', group: 'secret' },
   { name: 'Fern', id: 42, username: 'kitty', group: 'editor' },
@@ -43,7 +43,7 @@ describe('IndexedArray', function () {
 
   describe('Indexing', function () {
     it('provides the initial set', function () {
-      let reg = new IndexedArray({
+      const reg = new IndexedArray({
         initialSet: [1, 2, 3]
       });
 
@@ -55,7 +55,7 @@ describe('IndexedArray', function () {
     });
 
     it('indexes the initial set', function () {
-      let reg = new IndexedArray({
+      const reg = new IndexedArray({
         index: ['username'],
         initialSet: users
       });
@@ -66,11 +66,11 @@ describe('IndexedArray', function () {
 
     it('updates indices after values are added', function () {
       // split up the user list, and add it in chunks
-      let firstUser = users.slice(0, 1).pop();
-      let otherUsers = users.slice(1);
+      const firstUser = users.slice(0, 1).pop();
+      const otherUsers = users.slice(1);
 
       // start off with all but the first
-      let reg = new IndexedArray({
+      const reg = new IndexedArray({
         group: ['group'],
         order: ['id'],
         initialSet: otherUsers
@@ -86,7 +86,7 @@ describe('IndexedArray', function () {
 
     it('updates indices after values are removed', function () {
       // start off with all
-      let reg = new IndexedArray({
+      const reg = new IndexedArray({
         group: ['group'],
         order: ['id'],
         initialSet: users
@@ -95,24 +95,24 @@ describe('IndexedArray', function () {
       // remove the last
       reg.pop();
 
-      let expectedCount = users.length - 1;
+      const expectedCount = users.length - 1;
       // indexed lists should be updated
       expect(reg).to.have.length(expectedCount);
 
-      let sumOfGroups = _.reduce(reg.byGroup, function (note, group) {
+      const sumOfGroups = _.reduce(reg.byGroup, function (note, group) {
         return note + group.length;
       }, 0);
       expect(sumOfGroups).to.eql(expectedCount);
     });
 
     it('removes items based on a predicate', function () {
-      let reg = new IndexedArray({
+      const reg = new IndexedArray({
         group: ['group'],
         order: ['id'],
         initialSet: users
       });
 
-      reg.remove({name: 'John'});
+      reg.remove({ name: 'John' });
 
       expect(_.eq(reg.raw, reg.slice(0))).to.be(true);
       expect(reg.length).to.be(3);
@@ -120,7 +120,7 @@ describe('IndexedArray', function () {
     });
 
     it('updates indices after values are re-ordered', function () {
-      let rawUsers = users.slice(0);
+      const rawUsers = users.slice(0);
 
       // collect and shuffle the ids available
       let ids = [];
@@ -128,18 +128,18 @@ describe('IndexedArray', function () {
       ids = _.shuffle(ids);
 
       // move something here
-      let toI = ids.shift();
+      const toI = ids.shift();
       // from here
-      let fromI = ids.shift();
+      const fromI = ids.shift();
       // do the move
-      let move = function (arr) { arr.splice(toI, 0, arr.splice(fromI, 1)[0]); };
+      const move = function (arr) { arr.splice(toI, 0, arr.splice(fromI, 1)[0]); };
 
-      let reg = new IndexedArray({
+      const reg = new IndexedArray({
         index: ['username'],
         initialSet: rawUsers
       });
 
-      let index = reg.byUsername;
+      const index = reg.byUsername;
 
       move(reg);
 
diff --git a/src/ui/public/indexed_array/__tests__/inflector.js b/src/ui/public/indexed_array/__tests__/inflector.js
index 3fc45e1a9f974..e7628ecf159fc 100644
--- a/src/ui/public/indexed_array/__tests__/inflector.js
+++ b/src/ui/public/indexed_array/__tests__/inflector.js
@@ -3,13 +3,13 @@ import expect from 'expect.js';
 
 describe('IndexedArray Inflector', function () {
   it('returns a function', function () {
-    let getter = inflector();
+    const getter = inflector();
     expect(getter).to.be.a('function');
   });
 
   describe('fn', function () {
     it('prepends a prefix', function () {
-      let inflect = inflector('my');
+      const inflect = inflector('my');
 
       expect(inflect('Family')).to.be('myFamily');
       expect(inflect('family')).to.be('myFamily');
@@ -17,7 +17,7 @@ describe('IndexedArray Inflector', function () {
     });
 
     it('adds both a prefix and suffix', function () {
-      let inflect = inflector('foo', 'Bar');
+      const inflect = inflector('foo', 'Bar');
 
       expect(inflect('box')).to.be('fooBoxBar');
       expect(inflect('box.car.MAX')).to.be('fooBoxCarMaxBar');
@@ -25,19 +25,19 @@ describe('IndexedArray Inflector', function () {
     });
 
     it('ignores prefix if it is already at the end of the inflected string', function () {
-      let inflect = inflector('foo', 'Bar');
+      const inflect = inflector('foo', 'Bar');
       expect(inflect('fooBox')).to.be('fooBoxBar');
       expect(inflect('FooBox')).to.be('FooBoxBar');
     });
 
     it('ignores postfix if it is already at the end of the inflected string', function () {
-      let inflect = inflector('foo', 'Bar');
+      const inflect = inflector('foo', 'Bar');
       expect(inflect('bar')).to.be('fooBar');
       expect(inflect('showBoxBar')).to.be('fooShowBoxBar');
     });
 
     it('works with "name"', function () {
-      let inflect = inflector('in', 'Order');
+      const inflect = inflector('in', 'Order');
       expect(inflect('name')).to.be('inNameOrder');
     });
   });
diff --git a/src/ui/public/indexed_array/indexed_array.js b/src/ui/public/indexed_array/indexed_array.js
index 3c7f81fcb52db..3f3325e2d3f7b 100644
--- a/src/ui/public/indexed_array/indexed_array.js
+++ b/src/ui/public/indexed_array/indexed_array.js
@@ -2,12 +2,12 @@ import _ from 'lodash';
 import inflector from 'ui/indexed_array/inflector';
 
 
-let pathGetter = _(_.get).rearg(1, 0).ary(2);
-let inflectIndex = inflector('by');
-let inflectOrder = inflector('in', 'Order');
+const pathGetter = _(_.get).rearg(1, 0).ary(2);
+const inflectIndex = inflector('by');
+const inflectOrder = inflector('in', 'Order');
 
-let CLEAR_CACHE = {};
-let OPT_NAMES = IndexedArray.OPT_NAMES = ['index', 'group', 'order', 'initialSet', 'immutable'];
+const CLEAR_CACHE = {};
+const OPT_NAMES = IndexedArray.OPT_NAMES = ['index', 'group', 'order', 'initialSet', 'immutable'];
 
 /**
  * Generic extension of Array class, which will index (and reindex) the
@@ -69,11 +69,11 @@ IndexedArray.prototype._setupIndices = function (props, inflect, op) {
   // shortcut for empty props
   if (!props || props.length === 0) return;
 
-  let self = this;
+  const self = this;
   return props.map(function (prop) {
 
-    let from = pathGetter.partial(prop).value();
-    let to = inflect(prop);
+    const from = pathGetter.partial(prop).value();
+    const to = inflect(prop);
     let cache;
 
     Object.defineProperty(self, to, {
@@ -105,7 +105,7 @@ IndexedArray.prototype._setupIndices = function (props, inflect, op) {
  * @return {undefined}
  */
 IndexedArray.prototype._clearIndices = function () {
-  let self = this;
+  const self = this;
   self._indexNames.forEach(function (name) {
     self[name] = CLEAR_CACHE;
   });
@@ -120,7 +120,7 @@ IndexedArray.prototype._clearIndices = function () {
  * @return {[type]}        [description]
  */
 'pop push shift splice unshift reverse'.split(' ').forEach(function (method) {
-  let orig = Array.prototype[method];
+  const orig = Array.prototype[method];
 
   IndexedArray.prototype[method] = function (/* args... */) {
     // call the original method with this context
@@ -141,7 +141,7 @@ IndexedArray.prototype._clearIndices = function () {
 * @return {array} - the removed data
 */
 IndexedArray.prototype.remove = function (predicate, context) {
-  let out = _.remove(this, predicate, context);
+  const out = _.remove(this, predicate, context);
   _.remove(this.raw, predicate, context);
   this._clearIndices();
   return out;
diff --git a/src/ui/public/indexed_array/inflector.js b/src/ui/public/indexed_array/inflector.js
index f879cbdf8965e..e2ef5eca31cda 100644
--- a/src/ui/public/indexed_array/inflector.js
+++ b/src/ui/public/indexed_array/inflector.js
@@ -8,7 +8,7 @@ function startsWith(str, test) {
 }
 
 function endsWith(str, test) {
-  let tooShort = str.length < test.length;
+  const tooShort = str.length < test.length;
   if (tooShort) return;
 
   return str.substr(str.length - test.length).toLowerCase() === test.toLowerCase();
diff --git a/src/ui/public/ingest/__tests__/ingest.js b/src/ui/public/ingest/__tests__/ingest.js
index 6bb5b96a316ab..6dd6970f94ef2 100644
--- a/src/ui/public/ingest/__tests__/ingest.js
+++ b/src/ui/public/ingest/__tests__/ingest.js
@@ -30,8 +30,8 @@ describe('Ingest Service', function () {
       .respond('ok');
 
       expect(config.get('defaultIndex')).to.be(null);
-      ingest.save({id: 'foo'});
-      ingest.save({id: 'bar'});
+      ingest.save({ id: 'foo' });
+      ingest.save({ id: 'bar' });
       $httpBackend.flush();
       expect(config.get('defaultIndex')).to.be('foo');
     });
@@ -41,7 +41,7 @@ describe('Ingest Service', function () {
       .expectPOST('/api/kibana/ingest')
       .respond(400);
 
-      ingest.save({id: 'foo'})
+      ingest.save({ id: 'foo' })
       .then(
         () => {
           throw new Error('expected an error response');
@@ -60,7 +60,7 @@ describe('Ingest Service', function () {
       .when('POST', '/api/kibana/ingest')
       .respond('ok');
 
-      ingest.save({id: 'foo'});
+      ingest.save({ id: 'foo' });
       $httpBackend.flush();
 
       expect($rootScope.$broadcast.calledOnce);
@@ -128,7 +128,7 @@ describe('Ingest Service', function () {
       })
       .respond('ok');
 
-      const file = new Blob(['foo,bar'], {type : 'text/csv'});
+      const file = new Blob(['foo,bar'], { type : 'text/csv' });
 
       ingest.uploadCSV(file, 'foo', ';');
       $httpBackend.flush();
@@ -139,7 +139,7 @@ describe('Ingest Service', function () {
       .expectPOST('/api/kibana/foo/_data?csv_delimiter=;')
       .respond(404);
 
-      const file = new Blob(['foo,bar'], {type : 'text/csv'});
+      const file = new Blob(['foo,bar'], { type : 'text/csv' });
 
       ingest.uploadCSV(file, 'foo', ';')
       .then(
diff --git a/src/ui/public/ingest/ingest.js b/src/ui/public/ingest/ingest.js
index d10765563f887..6f0368a154dbe 100644
--- a/src/ui/public/ingest/ingest.js
+++ b/src/ui/public/ingest/ingest.js
@@ -1,13 +1,10 @@
-import RefreshKibanaIndexProvider from 'plugins/kibana/management/sections/indices/_refresh_kibana_index';
-import { keysToCamelCaseShallow, keysToSnakeCaseShallow } from '../../../core_plugins/kibana/common/lib/case_conversion';
+import { keysToSnakeCaseShallow } from '../../../core_plugins/kibana/common/lib/case_conversion';
 import _ from 'lodash';
 import angular from 'angular';
 import chrome from 'ui/chrome';
 
 export default function IngestProvider($rootScope, $http, config, $q, Private, indexPatterns) {
-
   const ingestAPIPrefix = chrome.addBasePath('/api/kibana/ingest');
-  const refreshKibanaIndex = Private(RefreshKibanaIndexProvider);
 
   this.save = function (indexPattern) {
     if (_.isEmpty(indexPattern)) {
@@ -60,8 +57,7 @@ export default function IngestProvider($rootScope, $http, config, $q, Private, i
     return $http.post(chrome.addBasePath(`/api/kibana/${indexPattern}/_data`), formData, {
       params: params,
       transformRequest: angular.identity,
-      headers: {'Content-Type': undefined}
+      headers: { 'Content-Type': undefined }
     });
   };
-
 }
diff --git a/src/ui/public/jquery/__tests__/find_test_subject.js b/src/ui/public/jquery/__tests__/find_test_subject.js
index 7a70ec05bd2a1..8302712e78f68 100644
--- a/src/ui/public/jquery/__tests__/find_test_subject.js
+++ b/src/ui/public/jquery/__tests__/find_test_subject.js
@@ -7,42 +7,42 @@ function $make(subject) {
 
 describe('jQuery.findTestSubject', function () {
   it('finds all of the element with a subject', function () {
-    let $container = $('<div>');
-    let $match = $make('subject').appendTo($container);
-    let $noMatch = $make('notSubject').appendTo($container);
+    const $container = $('<div>');
+    const $match = $make('subject').appendTo($container);
+    const $noMatch = $make('notSubject').appendTo($container);
 
-    let $found = $container.findTestSubject('subject');
+    const $found = $container.findTestSubject('subject');
     expect($found.is($match)).to.be(true);
     expect($found.is($noMatch)).to.be(false);
   });
 
   it('finds multiple elements with a subject', function () {
-    let $container = $('<div>');
-    let $match = $make('subject').appendTo($container);
-    let $otherMatch = $make('subject').appendTo($container);
+    const $container = $('<div>');
+    const $match = $make('subject').appendTo($container);
+    const $otherMatch = $make('subject').appendTo($container);
 
-    let $found = $container.findTestSubject('subject');
+    const $found = $container.findTestSubject('subject');
     expect($found.filter($match).size()).to.be(1);
     expect($found.filter($otherMatch).size()).to.be(1);
   });
 
   it('finds all of the elements with either subject', function () {
-    let $container = $('<div>');
-    let $match1 = $make('subject').appendTo($container);
-    let $match2 = $make('alsoSubject').appendTo($container);
-    let $noMatch = $make('notSubject').appendTo($container);
+    const $container = $('<div>');
+    const $match1 = $make('subject').appendTo($container);
+    const $match2 = $make('alsoSubject').appendTo($container);
+    const $noMatch = $make('notSubject').appendTo($container);
 
-    let $found = $container.findTestSubject('subject', 'alsoSubject');
+    const $found = $container.findTestSubject('subject', 'alsoSubject');
     expect($found.filter($match1).size()).to.be(1);
     expect($found.filter($match2).size()).to.be(1);
     expect($found.filter($noMatch).size()).to.be(0);
   });
 
   it('finds all of the elements with a decendant selector', function () {
-    let $container = $('<div>');
-    let $parent = $make('foo name').appendTo($container);
-    let $bar = $make('bar othername').appendTo($parent);
-    let $baz = $make('baz third name').appendTo($parent);
+    const $container = $('<div>');
+    const $parent = $make('foo name').appendTo($container);
+    const $bar = $make('bar othername').appendTo($parent);
+    const $baz = $make('baz third name').appendTo($parent);
 
     expect($container.findTestSubject('foo bar').is($bar)).to.be(true);
     expect($container.findTestSubject('foo bar').is($baz)).to.be(false);
@@ -52,9 +52,9 @@ describe('jQuery.findTestSubject', function () {
   });
 
   it('finds elements with compound subjects', function () {
-    let $container = $('<div>');
-    let $bar = $make('button bar').appendTo($container);
-    let $baz = $make('button baz').appendTo($container);
+    const $container = $('<div>');
+    const $bar = $make('button bar').appendTo($container);
+    const $baz = $make('button baz').appendTo($container);
 
     expect($container.findTestSubject('button&bar').is($bar)).to.be(true);
     expect($container.findTestSubject('button& bar').is($bar)).to.be(true);
diff --git a/src/ui/public/jquery/find_test_subject.js b/src/ui/public/jquery/find_test_subject.js
index 935bb67a14558..cc047e384cb11 100644
--- a/src/ui/public/jquery/find_test_subject.js
+++ b/src/ui/public/jquery/find_test_subject.js
@@ -45,13 +45,13 @@ module.exports = function bindToJquery($) {
 
   function findTestSubject(...subjectSelectors) {
     let $els = $();
-    let $context = this;
+    const $context = this;
 
     subjectSelectors.forEach(function (selector) {
       $els = $els.add($context.find(testSubjSelector(selector)));
     });
 
     return $els;
-  };
+  }
 
 };
diff --git a/src/ui/public/kbn_top_nav/__tests__/kbn_top_nav.js b/src/ui/public/kbn_top_nav/__tests__/kbn_top_nav.js
index 8d3b213db66db..da2acc76510e4 100644
--- a/src/ui/public/kbn_top_nav/__tests__/kbn_top_nav.js
+++ b/src/ui/public/kbn_top_nav/__tests__/kbn_top_nav.js
@@ -5,8 +5,6 @@ import $ from 'jquery';
 
 import '../kbn_top_nav';
 import KbnTopNavControllerProvider from '../kbn_top_nav_controller';
-import navbarExtensionsRegistry from 'ui/registry/navbar_extensions';
-import Registry from 'ui/registry/_registry';
 
 describe('kbnTopNav directive', function () {
   let build;
diff --git a/src/ui/public/kbn_top_nav/__tests__/kbn_top_nav_controller.js b/src/ui/public/kbn_top_nav/__tests__/kbn_top_nav_controller.js
index 36614f1e9b7e9..30467a6ac5292 100644
--- a/src/ui/public/kbn_top_nav/__tests__/kbn_top_nav_controller.js
+++ b/src/ui/public/kbn_top_nav/__tests__/kbn_top_nav_controller.js
@@ -14,17 +14,17 @@ describe('KbnTopNavController', function () {
 
   describe('opts', function () {
     it('supports giving it no options', function () {
-      const controller = new KbnTopNavController();
+      new KbnTopNavController();
     });
 
     it('support empty options list', function () {
-      const controller = new KbnTopNavController([]);
+      new KbnTopNavController([]);
     });
 
     describe('key:', function () {
       it('requires every opt to have a key', function () {
         expect(function () {
-          const controller = new KbnTopNavController([
+          new KbnTopNavController([
             { foo: 'bar' }
           ]);
         }).to.throwError(TypeError);
@@ -50,7 +50,7 @@ describe('KbnTopNavController', function () {
     describe('description:', function () {
       it('defaults to "Toggle ${key} view" when using templates', function () {
         const controller = new KbnTopNavController([
-          { key: 'foo', template: '<h1></h1>'},
+          { key: 'foo', template: '<h1></h1>' },
           { key: 'Bar', description: 'not the default' },
           { key: '1234', run: ()=>{} },
         ]);
@@ -303,7 +303,7 @@ describe('KbnTopNavController', function () {
         expect(controller.menuItems).to.have.length(4);
 
         // check that the items were added
-        var matches = controller.menuItems.reduce((acc, item) => {
+        const matches = controller.menuItems.reduce((acc, item) => {
           if (item.key === 'green' || item.key === 'red') {
             acc[item.key] = item;
           }
@@ -324,7 +324,7 @@ describe('KbnTopNavController', function () {
         expect(controller.menuItems).to.have.length(3);
 
         // check that the items were added
-        var match = controller.menuItems.filter((item) => {
+        const match = controller.menuItems.filter((item) => {
           return item.key === 'green';
         });
         expect(match[0]).to.have.property('run');
diff --git a/src/ui/public/kbn_top_nav/kbn_top_nav.js b/src/ui/public/kbn_top_nav/kbn_top_nav.js
index f96511919c0e9..4a5be1a27100c 100644
--- a/src/ui/public/kbn_top_nav/kbn_top_nav.js
+++ b/src/ui/public/kbn_top_nav/kbn_top_nav.js
@@ -88,7 +88,7 @@ module.directive('kbnTopNav', function (Private) {
 
         if (!transcludedContentContainer) {
           return;
-        };
+        }
 
         const transcludedContent = transcludedContentContainer.children;
         _.forEach(transcludedContent, transcludedItem => {
@@ -111,7 +111,7 @@ module.directive('kbnTopNav', function (Private) {
       return $scope.kbnTopNav;
     },
 
-    link(scope, element) {
+    link(scope) {
       // These are the slots where transcluded elements can go.
       const transclusionSlotNames = ['topLeftCorner', 'bottomRow'];
 
diff --git a/src/ui/public/listen/__tests__/listen.js b/src/ui/public/listen/__tests__/listen.js
index a4dcae53d176d..5c0384291f4e9 100644
--- a/src/ui/public/listen/__tests__/listen.js
+++ b/src/ui/public/listen/__tests__/listen.js
@@ -22,8 +22,8 @@ describe('listen component', function () {
   });
 
   it('binds to an event emitter', function () {
-    let emitter = new Events();
-    let $scope = $rootScope.$new();
+    const emitter = new Events();
+    const $scope = $rootScope.$new();
 
     function handler() {}
     $scope.$listen(emitter, 'hello', handler);
@@ -33,8 +33,8 @@ describe('listen component', function () {
   });
 
   it('binds to $scope, waiting for the destroy event', function () {
-    let emitter = new Events();
-    let $scope = $rootScope.$new();
+    const emitter = new Events();
+    const $scope = $rootScope.$new();
 
     sinon.stub($scope, '$on');
     sinon.stub($rootScope, '$on');
@@ -45,14 +45,14 @@ describe('listen component', function () {
     expect($rootScope.$on).to.have.property('callCount', 0);
     expect($scope.$on).to.have.property('callCount', 1);
 
-    let call = $scope.$on.firstCall;
+    const call = $scope.$on.firstCall;
     expect(call.args[0]).to.be('$destroy');
     expect(call.args[1]).to.be.a('function');
   });
 
   it('unbinds the event handler when $destroy is triggered', function () {
-    let emitter = new Events();
-    let $scope = $rootScope.$new();
+    const emitter = new Events();
+    const $scope = $rootScope.$new();
 
     sinon.stub($scope, '$on');
     sinon.stub(emitter, 'off');
@@ -62,7 +62,7 @@ describe('listen component', function () {
     $scope.$listen(emitter, 'hello', handler);
 
     // get the unbinder that was registered to $scope
-    let unbinder = $scope.$on.firstCall.args[1];
+    const unbinder = $scope.$on.firstCall.args[1];
 
     // call the unbinder
     expect(emitter.off).to.have.property('callCount', 0);
@@ -70,7 +70,7 @@ describe('listen component', function () {
     expect(emitter.off).to.have.property('callCount', 1);
 
     // check that the off args were as expected
-    let call = emitter.off.firstCall;
+    const call = emitter.off.firstCall;
     expect(call.args[0]).to.be('hello');
     expect(call.args[1]).to.be(handler);
   });
diff --git a/src/ui/public/listen/listen.js b/src/ui/public/listen/listen.js
index 88d397750f784..93d681d9a7156 100644
--- a/src/ui/public/listen/listen.js
+++ b/src/ui/public/listen/listen.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import uiModules from 'ui/modules';
 
 uiModules.get('kibana')
diff --git a/src/ui/public/management/__tests__/section.js b/src/ui/public/management/__tests__/section.js
index 6fb3c2fc9dae2..97f08491aed69 100644
--- a/src/ui/public/management/__tests__/section.js
+++ b/src/ui/public/management/__tests__/section.js
@@ -52,7 +52,7 @@ describe('ManagementSection', () => {
         section.register('about');
       } catch (e) {
         threwException = e.message.indexOf('is already registered') > -1;
-      };
+      }
 
       expect(threwException).to.be(true);
     });
diff --git a/src/ui/public/management/section.js b/src/ui/public/management/section.js
index 0f91443da1398..1a318939c2dcb 100644
--- a/src/ui/public/management/section.js
+++ b/src/ui/public/management/section.js
@@ -1,4 +1,4 @@
-import {assign} from 'lodash';
+import { assign } from 'lodash';
 import IndexedArray from 'ui/indexed_array';
 
 export default class ManagementSection {
diff --git a/src/ui/public/notify/__tests__/lib/_format_es_msg.js b/src/ui/public/notify/__tests__/lib/_format_es_msg.js
index 5b89a909386bc..0fd73df79edc1 100644
--- a/src/ui/public/notify/__tests__/lib/_format_es_msg.js
+++ b/src/ui/public/notify/__tests__/lib/_format_es_msg.js
@@ -3,23 +3,23 @@ import expect from 'expect.js';
 describe('formatESMsg', function () {
 
   it('should return undefined if passed a basic error', function () {
-    let err = new Error('This is a normal error');
+    const err = new Error('This is a normal error');
 
-    let actual = formatESMsg(err);
+    const actual = formatESMsg(err);
 
     expect(actual).to.be(undefined);
   });
 
   it('should return undefined if passed a string', function () {
-    let err = 'This is a error string';
+    const err = 'This is a error string';
 
-    let actual = formatESMsg(err);
+    const actual = formatESMsg(err);
 
     expect(actual).to.be(undefined);
   });
 
   it('should return the root_cause if passed an extended elasticsearch', function () {
-    let err = new Error('This is an elasticsearch error');
+    const err = new Error('This is an elasticsearch error');
     err.resp = {
       error : {
         root_cause : [
@@ -30,13 +30,13 @@ describe('formatESMsg', function () {
       }
     };
 
-    let actual = formatESMsg(err);
+    const actual = formatESMsg(err);
 
     expect(actual).to.equal('I am the detailed message');
   });
 
   it('should combine the reason messages if more than one is returned.', function () {
-    let err = new Error('This is an elasticsearch error');
+    const err = new Error('This is an elasticsearch error');
     err.resp = {
       error : {
         root_cause : [
@@ -50,7 +50,7 @@ describe('formatESMsg', function () {
       }
     };
 
-    let actual = formatESMsg(err);
+    const actual = formatESMsg(err);
 
     expect(actual).to.equal('I am the detailed message 1\nI am the detailed message 2');
   });
diff --git a/src/ui/public/notify/__tests__/lib/_format_msg.js b/src/ui/public/notify/__tests__/lib/_format_msg.js
index 725fd6a518d73..a58f2fa4e2d72 100644
--- a/src/ui/public/notify/__tests__/lib/_format_msg.js
+++ b/src/ui/public/notify/__tests__/lib/_format_msg.js
@@ -3,26 +3,26 @@ import expect from 'expect.js';
 describe('formatMsg', function () {
 
   it('should prepend the second argument to result', function () {
-    let actual = formatMsg('error message', 'unit_test');
+    const actual = formatMsg('error message', 'unit_test');
 
     expect(actual).to.equal('unit_test: error message');
   });
 
   it('should handle a simple string', function () {
-    let actual = formatMsg('error message');
+    const actual = formatMsg('error message');
 
     expect(actual).to.equal('error message');
   });
 
   it('should handle a simple Error object', function () {
-    let err = new Error('error message');
-    let actual = formatMsg(err);
+    const err = new Error('error message');
+    const actual = formatMsg(err);
 
     expect(actual).to.equal('error message');
   });
 
   it('should handle a simple Angular $http error object', function () {
-    let err = {
+    const err = {
       data: {
         statusCode: 403,
         error: 'Forbidden',
@@ -32,13 +32,13 @@ describe('formatMsg', function () {
       config: {},
       statusText: 'Forbidden'
     };
-    let actual = formatMsg(err);
+    const actual = formatMsg(err);
 
     expect(actual).to.equal('Error 403 Forbidden: [security_exception] action [indices:data/read/mget] is unauthorized for user [user]');
   });
 
   it('should handle an extended elasticsearch error', function () {
-    let err = {
+    const err = {
       resp : {
         error : {
           root_cause : [
@@ -50,7 +50,7 @@ describe('formatMsg', function () {
       }
     };
 
-    let actual = formatMsg(err);
+    const actual = formatMsg(err);
 
     expect(actual).to.equal('I am the detailed message');
   });
diff --git a/src/ui/public/notify/__tests__/notifier.js b/src/ui/public/notify/__tests__/notifier.js
index 223536d6bb635..95d4c3382d556 100644
--- a/src/ui/public/notify/__tests__/notifier.js
+++ b/src/ui/public/notify/__tests__/notifier.js
@@ -70,7 +70,7 @@ describe('Notifier', function () {
     });
 
     it('sets timeRemaining and decrements', function () {
-      let notif = notify('error');
+      const notif = notify('error');
 
       expect(notif.timeRemaining).to.equal(300);
       $interval.flush(1000);
@@ -78,8 +78,8 @@ describe('Notifier', function () {
     });
 
     it('closes notification on lifetime expiry', function () {
-      let expectation = sinon.mock();
-      let notif = notifier.error(message, expectation);
+      const expectation = sinon.mock();
+      const notif = notifier.error(message, expectation);
 
       expectation.once();
       expectation.withExactArgs('ignore');
@@ -90,7 +90,7 @@ describe('Notifier', function () {
     });
 
     it('allows canceling of timer', function () {
-      let notif = notify('error');
+      const notif = notify('error');
 
       expect(notif.timerId).to.not.be(undefined);
       notif.cancelTimer();
@@ -99,7 +99,7 @@ describe('Notifier', function () {
     });
 
     it('resets timer on addition to stack', function () {
-      let notif = notify('error');
+      const notif = notify('error');
 
       $interval.flush(100000);
       expect(notif.timeRemaining).to.equal(200);
@@ -109,12 +109,12 @@ describe('Notifier', function () {
     });
 
     it('allows reporting', function () {
-      let includesReport = _.includes(notify('error').actions, 'report');
+      const includesReport = _.includes(notify('error').actions, 'report');
       expect(includesReport).to.true;
     });
 
     it('allows accepting', function () {
-      let includesAccept = _.includes(notify('error').actions, 'accept');
+      const includesAccept = _.includes(notify('error').actions, 'accept');
       expect(includesAccept).to.true;
     });
 
@@ -156,12 +156,12 @@ describe('Notifier', function () {
     });
 
     it('does not allow reporting', function () {
-      let includesReport = _.includes(notify('warning').actions, 'report');
+      const includesReport = _.includes(notify('warning').actions, 'report');
       expect(includesReport).to.false;
     });
 
     it('allows accepting', function () {
-      let includesAccept = _.includes(notify('warning').actions, 'accept');
+      const includesAccept = _.includes(notify('warning').actions, 'accept');
       expect(includesAccept).to.true;
     });
 
@@ -203,12 +203,12 @@ describe('Notifier', function () {
     });
 
     it('does not allow reporting', function () {
-      let includesReport = _.includes(notify('info').actions, 'report');
+      const includesReport = _.includes(notify('info').actions, 'report');
       expect(includesReport).to.false;
     });
 
     it('allows accepting', function () {
-      let includesAccept = _.includes(notify('info').actions, 'accept');
+      const includesAccept = _.includes(notify('info').actions, 'accept');
       expect(includesAccept).to.true;
     });
 
@@ -387,12 +387,12 @@ describe('Notifier', function () {
     });
 
     it('does not allow reporting', function () {
-      let includesReport = _.includes(notify('banner').actions, 'report');
+      const includesReport = _.includes(notify('banner').actions, 'report');
       expect(includesReport).to.false;
     });
 
     it('allows accepting', function () {
-      let includesAccept = _.includes(notify('banner').actions, 'accept');
+      const includesAccept = _.includes(notify('banner').actions, 'accept');
       expect(includesAccept).to.true;
     });
 
@@ -422,13 +422,13 @@ describe('Notifier', function () {
   function testVersionInfo(fnName) {
     context('when version is configured', function () {
       it('adds version to notification', function () {
-        let notification = notify(fnName);
+        const notification = notify(fnName);
         expect(notification.info.version).to.equal(version);
       });
     });
     context('when build number is configured', function () {
       it('adds buildNum to notification', function () {
-        let notification = notify(fnName);
+        const notification = notify(fnName);
         expect(notification.info.buildNum).to.equal(buildNum);
       });
     });
diff --git a/src/ui/public/notify/directives.js b/src/ui/public/notify/directives.js
index cb91b664d5403..7a13c02eda55f 100644
--- a/src/ui/public/notify/directives.js
+++ b/src/ui/public/notify/directives.js
@@ -1,11 +1,10 @@
-import _ from 'lodash';
 import uiModules from 'ui/modules';
 import toasterTemplate from 'ui/notify/partials/toaster.html';
 import 'ui/notify/notify.less';
 import 'ui/filters/markdown';
 import 'ui/directives/truncated';
 
-let notify = uiModules.get('kibana/notify');
+const notify = uiModules.get('kibana/notify');
 
 notify.directive('kbnNotifications', function () {
   return {
diff --git a/src/ui/public/notify/errors.js b/src/ui/public/notify/errors.js
index 68a040466124f..85f4ed66c7d47 100644
--- a/src/ui/public/notify/errors.js
+++ b/src/ui/public/notify/errors.js
@@ -1,8 +1,8 @@
 import _ from 'lodash';
-let errors = {};
+const errors = {};
 
-let canStack = (function () {
-  let err = new Error();
+const canStack = (function () {
+  const err = new Error();
   return !!err.stack;
 }());
 
diff --git a/src/ui/public/notify/lib/_format_es_msg.js b/src/ui/public/notify/lib/_format_es_msg.js
index ac8c6b043a625..7a39215d944df 100644
--- a/src/ui/public/notify/lib/_format_es_msg.js
+++ b/src/ui/public/notify/lib/_format_es_msg.js
@@ -6,11 +6,11 @@ import _ from 'lodash';
  * @returns {string}
  */
 export default function formatESMsg(err) {
-  let rootCause = _.get(err, 'resp.error.root_cause');
+  const rootCause = _.get(err, 'resp.error.root_cause');
   if (!rootCause) {
     return; //undefined
   }
 
-  let result = _.pluck(rootCause, 'reason').join('\n');
+  const result = _.pluck(rootCause, 'reason').join('\n');
   return result;
-};
+}
diff --git a/src/ui/public/notify/lib/_format_msg.js b/src/ui/public/notify/lib/_format_msg.js
index 448c4fa4b2c8c..d3c4cdbc73340 100644
--- a/src/ui/public/notify/lib/_format_msg.js
+++ b/src/ui/public/notify/lib/_format_msg.js
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import formatESMsg from 'ui/notify/lib/_format_es_msg';
-let has = _.has;
+const has = _.has;
 
 /**
  * Formats the error message from an error object, extended elasticsearch
@@ -15,7 +15,7 @@ function formatMsg(err, from) {
     rtn += from + ': ';
   }
 
-  let esMsg = formatESMsg(err);
+  const esMsg = formatESMsg(err);
 
   if (typeof err === 'string') {
     rtn += err;
@@ -29,7 +29,7 @@ function formatMsg(err, from) {
   }
 
   return rtn;
-};
+}
 
 formatMsg.describeError = function (err) {
   if (!err) return undefined;
diff --git a/src/ui/public/notify/notifier.js b/src/ui/public/notify/notifier.js
index 04ff558f53283..a31df3cc34131 100644
--- a/src/ui/public/notify/notifier.js
+++ b/src/ui/public/notify/notifier.js
@@ -7,17 +7,17 @@ import fatalSplashScreen from 'ui/notify/partials/fatal_splash_screen.html';
 import 'ui/render_directive';
 /* eslint no-console: 0 */
 
-let notifs = [];
-let version = metadata.version;
-let buildNum = metadata.buildNum;
-let consoleGroups = ('group' in window.console) && ('groupCollapsed' in window.console) && ('groupEnd' in window.console);
+const notifs = [];
+const version = metadata.version;
+const buildNum = metadata.buildNum;
+const consoleGroups = ('group' in window.console) && ('groupCollapsed' in window.console) && ('groupEnd' in window.console);
 
-let log = _.bindKey(console, 'log');
+const log = _.bindKey(console, 'log');
 
 // used to identify the first call to fatal, set to false there
 let firstFatal = true;
 
-let fatalToastTemplate = (function lazyTemplate(tmpl) {
+const fatalToastTemplate = (function lazyTemplate(tmpl) {
   let compiled;
   return function (vars) {
     return (compiled || (compiled = _.template(tmpl)))(vars);
@@ -34,7 +34,7 @@ function now() {
 function closeNotif(notif, cb = _.noop, key) {
   return function () {
     // this === notif
-    let i = notifs.indexOf(notif);
+    const i = notifs.indexOf(notif);
     if (i !== -1) notifs.splice(i, 1);
 
     cancelTimer(notif);
@@ -100,10 +100,10 @@ const buttonHierarchyClass = (index) => {
   return 'btn-default';
 };
 const typeToAlertClassMap = {
-  danger: `alert-danger`,
-  warning: `alert-warning`,
-  info: `alert-info`,
-  banner: `alert-banner`,
+  danger: 'alert-danger',
+  warning: 'alert-warning',
+  info: 'alert-info',
+  banner: 'alert-banner',
 };
 
 function add(notif, cb) {
@@ -188,7 +188,7 @@ Notifier.prototype.add = add;
 Notifier.prototype.set = set;
 
 function formatInfo() {
-  let info = [];
+  const info = [];
 
   if (!_.isUndefined(version)) {
     info.push(`Version: ${version}`);
@@ -213,7 +213,7 @@ function formatStack(err) {
  * Functionality to check that
  */
 function Notifier(opts) {
-  let self = this;
+  const self = this;
   opts = opts || {};
 
   // label type thing to say where notifications came from
@@ -291,7 +291,7 @@ Notifier.prototype.lifecycle = createGroupLogger('lifecycle', {
  * @return {function} - the wrapped function
  */
 Notifier.prototype.timed = function (name, fn) {
-  let self = this;
+  const self = this;
 
   if (typeof name === 'function') {
     fn = name;
@@ -299,8 +299,8 @@ Notifier.prototype.timed = function (name, fn) {
   }
 
   return function WrappedNotifierFunction() {
-    let cntx = this;
-    let args = arguments;
+    const cntx = this;
+    const args = arguments;
 
     return self.event(name, function () {
       return fn.apply(cntx, args);
@@ -336,7 +336,7 @@ Notifier.prototype._showFatal = function (err) {
     });
   }
 
-  let html = fatalToastTemplate({
+  const html = fatalToastTemplate({
     info: formatInfo(),
     msg: formatMsg(err, this.from),
     stack: formatStack(err)
@@ -576,7 +576,7 @@ if (log === _.noop) {
   Notifier.prototype.log = _.noop;
 } else {
   Notifier.prototype.log = function () {
-    let args = [].slice.apply(arguments);
+    const args = [].slice.apply(arguments);
     if (this.from) args.unshift(this.from + ':');
     log.apply(null, args);
   };
@@ -585,15 +585,15 @@ if (log === _.noop) {
 // general functionality used by .event() and .lifecycle()
 function createGroupLogger(type, opts) {
   // Track the groups managed by this logger
-  let groups = window[type + 'Groups'] = {};
+  const groups = window[type + 'Groups'] = {};
 
   return function logger(name, success) {
     let status; // status of the timer
     let exec; // function to execute and wrap
     let ret; // return value
 
-    let complete = function (val) { logger(name, true); return val; };
-    let failure = function (err) { logger(name, false); throw err; };
+    const complete = function (val) { logger(name, true); return val; };
+    const failure = function (err) { logger(name, false); throw err; };
 
     if (typeof success === 'function' || success === void 0) {
       // start
@@ -609,7 +609,7 @@ function createGroupLogger(type, opts) {
     }
     else {
       groups[name] = now() - (groups[name] || 0);
-      let time = ' in ' + groups[name].toFixed(2) + 'ms';
+      const time = ' in ' + groups[name].toFixed(2) + 'ms';
 
       // end
       if (success) {
diff --git a/src/ui/public/notify/notify.js b/src/ui/public/notify/notify.js
index bcfa025cfcdea..df87a1df53a4c 100644
--- a/src/ui/public/notify/notify.js
+++ b/src/ui/public/notify/notify.js
@@ -1,13 +1,9 @@
-import _ from 'lodash';
-import $ from 'jquery';
 import modules from 'ui/modules';
-import errors from 'ui/notify/errors';
 import Notifier from 'ui/notify/notifier';
 import 'ui/notify/directives';
-import chrome from 'ui/chrome';
 import { kbnIndex } from 'ui/metadata';
-let module = modules.get('kibana/notify');
-let rootNotifier = new Notifier();
+const module = modules.get('kibana/notify');
+const rootNotifier = new Notifier();
 
 module.factory('createNotifier', function () {
   return function (opts) {
diff --git a/src/ui/public/number_list/number_list.js b/src/ui/public/number_list/number_list.js
index 9c18da1f3058f..47a233f6fbbe1 100644
--- a/src/ui/public/number_list/number_list.js
+++ b/src/ui/public/number_list/number_list.js
@@ -13,7 +13,7 @@ uiModules
     controllerAs: 'numberListCntr',
     require: 'ngModel',
     controller: function ($scope, $attrs, $parse) {
-      let self = this;
+      const self = this;
 
       // Called from the pre-link function once we have the controllers
       self.init = function (modelCntr) {
@@ -25,11 +25,11 @@ uiModules
 
         self.getUnitName = _.partial($parse($attrs.unit), $scope);
 
-        let defaultRange = self.range = parseRange('[0,Infinity)');
+        const defaultRange = self.range = parseRange('[0,Infinity)');
 
         $scope.$watch(function () {
           return $attrs.range;
-        }, function (range, prev) {
+        }, function (range) {
           if (!range) {
             self.range = defaultRange;
             return;
@@ -48,7 +48,7 @@ uiModules
          * @return {undefined}
          */
         self.remove = function (index) {
-          let list = self.getList();
+          const list = self.getList();
           if (!list) return;
 
           list.splice(index, 1);
@@ -59,7 +59,7 @@ uiModules
          * @return {undefined}
          */
         self.add = function () {
-          let list = self.getList();
+          const list = self.getList();
           if (!list) return;
 
           list.push(_.last(list) + 1);
diff --git a/src/ui/public/number_list/number_list_input.js b/src/ui/public/number_list/number_list_input.js
index 7fbf1b935e02f..47ce619685ce8 100644
--- a/src/ui/public/number_list/number_list_input.js
+++ b/src/ui/public/number_list/number_list_input.js
@@ -1,13 +1,11 @@
-import $ from 'jquery';
-import _ from 'lodash';
 import keyMap from 'ui/utils/key_map';
 import uiModules from 'ui/modules';
 
-let INVALID = {}; // invalid flag
-let FLOATABLE = /^[\d\.e\-\+]+$/i;
+const INVALID = {}; // invalid flag
+const FLOATABLE = /^[\d\.e\-\+]+$/i;
 
-let VALIDATION_ERROR = 'numberListRangeAndOrder';
-let DIRECTIVE_ATTR = 'kbn-number-list-input';
+const VALIDATION_ERROR = 'numberListRangeAndOrder';
+const DIRECTIVE_ATTR = 'kbn-number-list-input';
 
 uiModules
 .get('kibana')
@@ -16,13 +14,13 @@ uiModules
     restrict: 'A',
     require: ['ngModel', '^kbnNumberList'],
     link: function ($scope, $el, attrs, controllers) {
-      let ngModelCntr = controllers[0];
-      let numberListCntr = controllers[1];
+      const ngModelCntr = controllers[0];
+      const numberListCntr = controllers[1];
 
-      let $setModel = $parse(attrs.ngModel).assign;
-      let $repeater = $el.closest('[ng-repeat]');
+      const $setModel = $parse(attrs.ngModel).assign;
+      const $repeater = $el.closest('[ng-repeat]');
 
-      let handlers = {
+      const handlers = {
         up: change(add, 1),
         'shift-up': change(addTenth, 1),
 
@@ -54,14 +52,14 @@ uiModules
 
       function go(dir) {
         return function () {
-          let $to = $get(dir);
+          const $to = $get(dir);
           if ($to.size()) $to.focus();
           else return false;
         };
       }
 
       function idKey(event) {
-        let id = [];
+        const id = [];
         if (event.ctrlKey) id.push('ctrl');
         if (event.shiftKey) id.push('shift');
         if (event.metaKey) id.push('meta');
@@ -93,11 +91,11 @@ uiModules
 
       function change(using, mod) {
         return function () {
-          let str = String(ngModelCntr.$viewValue);
-          let val = parse(str);
+          const str = String(ngModelCntr.$viewValue);
+          const val = parse(str);
           if (val === INVALID) return;
 
-          let next = using(mod, val, str);
+          const next = using(mod, val, str);
           if (next === INVALID) return;
 
           $el.val(next);
@@ -106,7 +104,7 @@ uiModules
       }
 
       function onKeydown(event) {
-        let handler = handlers[idKey(event)];
+        const handler = handlers[idKey(event)];
         if (!handler) return;
 
         if (handler(event) !== false) {
@@ -133,13 +131,13 @@ uiModules
           if (isNaN(num)) return INVALID;
         }
 
-        let range = numberListCntr.range;
+        const range = numberListCntr.range;
         if (!range.within(num)) return INVALID;
 
         if ($scope.$index > 0) {
-          let i = $scope.$index - 1;
-          let list = numberListCntr.getList();
-          let prev = list[i];
+          const i = $scope.$index - 1;
+          const list = numberListCntr.getList();
+          const prev = list[i];
           if (num <= prev) return INVALID;
         }
 
@@ -155,14 +153,14 @@ uiModules
           }
         }
       ], function () {
-        let valid = parse(ngModelCntr.$viewValue) !== INVALID;
+        const valid = parse(ngModelCntr.$viewValue) !== INVALID;
         ngModelCntr.$setValidity(VALIDATION_ERROR, valid);
       });
 
       function validate(then) {
         return function (input) {
           let value = parse(input);
-          let valid = value !== INVALID;
+          const valid = value !== INVALID;
           value = valid ? value : input;
           ngModelCntr.$setValidity(VALIDATION_ERROR, valid);
           then && then(input, value);
diff --git a/src/ui/public/paginated_table/__tests__/index.js b/src/ui/public/paginated_table/__tests__/index.js
index 34eea5692ab8c..1decf5024f80f 100644
--- a/src/ui/public/paginated_table/__tests__/index.js
+++ b/src/ui/public/paginated_table/__tests__/index.js
@@ -1,6 +1,5 @@
 
 import _ from 'lodash';
-import sinon from 'sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/paginated_table';
@@ -11,11 +10,9 @@ describe('paginated table', function () {
   let $rootScope;
   let $compile;
   let $scope;
-  let $elScope;
-  let $orderBy;
-  let defaultPerPage = 10;
+  const defaultPerPage = 10;
 
-  let makeData = function (colCount, rowCount) {
+  const makeData = function (colCount, rowCount) {
     let columns = [];
     let rows = [];
 
@@ -29,7 +26,7 @@ describe('paginated table', function () {
 
     if (_.isNumber(rowCount)) {
       _.times(rowCount, function (col) {
-        let rowItems = [];
+        const rowItems = [];
 
         _.times(columns.length, function (row) {
           rowItems.push('item' + col + row);
@@ -47,7 +44,7 @@ describe('paginated table', function () {
     };
   };
 
-  let renderTable = function (cols, rows, perPage, sort) {
+  const renderTable = function (cols, rows, perPage, sort) {
     $scope.cols = cols || [];
     $scope.rows = rows || [];
     $scope.perPage = perPage || defaultPerPage;
@@ -59,32 +56,31 @@ describe('paginated table', function () {
   };
 
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (_$rootScope_, _$compile_, $filter) {
+  beforeEach(ngMock.inject(function (_$rootScope_, _$compile_) {
     $rootScope = _$rootScope_;
     $compile = _$compile_;
-    $orderBy = $filter('orderBy');
     $scope = $rootScope.$new();
   }));
 
   describe('rendering', function () {
     it('should not display without rows', function () {
-      let cols = [{
+      const cols = [{
         title: 'test1'
       }];
-      let rows = [];
+      const rows = [];
 
       renderTable(cols, rows);
       expect($el.children().size()).to.be(0);
     });
 
     it('should render columns and rows', function () {
-      let data = makeData(2, 2);
-      let cols = data.columns;
-      let rows = data.rows;
+      const data = makeData(2, 2);
+      const cols = data.columns;
+      const rows = data.rows;
 
       renderTable(cols, rows);
       expect($el.children().size()).to.be(1);
-      let tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       // should pad rows
       expect(tableRows.size()).to.be(defaultPerPage);
       // should contain the row data
@@ -96,13 +92,13 @@ describe('paginated table', function () {
 
     it('should paginate rows', function () {
       // note: paginate truncates pages, so don't make too many
-      let rowCount = _.random(16, 24);
-      let perPageCount = _.random(5, 8);
-      let data = makeData(3, rowCount);
-      let pageCount = Math.ceil(rowCount / perPageCount);
+      const rowCount = _.random(16, 24);
+      const perPageCount = _.random(5, 8);
+      const data = makeData(3, rowCount);
+      const pageCount = Math.ceil(rowCount / perPageCount);
 
       renderTable(data.columns, data.rows, perPageCount);
-      let tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       expect(tableRows.size()).to.be(perPageCount);
       // add 2 for the first and last page links
       expect($el.find('paginate-controls a').size()).to.be(pageCount + 2);
@@ -132,7 +128,7 @@ describe('paginated table', function () {
     // });
 
     it('should not sort by default', function () {
-      let tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be(data.rows[0][0]);
       expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be(data.rows[lastRowIndex][0]);
     });
@@ -142,7 +138,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(999);
       $scope.$digest();
 
-      let tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be('bbbb');
       expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
       expect(tableRows.eq(0).find('td').eq(2).text()).to.be('zzzz');
@@ -155,7 +151,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(0);
       $scope.$digest();
 
-      let tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be('bbbb');
       expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
       expect(tableRows.eq(0).find('td').eq(2).text()).to.be('zzzz');
@@ -165,7 +161,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(1);
       $scope.$digest();
 
-      var tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       expect(tableRows.eq(2).find('td').eq(1).text()).to.be('cccc');
       expect(tableRows.eq(1).find('td').eq(1).text()).to.be('bbbb');
       expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
@@ -175,7 +171,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(1, 'desc');
       $scope.$digest();
 
-      var tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(1).text()).to.be('zzzz');
       expect(tableRows.eq(1).find('td').eq(1).text()).to.be('cccc');
       expect(tableRows.eq(2).find('td').eq(1).text()).to.be('bbbb');
@@ -186,7 +182,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(0);
       $scope.$digest();
 
-      let tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be('aaaa');
       expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be('zzzz');
     });
@@ -197,7 +193,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(0);
       $scope.$digest();
 
-      let tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be('zzzz');
       expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be('aaaa');
     });
@@ -209,7 +205,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(0);
       $scope.$digest();
 
-      let tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be(data.rows[0][0]);
       expect(tableRows.eq(lastRowIndex).find('td').eq(0).text()).to.be('aaaa');
     });
@@ -223,7 +219,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(1);
       $scope.$digest();
 
-      let tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(1).text()).to.be('aaaa');
       expect(tableRows.eq(lastRowIndex).find('td').eq(1).text()).to.be('zzzz');
     });
@@ -233,15 +229,15 @@ describe('paginated table', function () {
   describe('sorting duplicate columns', function () {
     let data;
     let paginatedTable;
-    let colText = 'test row';
+    const colText = 'test row';
 
     beforeEach(function () {
-      let cols = [
+      const cols = [
         { title: colText },
         { title: colText },
         { title: colText }
       ];
-      let rows = [
+      const rows = [
         ['bbbb', 'aaaa', 'zzzz'],
         ['cccc', 'cccc', 'aaaa'],
         ['zzzz', 'bbbb', 'bbbb'],
@@ -254,7 +250,7 @@ describe('paginated table', function () {
     });
 
     it('should have duplicate column titles', function () {
-      let columns = $el.find('thead th span');
+      const columns = $el.find('thead th span');
       columns.each(function () {
         expect($(this).text()).to.be(colText);
       });
@@ -265,7 +261,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(2);
       $scope.$digest();
 
-      let tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('td').eq(0).text()).to.be('cccc');
       expect(tableRows.eq(0).find('td').eq(1).text()).to.be('cccc');
       expect(tableRows.eq(0).find('td').eq(2).text()).to.be('aaaa');
@@ -302,7 +298,7 @@ describe('paginated table', function () {
       paginatedTable.sortColumn(1);
       $scope.$digest();
 
-      let sorters = $el.find('thead th i');
+      const sorters = $el.find('thead th i');
       expect(sorters.eq(0).hasClass('fa-sort')).to.be(true);
       expect(sorters.eq(1).hasClass('fa-sort')).to.be(false);
       expect(sorters.eq(2).hasClass('fa-sort')).to.be(true);
@@ -333,7 +329,7 @@ describe('paginated table', function () {
     });
 
     it('should append object markup', function () {
-      let tableRows = $el.find('tbody tr');
+      const tableRows = $el.find('tbody tr');
       expect(tableRows.eq(0).find('h1').size()).to.be(0);
       expect(tableRows.eq(1).find('h1').size()).to.be(1);
       expect(tableRows.eq(2).find('h1').size()).to.be(0);
diff --git a/src/ui/public/parse_query/lib/from_user.js b/src/ui/public/parse_query/lib/from_user.js
index 6aac1f93c0feb..c0802b5e79206 100644
--- a/src/ui/public/parse_query/lib/from_user.js
+++ b/src/ui/public/parse_query/lib/from_user.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import DecorateQueryProvider from 'ui/courier/data_source/_decorate_query';
 export default function GetQueryFromUser(es, Private) {
-  let decorateQuery = Private(DecorateQueryProvider);
+  const decorateQuery = Private(DecorateQueryProvider);
 
   /**
    * Take text from the user and make it into a query object
@@ -10,10 +10,10 @@ export default function GetQueryFromUser(es, Private) {
    */
   return function (text) {
     function getQueryStringQuery(text) {
-      return decorateQuery({query_string: {query: text}});
+      return decorateQuery({ query_string: { query: text } });
     }
 
-    let matchAll = getQueryStringQuery('*');
+    const matchAll = getQueryStringQuery('*');
 
     // If we get an empty object, treat it as a *
     if (_.isObject(text)) {
@@ -38,5 +38,5 @@ export default function GetQueryFromUser(es, Private) {
       return getQueryStringQuery(text);
     }
   };
-};
+}
 
diff --git a/src/ui/public/parse_query/lib/to_user.js b/src/ui/public/parse_query/lib/to_user.js
index 3e6531e767c9f..4372c9609e4f4 100644
--- a/src/ui/public/parse_query/lib/to_user.js
+++ b/src/ui/public/parse_query/lib/to_user.js
@@ -13,4 +13,4 @@ export default function toUser(text) {
     return angular.toJson(text);
   }
   return '' + text;
-};
+}
diff --git a/src/ui/public/parse_query/parse_query.js b/src/ui/public/parse_query/parse_query.js
index 148a2f962f796..8d1ea46ddf4a8 100644
--- a/src/ui/public/parse_query/parse_query.js
+++ b/src/ui/public/parse_query/parse_query.js
@@ -4,7 +4,7 @@ import uiModules from 'ui/modules';
 uiModules
   .get('kibana')
   .directive('parseQuery', function (Private) {
-    let fromUser = Private(ParseQueryLibFromUserProvider);
+    const fromUser = Private(ParseQueryLibFromUserProvider);
 
     return {
       restrict: 'A',
@@ -13,7 +13,7 @@ uiModules
         'ngModel': '='
       },
       link: function ($scope, elem, attr, ngModel) {
-        let init = function () {
+        const init = function () {
           $scope.ngModel = fromUser($scope.ngModel);
         };
 
diff --git a/src/ui/public/pattern_checker/__tests__/pattern_checker.js b/src/ui/public/pattern_checker/__tests__/pattern_checker.js
index 0432c623cb6f8..a0e4f6c05e90c 100644
--- a/src/ui/public/pattern_checker/__tests__/pattern_checker.js
+++ b/src/ui/public/pattern_checker/__tests__/pattern_checker.js
@@ -21,7 +21,7 @@ describe('pattern checker', function () {
     });
   }));
 
-  beforeEach(ngMock.inject(function ($injector, Private) {
+  beforeEach(ngMock.inject(function ($injector) {
     $httpBackend = $injector.get('$httpBackend');
     $compile = $injector.get('$compile');
     $rootScope = $injector.get('$rootScope');
@@ -31,29 +31,29 @@ describe('pattern checker', function () {
   }));
 
   it('should display the number of documents in a given index pattern', function () {
-    apiResponse.respond(200, {count: 1});
+    apiResponse.respond(200, { count: 1 });
 
     const element = $compile('<pattern-checker pattern="logstash"></pattern-checker>')($rootScope);
 
     $httpBackend.flush();
     $rootScope.$digest();
-    expect(_.contains(element.html(), `1 results`)).to.be.ok();
+    expect(_.contains(element.html(), '1 results')).to.be.ok();
   });
 
   it('should poll the api for changes to the document count and update the ui', function () {
-    apiResponse.respond(200, {count: 1});
+    apiResponse.respond(200, { count: 1 });
 
     const element = $compile('<pattern-checker pattern="logstash"></pattern-checker>')($rootScope);
 
     $httpBackend.flush();
     $rootScope.$digest();
-    expect(_.contains(element.html(), `1 results`)).to.be.ok();
+    expect(_.contains(element.html(), '1 results')).to.be.ok();
 
-    apiResponse.respond(200, {count: 2});
+    apiResponse.respond(200, { count: 2 });
     $timeout.flush();
     $httpBackend.flush();
     $rootScope.$digest();
-    expect(_.contains(element.html(), `2 results`)).to.be.ok();
+    expect(_.contains(element.html(), '2 results')).to.be.ok();
   });
 
   it('should display 0 results when API responds with 404', function () {
@@ -63,13 +63,13 @@ describe('pattern checker', function () {
 
     $httpBackend.flush();
     $rootScope.$digest();
-    expect(_.contains(element.html(), `0 results`)).to.be.ok();
+    expect(_.contains(element.html(), '0 results')).to.be.ok();
   });
 
   it('should throw a fatal notificaiton for any error other than a 404', function () {
     apiResponse.respond(500, 'Bad things happened');
 
-    const element = $compile('<pattern-checker pattern="logstash"></pattern-checker>')($rootScope);
+    $compile('<pattern-checker pattern="logstash"></pattern-checker>')($rootScope);
 
     $httpBackend.flush();
     $rootScope.$digest();
@@ -78,14 +78,14 @@ describe('pattern checker', function () {
   });
 
   it('should stop polling when the scope is destroyed', function () {
-    apiResponse.respond(200, {count: 1});
+    apiResponse.respond(200, { count: 1 });
 
     const element = $compile('<pattern-checker pattern="logstash"></pattern-checker>')($rootScope);
     const scope = element.scope();
 
     $httpBackend.flush();
     $rootScope.$digest();
-    expect(_.contains(element.html(), `1 results`)).to.be.ok();
+    expect(_.contains(element.html(), '1 results')).to.be.ok();
 
     scope.$destroy();
     $timeout.flush();
diff --git a/src/ui/public/pattern_checker/pattern_checker.js b/src/ui/public/pattern_checker/pattern_checker.js
index 5ac8834d8a8e8..bec93a9471ce3 100644
--- a/src/ui/public/pattern_checker/pattern_checker.js
+++ b/src/ui/public/pattern_checker/pattern_checker.js
@@ -17,7 +17,7 @@ module.directive('patternChecker', function () {
     controller: function (Notifier, $scope, $timeout, $http) {
       let validationTimeout;
 
-      var notify = new Notifier({
+      const notify = new Notifier({
         location: 'Add Data'
       });
 
diff --git a/src/ui/public/persisted_log/__tests__/persisted_log.js b/src/ui/public/persisted_log/__tests__/persisted_log.js
index 11115f087e6f8..bf7afb28e1a49 100644
--- a/src/ui/public/persisted_log/__tests__/persisted_log.js
+++ b/src/ui/public/persisted_log/__tests__/persisted_log.js
@@ -5,12 +5,11 @@ import ngMock from 'ng_mock';
 import 'ui/persisted_log';
 
 let storage;
-let config;
 let PersistedLog;
 
-let historyName = 'testHistory';
-let historyLimit = 10;
-let payload = [
+const historyName = 'testHistory';
+const historyLimit = 10;
+const payload = [
   { first: 'clark', last: 'kent' },
   { first: 'peter', last: 'parker' },
   { first: 'bruce', last: 'wayne' }
@@ -41,7 +40,7 @@ describe('PersistedLog', function () {
 
   describe('expected API', function () {
     it('has expected methods', function () {
-      let log = new PersistedLog(historyName);
+      const log = new PersistedLog(historyName);
 
       expect(log.add).to.be.a('function');
       expect(log.get).to.be.a('function');
@@ -50,17 +49,17 @@ describe('PersistedLog', function () {
 
   describe('internal functionality', function () {
     it('reads from storage', function () {
-      let log = new PersistedLog(historyName);
+      new PersistedLog(historyName);
 
       expect(storage.get.calledOnce).to.be(true);
       expect(storage.get.calledWith(historyName)).to.be(true);
     });
 
     it('writes to storage', function () {
-      let log = new PersistedLog(historyName);
-      let newItem = { first: 'diana', last: 'prince' };
+      const log = new PersistedLog(historyName);
+      const newItem = { first: 'diana', last: 'prince' };
 
-      let data = log.add(newItem);
+      const data = log.add(newItem);
 
       expect(storage.set.calledOnce).to.be(true);
       expect(data).to.eql([newItem]);
@@ -70,19 +69,19 @@ describe('PersistedLog', function () {
   describe('persisting data', function () {
     it('fetches records from storage', function () {
       storage.get.returns(payload);
-      let log = new PersistedLog(historyName);
+      const log = new PersistedLog(historyName);
 
-      let items = log.get();
+      const items = log.get();
       expect(items.length).to.equal(3);
       expect(items).to.eql(payload);
     });
 
     it('prepends new records', function () {
       storage.get.returns(payload.slice(0));
-      let log = new PersistedLog(historyName);
-      let newItem = { first: 'selina', last: 'kyle' };
+      const log = new PersistedLog(historyName);
+      const newItem = { first: 'selina', last: 'kyle' };
 
-      let items = log.add(newItem);
+      const items = log.add(newItem);
       expect(items.length).to.equal(payload.length + 1);
       expect(items[0]).to.eql(newItem);
     });
@@ -90,40 +89,40 @@ describe('PersistedLog', function () {
 
   describe('stack options', function () {
     it('should observe the maxLength option', function () {
-      let bulkData = [];
+      const bulkData = [];
 
       for (let i = 0; i < historyLimit; i++) {
         bulkData.push(['record ' + i]);
       }
       storage.get.returns(bulkData);
 
-      let log = new PersistedLog(historyName, { maxLength: historyLimit });
+      const log = new PersistedLog(historyName, { maxLength: historyLimit });
       log.add(['new array 1']);
-      let items = log.add(['new array 2']);
+      const items = log.add(['new array 2']);
 
       expect(items.length).to.equal(historyLimit);
     });
 
     it('should observe the filterDuplicates option', function () {
       storage.get.returns(payload.slice(0));
-      let log = new PersistedLog(historyName, { filterDuplicates: true });
-      let newItem = payload[1];
+      const log = new PersistedLog(historyName, { filterDuplicates: true });
+      const newItem = payload[1];
 
-      let items = log.add(newItem);
+      const items = log.add(newItem);
       expect(items.length).to.equal(payload.length);
     });
 
     it ('should truncate the list upon initialization if too long', () => {
       storage.get.returns(payload.slice(0));
-      let log = new PersistedLog(historyName, {maxLength: 1});
-      let items = log.get();
+      const log = new PersistedLog(historyName, { maxLength: 1 });
+      const items = log.get();
       expect(items.length).to.equal(1);
     });
 
     it('should allow a maxLength of 0', () => {
       storage.get.returns(payload.slice(0));
-      let log = new PersistedLog(historyName, {maxLength: 0});
-      let items = log.get();
+      const log = new PersistedLog(historyName, { maxLength: 0 });
+      const items = log.get();
       expect(items.length).to.equal(0);
     });
   });
diff --git a/src/ui/public/persisted_state/__tests__/persisted_state.js b/src/ui/public/persisted_state/__tests__/persisted_state.js
index af6a2deb3c9cf..cf3d4f32a5c1c 100644
--- a/src/ui/public/persisted_state/__tests__/persisted_state.js
+++ b/src/ui/public/persisted_state/__tests__/persisted_state.js
@@ -36,7 +36,7 @@ describe('Persisted State', function () {
     });
 
     it('should create a state instance with data', function () {
-      let val = { red: 'blue' };
+      const val = { red: 'blue' };
       persistedState = new PersistedState(val);
 
       expect(persistedState.get()).to.eql(val);
@@ -45,7 +45,7 @@ describe('Persisted State', function () {
     });
 
     it('should create a copy of the state passed in', function () {
-      let val = { red: 'blue' };
+      const val = { red: 'blue' };
       persistedState = new PersistedState(val);
 
       expect(persistedState.get()).to.eql(val);
@@ -53,10 +53,10 @@ describe('Persisted State', function () {
     });
 
     it('should not throw if creating valid child object', function () {
-      let run = function () {
-        let val = { red: 'blue' };
-        let path = ['test.path'];
-        let parent = new PersistedState();
+      const run = function () {
+        const val = { red: 'blue' };
+        const path = ['test.path'];
+        const parent = new PersistedState();
         new PersistedState(val, path, parent);
       };
 
@@ -64,8 +64,8 @@ describe('Persisted State', function () {
     });
 
     it('should throw if given an invalid value', function () {
-      let run = function () {
-        let val = 'bananas';
+      const run = function () {
+        const val = 'bananas';
         new PersistedState(val);
       };
 
@@ -75,10 +75,10 @@ describe('Persisted State', function () {
     });
 
     it('should not throw if given primitive to child', function () {
-      let run = function () {
-        let val = 'bananas';
-        let path = ['test.path'];
-        let parent = new PersistedState();
+      const run = function () {
+        const val = 'bananas';
+        const path = ['test.path'];
+        const parent = new PersistedState();
         new PersistedState(val, path, parent);
       };
 
@@ -86,10 +86,10 @@ describe('Persisted State', function () {
     });
 
     it('should throw if given an invalid parent object', function () {
-      let run = function () {
-        let val = { red: 'blue' };
-        let path = ['test.path'];
-        let parent = {};
+      const run = function () {
+        const val = { red: 'blue' };
+        const path = ['test.path'];
+        const parent = {};
         new PersistedState(val, path, parent);
       };
 
@@ -99,10 +99,10 @@ describe('Persisted State', function () {
     });
 
     it('should throw if given a parent without a path', function () {
-      let run = function () {
-        let val = { red: 'blue' };
+      const run = function () {
+        const val = { red: 'blue' };
         let path;
-        let parent = new PersistedState();
+        const parent = new PersistedState();
 
         new PersistedState(val, path, parent);
       };
@@ -117,8 +117,8 @@ describe('Persisted State', function () {
     let childState;
 
     it('should not append the child state to the parent, without parent value', function () {
-      let childIndex = 'i can haz child';
-      let persistedState = new PersistedState();
+      const childIndex = 'i can haz child';
+      const persistedState = new PersistedState();
       childState = persistedState.createChild(childIndex);
 
       // parent state should not contain the child state
@@ -127,9 +127,9 @@ describe('Persisted State', function () {
     });
 
     it('should not append the child state to the parent, with parent value', function () {
-      let childIndex = 'i can haz child';
-      let persistedStateValue = { original: true };
-      let persistedState = new PersistedState(persistedStateValue);
+      const childIndex = 'i can haz child';
+      const persistedStateValue = { original: true };
+      const persistedState = new PersistedState(persistedStateValue);
       childState = persistedState.createChild(childIndex);
 
       // child state should be empty, we didn't give it any default data
@@ -141,14 +141,14 @@ describe('Persisted State', function () {
     });
 
     it('should append the child state to the parent, with parent and child values', function () {
-      let childIndex = 'i can haz child';
-      let childStateValue = { tacos: 'yes please' };
-      let persistedStateValue = { original: true };
-      let persistedState = new PersistedState(persistedStateValue);
+      const childIndex = 'i can haz child';
+      const childStateValue = { tacos: 'yes please' };
+      const persistedStateValue = { original: true };
+      const persistedState = new PersistedState(persistedStateValue);
       childState = persistedState.createChild(childIndex, childStateValue);
 
       // parent state should contain the child and its original state value
-      let parentState = persistedState.get();
+      const parentState = persistedState.get();
       expect(parentState).to.have.property('original', true);
       expect(parentState).to.have.property(childIndex);
       expect(parentState[childIndex]).to.eql(childStateValue);
@@ -157,15 +157,15 @@ describe('Persisted State', function () {
 
   describe('deep child state creation', function () {
     it('should delegate get/set calls to parent state', function () {
-      let children = [{
+      const children = [{
         path: 'first*child',
         value: { first: true, second: false }
       }, {
         path: 'second child',
         value: { first: false, second: true }
       }];
-      let persistedStateValue = { original: true };
-      let persistedState = new PersistedState(persistedStateValue);
+      const persistedStateValue = { original: true };
+      const persistedState = new PersistedState(persistedStateValue);
 
       // first child is a child of the parent persistedState
       children[0].instance = persistedState.createChild(children[0].path, children[0].value);
@@ -176,7 +176,7 @@ describe('Persisted State', function () {
       expect(children[1].instance.get()).to.eql(children[1].value);
 
       // parent should contain original props and first child path, but not the second child path
-      let parentState = persistedState.get();
+      const parentState = persistedState.get();
       _.keys(persistedStateValue).forEach(function (key) {
         expect(parentState).to.have.property(key);
       });
@@ -184,39 +184,39 @@ describe('Persisted State', function () {
       expect(parentState).to.not.have.property(children[1].path);
 
       // second child path should be inside the first child
-      let firstChildState = children[0].instance.get();
+      const firstChildState = children[0].instance.get();
       expect(firstChildState).to.have.property(children[1].path);
       expect(firstChildState[children[1].path]).to.eql(children[1].value);
 
       // check that the second child is still accessible from the parent instance
-      let firstChild = persistedState.get(children[0].path);
+      const firstChild = persistedState.get(children[0].path);
       expect(firstChild).to.have.property(children[1].path);
     });
   });
 
   describe('child state removal', function () {
     it('should clear path from parent state', function () {
-      let persistedState = new PersistedState();
-      let childState = persistedState.createChild('child', { userId: 1234 });
-      expect(persistedState.get()).to.eql({ child: { userId: 1234 }});
+      const persistedState = new PersistedState();
+      persistedState.createChild('child', { userId: 1234 });
+      expect(persistedState.get()).to.eql({ child: { userId: 1234 } });
       persistedState.removeChild('child');
       expect(persistedState.get()).to.eql({});
     });
 
     it('should reset original parent value at path', function () {
-      let persistedState = new PersistedState({ user: 1234 });
-      let childState = persistedState.createChild('user', { id: 5678 });
-      expect(persistedState.get()).to.eql({ user: { id: 5678 }});
+      const persistedState = new PersistedState({ user: 1234 });
+      persistedState.createChild('user', { id: 5678 });
+      expect(persistedState.get()).to.eql({ user: { id: 5678 } });
 
       persistedState.removeChild('user');
       expect(persistedState.get()).to.eql({ user: 1234 });
     });
 
     it('should clear changedState', function () {
-      let persistedState = new PersistedState({ user: 1234 });
-      let childState = persistedState.createChild('user');
+      const persistedState = new PersistedState({ user: 1234 });
+      const childState = persistedState.createChild('user');
       childState.set('name', 'user name');
-      expect(persistedState.getChanges()).to.eql({ user: { name: 'user name' }});
+      expect(persistedState.getChanges()).to.eql({ user: { name: 'user name' } });
 
       persistedState.removeChild('user');
       expect(persistedState.getChanges()).to.eql({});
@@ -225,36 +225,36 @@ describe('Persisted State', function () {
 
   describe('deep child state removal', function () {
     it('should clear path from parent state', function () {
-      let persistedState = new PersistedState();
-      let childState = persistedState.createChild('child.state', { userId: 1234 });
-      expect(persistedState.get()).to.eql({ child: { state: { userId: 1234 }}});
+      const persistedState = new PersistedState();
+      persistedState.createChild('child.state', { userId: 1234 });
+      expect(persistedState.get()).to.eql({ child: { state: { userId: 1234 } } });
       persistedState.removeChild('child.state');
       expect(persistedState.get()).to.eql({});
     });
 
     it('should reset original parent value at path', function () {
-      let persistedState = new PersistedState({ user: { id: 1234 }});
-      let childState = persistedState.createChild('user.id', 5678);
-      expect(persistedState.get()).to.eql({ user: { id: 5678 }});
+      const persistedState = new PersistedState({ user: { id: 1234 } });
+      persistedState.createChild('user.id', 5678);
+      expect(persistedState.get()).to.eql({ user: { id: 5678 } });
 
       persistedState.removeChild('user.id');
-      expect(persistedState.get()).to.eql({ user: { id: 1234 }});
+      expect(persistedState.get()).to.eql({ user: { id: 1234 } });
     });
 
     it('should reset original parent other values at path', function () {
-      let persistedState = new PersistedState({ user: { name: 'user' }});
-      let childState = persistedState.createChild('user.id', 5678);
-      expect(persistedState.get()).to.eql({ user: { name: 'user', id: 5678 }});
+      const persistedState = new PersistedState({ user: { name: 'user' } });
+      persistedState.createChild('user.id', 5678);
+      expect(persistedState.get()).to.eql({ user: { name: 'user', id: 5678 } });
 
       persistedState.removeChild('user.id');
-      expect(persistedState.get()).to.eql({ user: { name: 'user' }});
+      expect(persistedState.get()).to.eql({ user: { name: 'user' } });
     });
 
     it('should clear the changed state', function () {
-      let persistedState = new PersistedState({ user: { id: 1234 }});
-      let childState = persistedState.createChild('user.name');
+      const persistedState = new PersistedState({ user: { id: 1234 } });
+      const childState = persistedState.createChild('user.name');
       childState.set('user name');
-      expect(persistedState.getChanges()).to.eql({ user: { name: 'user name' }});
+      expect(persistedState.getChanges()).to.eql({ user: { name: 'user name' } });
 
       persistedState.removeChild('user.name');
       expect(persistedState.getChanges()).to.eql({});
@@ -264,8 +264,8 @@ describe('Persisted State', function () {
 
   describe('child state conditions', function () {
     it('should be merged with the parent state', function () {
-      let parent = new PersistedState({ name: 'test' });
-      let child = parent.createChild('child', 'value');
+      const parent = new PersistedState({ name: 'test' });
+      parent.createChild('child', 'value');
       expect(parent.get()).to.eql({
         name: 'test',
         child: 'value'
@@ -285,8 +285,8 @@ describe('Persisted State', function () {
     });
 
     it('should give child state precedence', function () {
-      let parent = new PersistedState({ user: { id: 1234, name: 'test' }});
-      let child = parent.createChild('user', { name: 'child test' });
+      const parent = new PersistedState({ user: { id: 1234, name: 'test' } });
+      parent.createChild('user', { name: 'child test' });
       expect(parent.get()).to.eql({
         user: {
           id: 1234,
@@ -295,12 +295,12 @@ describe('Persisted State', function () {
       });
 
       parent.set({});
-      expect(parent.get()).to.eql({ user: { name: 'child test' }});
+      expect(parent.get()).to.eql({ user: { name: 'child test' } });
     });
 
     it('should be cleaned up with removeChild', function () {
-      let parent = new PersistedState({ name: 'test' });
-      let child = parent.createChild('child', 'value');
+      const parent = new PersistedState({ name: 'test' });
+      parent.createChild('child', 'value');
       expect(parent.get()).to.eql({
         name: 'test',
         child: 'value'
@@ -315,16 +315,16 @@ describe('Persisted State', function () {
 
   describe('colliding child paths and parent state values', function () {
     it('should not change the child path value by default', function () {
-      let childIndex = 'childTest';
-      let persistedStateValue = {};
+      const childIndex = 'childTest';
+      const persistedStateValue = {};
       persistedStateValue[childIndex] = { overlapping_index: true };
 
-      let persistedState = new PersistedState(persistedStateValue);
+      const persistedState = new PersistedState(persistedStateValue);
       let state = persistedState.get();
       expect(state).to.have.property(childIndex);
       expect(state[childIndex]).to.eql(persistedStateValue[childIndex]);
 
-      let childState = persistedState.createChild(childIndex);
+      const childState = persistedState.createChild(childIndex);
       expect(childState.get()).to.eql(persistedStateValue[childIndex]);
 
       // make sure the parent state is still the same
@@ -334,21 +334,21 @@ describe('Persisted State', function () {
     });
 
     it('should merge default child state', function () {
-      let childIndex = 'childTest';
-      let childStateValue = { child_index: false };
-      let persistedStateValue = {};
+      const childIndex = 'childTest';
+      const childStateValue = { child_index: false };
+      const persistedStateValue = {};
       persistedStateValue[childIndex] = { parent_index: true };
 
-      let persistedState = new PersistedState(persistedStateValue);
+      const persistedState = new PersistedState(persistedStateValue);
       let state = persistedState.get();
       expect(state).to.have.property(childIndex);
       expect(state[childIndex]).to.eql(persistedStateValue[childIndex]);
 
       // pass in child state value
-      let childState = persistedState.createChild(childIndex, childStateValue);
+      const childState = persistedState.createChild(childIndex, childStateValue);
 
       // parent's default state is merged with child state
-      let compare = _.merge({}, childStateValue, persistedStateValue[childIndex]);
+      const compare = _.merge({}, childStateValue, persistedStateValue[childIndex]);
       expect(childState.get()).to.eql(compare);
       state = persistedState.get();
       expect(state).to.have.property(childIndex);
@@ -358,11 +358,11 @@ describe('Persisted State', function () {
 
   describe('mutation', function () {
     it('should not mutate the internal object', function () {
-      let persistedStateValue = { hello: 'world' };
-      let insertedObj = { farewell: 'cruel world' };
-      let persistedState = new PersistedState(persistedStateValue);
+      const persistedStateValue = { hello: 'world' };
+      const insertedObj = { farewell: 'cruel world' };
+      const persistedState = new PersistedState(persistedStateValue);
 
-      let obj = persistedState.get();
+      const obj = persistedState.get();
       _.assign(obj, insertedObj);
 
       expect(obj).to.have.property('farewell');
@@ -379,38 +379,38 @@ describe('Persisted State', function () {
 
     describe('exporting state to JSON', function () {
       it('should return the full JSON representation', function () {
-        let persistedState = new PersistedState(persistedStateValue);
+        const persistedState = new PersistedState(persistedStateValue);
 
-        let json = persistedState.toJSON();
+        const json = persistedState.toJSON();
         expect(json).to.eql(persistedStateValue);
       });
 
       it('should return the JSON representation of the child state', function () {
-        let persistedState = new PersistedState(persistedStateValue);
-        let childState = persistedState.createChild('awesome', { pants: false });
+        const persistedState = new PersistedState(persistedStateValue);
+        const childState = persistedState.createChild('awesome', { pants: false });
 
         expect(childState.toJSON()).to.eql({ pants: false });
         // verify JSON output of the parent state
-        let parentCompare = _.assign({ awesome: { pants: false }}, persistedStateValue);
+        const parentCompare = _.assign({ awesome: { pants: false } }, persistedStateValue);
         expect(persistedState.toJSON()).to.eql(parentCompare);
       });
 
       it('should export stringified version of state', function () {
-        let persistedState = new PersistedState(persistedStateValue);
-        let childState = persistedState.createChild('awesome', { pants: false });
+        const persistedState = new PersistedState(persistedStateValue);
+        const childState = persistedState.createChild('awesome', { pants: false });
 
-        let data = childState.toString();
+        const data = childState.toString();
         expect(JSON.parse(data)).to.eql({ pants: false });
         // verify JSON output of the parent state
-        let parentCompare = _.assign({ awesome: { pants: false }}, persistedStateValue);
+        const parentCompare = _.assign({ awesome: { pants: false } }, persistedStateValue);
         expect(JSON.parse(persistedState.toString())).to.eql(parentCompare);
       });
     });
 
     describe('importing state from JSON string (hydration)', function () {
       it('should set the state from JSON string input', function () {
-        let stateJSON = JSON.stringify(persistedStateValue);
-        let persistedState = new PersistedState();
+        const stateJSON = JSON.stringify(persistedStateValue);
+        const persistedState = new PersistedState();
         expect(persistedState.get()).to.eql({});
 
         persistedState.fromString(stateJSON);
@@ -421,7 +421,7 @@ describe('Persisted State', function () {
 
   describe('get state', function () {
     it('should perform deep gets with various formats', function () {
-      let obj = {
+      const obj = {
         red: {
           green: {
             blue: 'yellow'
@@ -432,7 +432,7 @@ describe('Persisted State', function () {
           violet: ''
         }
       };
-      let persistedState = new PersistedState(obj);
+      const persistedState = new PersistedState(obj);
       expect(persistedState.get()).to.eql(obj);
 
       expect(persistedState.get('red')).to.eql({ green: { blue: 'yellow' } });
@@ -451,7 +451,7 @@ describe('Persisted State', function () {
     });
 
     it('should perform deep gets with arrays', function () {
-      let persistedState = new PersistedState({ hello: { nouns: ['world', 'humans', 'everyone'] } });
+      const persistedState = new PersistedState({ hello: { nouns: ['world', 'humans', 'everyone'] } });
 
       expect(persistedState.get()).to.eql({ hello: { nouns: ['world', 'humans', 'everyone'] } });
       expect(persistedState.get('hello')).to.eql({ nouns: ['world', 'humans', 'everyone'] });
@@ -459,9 +459,9 @@ describe('Persisted State', function () {
     });
 
     it('should pass defaults to parent delegation', function () {
-      let persistedState = new PersistedState({ parent: true });
-      let childState = persistedState.createChild('child', { account: { name: 'first child' }});
-      let defaultValue = 'i have no data';
+      const persistedState = new PersistedState({ parent: true });
+      const childState = persistedState.createChild('child', { account: { name: 'first child' } });
+      const defaultValue = 'i have no data';
 
       expect(childState.get('account.name', defaultValue)).to.eql('first child');
       expect(childState.get('account.age', defaultValue)).to.eql(defaultValue);
@@ -471,27 +471,27 @@ describe('Persisted State', function () {
   describe('set state', function () {
     describe('path format support', function () {
       it('should create deep objects from dot notation', function () {
-        let persistedState = new PersistedState();
+        const persistedState = new PersistedState();
         persistedState.set('one.two.three', 4);
         expect(persistedState.get()).to.eql({ one: { two: { three: 4 } } });
       });
 
       it('should create deep objects from array notation', function () {
-        let persistedState = new PersistedState();
+        const persistedState = new PersistedState();
         persistedState.set('one[two][three]', 4);
         expect(persistedState.get()).to.eql({ one: { two: { three: 4 } } });
       });
 
       it('should create deep objects from arrays', function () {
-        let persistedState = new PersistedState();
+        const persistedState = new PersistedState();
         persistedState.set(['one', 'two', 'three'], 4);
         expect(persistedState.get()).to.eql({ one: { two: { three: 4 } } });
       });
 
       it('should create deep objects with an existing path', function () {
-        let persistedState = new PersistedState({}, 'deep.path');
+        const persistedState = new PersistedState({}, 'deep.path');
         persistedState.set('green[red].blue', 4);
-        expect(persistedState.get()).to.eql({ green: { red: { blue: 4 } }});
+        expect(persistedState.get()).to.eql({ green: { red: { blue: 4 } } });
       });
     });
 
@@ -527,7 +527,7 @@ describe('Persisted State', function () {
         expect(persistedState.get()).to.eql({ hello: { message: 'world' } });
 
         persistedState.set('hello', { length: 5 });
-        expect(persistedState.get()).to.eql({ hello: { length: 5 }});
+        expect(persistedState.get()).to.eql({ hello: { length: 5 } });
       });
     });
 
@@ -555,19 +555,19 @@ describe('Persisted State', function () {
 
   describe('internal state tracking', function () {
     it('should be an empty object', function () {
-      let persistedState = new PersistedState();
+      const persistedState = new PersistedState();
       expect(persistedState._defaultState).to.eql({});
     });
 
     it('should store the default state value', function () {
-      let val = { one: 1, two: 2 };
-      let persistedState = new PersistedState(val);
+      const val = { one: 1, two: 2 };
+      const persistedState = new PersistedState(val);
       expect(persistedState._defaultState).to.eql(val);
     });
 
     it('should keep track of changes', function () {
-      let val = { one: 1, two: 2 };
-      let persistedState = new PersistedState(val);
+      const val = { one: 1, two: 2 };
+      const persistedState = new PersistedState(val);
 
       persistedState.set('two', 22);
       expect(persistedState._defaultState).to.eql(val);
@@ -579,14 +579,14 @@ describe('Persisted State', function () {
     let persistedState;
     let emitter;
 
-    let getByType = function (type, spy) {
+    const getByType = function (type, spy) {
       spy = spy || emitter;
       return spy.getCalls().filter(function (call) {
         return call.args[0] === type;
       });
     };
 
-    let watchEmitter = function (state) {
+    const watchEmitter = function (state) {
       return sinon.spy(state, 'emit');
     };
 
@@ -667,7 +667,7 @@ describe('Persisted State', function () {
     });
 
     it('should emit on parent and child instances', function (done) {
-      let child = persistedState.createChild('checker');
+      const child = persistedState.createChild('checker');
       expect(getByType('change')).to.have.length(0);
 
       // parent and child should emit, set up listener to test
diff --git a/src/ui/public/persisted_state/persisted_state.js b/src/ui/public/persisted_state/persisted_state.js
index d883732fb3a08..31e861f99c0f2 100644
--- a/src/ui/public/persisted_state/persisted_state.js
+++ b/src/ui/public/persisted_state/persisted_state.js
@@ -11,7 +11,7 @@ import SimpleEmitter from 'ui/utils/simple_emitter';
 import EventsProvider from 'ui/events';
 
 export default function (Private) {
-  let Events = Private(EventsProvider);
+  const Events = Private(EventsProvider);
 
   function validateParent(parent, path) {
     if (path.length <= 0) {
@@ -23,7 +23,7 @@ export default function (Private) {
   }
 
   function validateValue(value) {
-    let msg = 'State value must be a plain object';
+    const msg = 'State value must be a plain object';
     if (!value) return;
     if (!_.isPlainObject(value)) throw new errors.PersistedStateError(msg);
   }
@@ -79,21 +79,21 @@ export default function (Private) {
   };
 
   PersistedState.prototype.set = function (key, value) {
-    let params = prepSetParams(key, value, this._path);
-    let val = this._set(params.key, params.value);
+    const params = prepSetParams(key, value, this._path);
+    const val = this._set(params.key, params.value);
     this.emit('set');
     return val;
   };
 
   PersistedState.prototype.setSilent = function (key, value) {
-    let params = prepSetParams(key, value, this._path);
+    const params = prepSetParams(key, value, this._path);
     return this._set(params.key, params.value, true);
   };
 
   PersistedState.prototype.reset = function (path) {
-    let keyPath = this._getIndex(path);
-    let origValue = _.get(this._defaultState, keyPath);
-    let currentValue = _.get(this._mergedState, keyPath);
+    const keyPath = this._getIndex(path);
+    const origValue = _.get(this._defaultState, keyPath);
+    const currentValue = _.get(this._mergedState, keyPath);
 
     if (_.isUndefined(origValue)) {
       this._cleanPath(path, this._mergedState);
@@ -114,7 +114,7 @@ export default function (Private) {
   };
 
   PersistedState.prototype.removeChild = function (path) {
-    let origValue = _.get(this._defaultState, this._getIndex(path));
+    const origValue = _.get(this._defaultState, this._getIndex(path));
 
     if (_.isUndefined(origValue)) {
       this.reset(path);
@@ -145,19 +145,19 @@ export default function (Private) {
   };
 
   PersistedState.prototype._getPartialIndex = function (key) {
-    let keyPath = this._getIndex(key);
+    const keyPath = this._getIndex(key);
     return keyPath.slice(this._path.length);
   };
 
   PersistedState.prototype._cleanPath = function (path, stateTree) {
-    let partialPath = this._getPartialIndex(path);
+    const partialPath = this._getPartialIndex(path);
     let remove = true;
 
     // recursively delete value tree, when no other keys exist
     while (partialPath.length > 0) {
-      let lastKey = partialPath.splice(partialPath.length - 1, 1)[0];
-      let statePath = this._path.concat(partialPath);
-      let stateVal = statePath.length > 0 ? _.get(stateTree, statePath) : stateTree;
+      const lastKey = partialPath.splice(partialPath.length - 1, 1)[0];
+      const statePath = this._path.concat(partialPath);
+      const stateVal = statePath.length > 0 ? _.get(stateTree, statePath) : stateTree;
 
       // if stateVal isn't an object, do nothing
       if (!_.isPlainObject(stateVal)) return;
@@ -168,13 +168,13 @@ export default function (Private) {
   };
 
   PersistedState.prototype._getDefault = function () {
-    let def = (this._hasPath()) ? undefined : {};
+    const def = (this._hasPath()) ? undefined : {};
     return (this._parent ? this.get() : def);
   };
 
   PersistedState.prototype._setPath = function (path) {
-    let isString = _.isString(path);
-    let isArray = _.isArray(path);
+    const isString = _.isString(path);
+    const isArray = _.isArray(path);
 
     if (!isString && !isArray) return [];
     return (isString) ? [this._getIndex(path)] : path;
@@ -202,11 +202,11 @@ export default function (Private) {
   };
 
   PersistedState.prototype._set = function (key, value, silent, initialChildState) {
-    let self = this;
+    const self = this;
     let stateChanged = false;
-    let initialState = !this._initialized;
-    let keyPath = this._getIndex(key);
-    let hasKeyPath = keyPath.length > 0;
+    const initialState = !this._initialized;
+    const keyPath = this._getIndex(key);
+    const hasKeyPath = keyPath.length > 0;
 
     // if this is the initial state value, save value as the default
     if (initialState) {
@@ -232,7 +232,7 @@ export default function (Private) {
         }
       } else {
         // check for changes at path, emit an event when different
-        let curVal = hasKeyPath ? this.get(keyPath) : this._mergedState;
+        const curVal = hasKeyPath ? this.get(keyPath) : this._mergedState;
         stateChanged = !_.isEqual(curVal, value);
 
         if (!initialChildState) {
@@ -249,11 +249,11 @@ export default function (Private) {
     }
 
     // update the merged state value
-    let targetObj = this._mergedState || _.cloneDeep(this._defaultState);
-    let sourceObj = _.merge({}, this._defaultChildState, this._changedState);
+    const targetObj = this._mergedState || _.cloneDeep(this._defaultState);
+    const sourceObj = _.merge({}, this._defaultChildState, this._changedState);
 
     // handler arguments are (targetValue, sourceValue, key, target, source)
-    let mergeMethod = function (targetValue, sourceValue, mergeKey) {
+    const mergeMethod = function (targetValue, sourceValue, mergeKey) {
       // if not initial state, skip default merge method (ie. return value, see note below)
       if (!initialState && !initialChildState && _.isEqual(keyPath, self._getIndex(mergeKey))) {
         // use the sourceValue or fall back to targetValue
@@ -275,4 +275,4 @@ export default function (Private) {
   };
 
   return PersistedState;
-};
+}
diff --git a/src/ui/public/private/__tests__/private.js b/src/ui/public/private/__tests__/private.js
index fc3dab39d3436..3f27e37f5b95d 100644
--- a/src/ui/public/private/__tests__/private.js
+++ b/src/ui/public/private/__tests__/private.js
@@ -11,12 +11,12 @@ describe('Private module loader', function () {
   }));
 
   it('accepts a provider that will be called to init a module', function () {
-    let football = {};
+    const football = {};
     function Provider() {
       return football;
     }
 
-    let instance = Private(Provider);
+    const instance = Private(Provider);
     expect(instance).to.be(football);
   });
 
@@ -25,25 +25,21 @@ describe('Private module loader', function () {
       return Private;
     }
 
-    let instance = Private(Provider);
+    const instance = Private(Provider);
     expect(instance).to.be(Private);
   });
 
   it('detects circular dependencies', function () {
     expect(function () {
-      function Provider1() {
-        let p3 = Private(Provider3);
-      }
-
-      function Provider2() {
-        let p3 = Private(Provider3);
+      function ProviderA() {
+        Private(ProviderB);
       }
 
-      function Provider3() {
-        let p1 = Private(Provider3);
+      function ProviderB() {
+        Private(ProviderA);
       }
 
-      let p1 = Private(Provider1);
+      Private(ProviderA);
     }).to.throwException(/circular/i);
   });
 
@@ -57,24 +53,24 @@ describe('Private module loader', function () {
 
   describe('#stub', function () {
     it('accepts a replacement instance for a Provider', function () {
-      let replaced = {};
-      let replacement = {};
+      const replaced = {};
+      const replacement = {};
 
       function Provider() {
         return replaced;
       }
 
-      let instance = Private(Provider);
+      const instance = Private(Provider);
       expect(instance).to.be(replaced);
 
       Private.stub(Provider, replacement);
 
-      let instance2 = Private(Provider);
+      const instance2 = Private(Provider);
       expect(instance2).to.be(replacement);
 
       Private.stub(Provider, replaced);
 
-      let instance3 = Private(Provider);
+      const instance3 = Private(Provider);
       expect(instance3).to.be(replaced);
     });
   });
@@ -89,18 +85,18 @@ describe('Private module loader', function () {
         return {};
       }
 
-      let instance1 = Private(Provider1);
+      const instance1 = Private(Provider1);
       expect(instance1).to.be.an('object');
 
       Private.swap(Provider1, Provider2);
 
-      let instance2 = Private(Provider1);
+      const instance2 = Private(Provider1);
       expect(instance2).to.be.an('object');
       expect(instance2).to.not.be(instance1);
 
       Private.swap(Provider1, Provider1);
 
-      let instance3 = Private(Provider1);
+      const instance3 = Private(Provider1);
       expect(instance3).to.be(instance1);
     });
 
@@ -115,12 +111,12 @@ describe('Private module loader', function () {
         };
       }
 
-      let instance1 = Private(Provider1);
+      const instance1 = Private(Provider1);
       expect(instance1).to.be.an('object');
 
       Private.swap(Provider1, Provider2);
 
-      let instance2 = Private(Provider1);
+      const instance2 = Private(Provider1);
       expect(instance2).to.have.property('instance1');
       expect(instance2.instance1).to.be(instance1);
     });
diff --git a/src/ui/public/private/private.js b/src/ui/public/private/private.js
index 176561512c4cd..58f25198aeda7 100644
--- a/src/ui/public/private/private.js
+++ b/src/ui/public/private/private.js
@@ -87,7 +87,7 @@ import uiModules from 'ui/modules';
  */
 
 
-let nextId = _.partial(_.uniqueId, 'privateProvider#');
+const nextId = _.partial(_.uniqueId, 'privateProvider#');
 
 function name(fn) {
   return fn.name || fn.toString().split('\n').shift();
@@ -95,11 +95,11 @@ function name(fn) {
 
 uiModules.get('kibana')
 .provider('Private', function () {
-  let provider = this;
+  const provider = this;
 
   // one cache/swaps per Provider
-  let cache = {};
-  let swaps = {};
+  const cache = {};
+  const swaps = {};
 
   // return the uniq id for this function
   function identify(fn) {
@@ -117,15 +117,15 @@ uiModules.get('kibana')
   };
 
   provider.swap = function (fn, prov) {
-    let id = identify(fn);
+    const id = identify(fn);
     swaps[id] = prov;
   };
 
   provider.$get = ['$injector', function PrivateFactory($injector) {
 
     // prevent circular deps by tracking where we came from
-    let privPath = [];
-    let pathToString = function () {
+    const privPath = [];
+    const pathToString = function () {
       return privPath.map(name).join(' -> ');
     };
 
@@ -140,7 +140,7 @@ uiModules.get('kibana')
 
       privPath.push(prov);
 
-      let context = {};
+      const context = {};
       let instance = $injector.invoke(prov, context, locals);
       if (!_.isObject(instance)) instance = context;
 
diff --git a/src/ui/public/promises/__tests__/promises.js b/src/ui/public/promises/__tests__/promises.js
index 9ded576e76cf3..f623e54da5f64 100644
--- a/src/ui/public/promises/__tests__/promises.js
+++ b/src/ui/public/promises/__tests__/promises.js
@@ -31,8 +31,8 @@ describe('Promise service', function () {
     });
 
     it('rejects if the callback receives an error', function () {
-      let errback = sinon.stub();
-      let err = new Error();
+      const errback = sinon.stub();
+      const err = new Error();
       Promise.fromNode(cb => cb(err)).catch(errback);
       $rootScope.$apply();
 
@@ -41,8 +41,8 @@ describe('Promise service', function () {
     });
 
     it('resolves with the second argument', function () {
-      let thenback = sinon.stub();
-      let result = {};
+      const thenback = sinon.stub();
+      const result = {};
       Promise.fromNode(cb => cb(null, result)).then(thenback);
       $rootScope.$apply();
 
@@ -51,9 +51,9 @@ describe('Promise service', function () {
     });
 
     it('resolves with an array if multiple arguments are received', function () {
-      let thenback = sinon.stub();
-      let result1 = {};
-      let result2 = {};
+      const thenback = sinon.stub();
+      const result1 = {};
+      const result2 = {};
       Promise.fromNode(cb => cb(null, result1, result2)).then(thenback);
       $rootScope.$apply();
 
@@ -63,7 +63,7 @@ describe('Promise service', function () {
     });
 
     it('resolves with an array if multiple undefined are received', function () {
-      let thenback = sinon.stub();
+      const thenback = sinon.stub();
       Promise.fromNode(cb => cb(null, undefined, undefined)).then(thenback);
       $rootScope.$apply();
 
diff --git a/src/ui/public/promises/promises.js b/src/ui/public/promises/promises.js
index a2d1ef5249c28..8e3ed9c0b3f17 100644
--- a/src/ui/public/promises/promises.js
+++ b/src/ui/public/promises/promises.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import uiModules from 'ui/modules';
 
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 // Provides a tiny subset of the excelent API from
 // bluebird, reimplemented using the $q service
@@ -9,7 +9,7 @@ module.service('Promise', function ($q, $timeout) {
   function Promise(fn) {
     if (typeof this === 'undefined') throw new Error('Promise constructor must be called with "new"');
 
-    let defer = $q.defer();
+    const defer = $q.defer();
     try {
       fn(defer.resolve, defer.reject);
     } catch (e) {
@@ -20,12 +20,12 @@ module.service('Promise', function ($q, $timeout) {
 
   Promise.all = Promise.props = $q.all;
   Promise.resolve = function (val) {
-    let defer = $q.defer();
+    const defer = $q.defer();
     defer.resolve(val);
     return defer.promise;
   };
   Promise.reject = function (reason) {
-    let defer = $q.defer();
+    const defer = $q.defer();
     defer.reject(reason);
     return defer.promise;
   };
@@ -36,7 +36,7 @@ module.service('Promise', function ($q, $timeout) {
   };
   Promise.method = function (fn) {
     return function () {
-      let args = Array.prototype.slice.call(arguments);
+      const args = Array.prototype.slice.call(arguments);
       return Promise.try(fn, args, this);
     };
   };
@@ -51,7 +51,7 @@ module.service('Promise', function ($q, $timeout) {
     }));
   };
   Promise.each = function (arr, fn) {
-    let queue = arr.slice(0);
+    const queue = arr.slice(0);
     let i = 0;
     return (function next() {
       if (!queue.length) return arr;
@@ -64,7 +64,7 @@ module.service('Promise', function ($q, $timeout) {
     return obj && typeof obj.then === 'function';
   };
   Promise.halt = _.once(function () {
-    let promise = new Promise();
+    const promise = new Promise();
     promise.then = _.constant(promise);
     promise.catch = _.constant(promise);
     return promise;
@@ -155,7 +155,7 @@ module.factory('PromiseEmitter', function (Promise) {
    * @return {Promise}
    */
   function PromiseEmitter(fn, handler) {
-    let prom = new Promise(fn);
+    const prom = new Promise(fn);
 
     if (!handler) return prom;
 
diff --git a/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js
index 576fa9f0bd9ae..1b1f8bafba505 100644
--- a/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js
+++ b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js
@@ -8,11 +8,11 @@ import EventsProvider from 'ui/events';
 import ReflowWatcherProvider from 'ui/reflow_watcher';
 describe('Reflow watcher', function () {
 
-  let $body = $(document.body);
-  let $window = $(window);
-  let expectStubbedEventAndEl = function (stub, event, $el) {
+  const $body = $(document.body);
+  const $window = $(window);
+  const expectStubbedEventAndEl = function (stub, event, $el) {
     expect(stub.getCalls().some(function (call) {
-      let events = call.args[0].split(' ');
+      const events = call.args[0].split(' ');
       return _.contains(events, event) && $el.is(call.thisValue);
     })).to.be(true);
   };
@@ -70,7 +70,7 @@ describe('Reflow watcher', function () {
   });
 
   it('triggers the "reflow" event within a new angular tick', function () {
-    let stub = sinon.stub();
+    const stub = sinon.stub();
     reflowWatcher.on('reflow', stub);
     reflowWatcher.trigger();
 
diff --git a/src/ui/public/reflow_watcher/reflow_watcher.js b/src/ui/public/reflow_watcher/reflow_watcher.js
index 2592cc9e4bc12..97266699a927d 100644
--- a/src/ui/public/reflow_watcher/reflow_watcher.js
+++ b/src/ui/public/reflow_watcher/reflow_watcher.js
@@ -1,15 +1,14 @@
-import angular from 'angular';
 import $ from 'jquery';
 import _ from 'lodash';
 import EventsProvider from 'ui/events';
 export default function ReflowWatcherService(Private, $rootScope, $http) {
 
-  let EventEmitter = Private(EventsProvider);
-  let $body = $(document.body);
-  let $window = $(window);
+  const EventEmitter = Private(EventsProvider);
+  const $body = $(document.body);
+  const $window = $(window);
 
-  let MOUSE_EVENTS = 'mouseup';
-  let WINDOW_EVENTS = 'resize';
+  const MOUSE_EVENTS = 'mouseup';
+  const WINDOW_EVENTS = 'resize';
 
   _.class(ReflowWatcher).inherits(EventEmitter);
   /**
@@ -64,4 +63,4 @@ export default function ReflowWatcherService(Private, $rootScope, $http) {
   };
 
   return new ReflowWatcher();
-};
+}
diff --git a/src/ui/public/registry/__tests__/index.js b/src/ui/public/registry/__tests__/index.js
index 85091d32bc754..15508dedb851a 100644
--- a/src/ui/public/registry/__tests__/index.js
+++ b/src/ui/public/registry/__tests__/index.js
@@ -1,11 +1,8 @@
-import _ from 'lodash';
-import sinon from 'auto-release-sinon';
 import registry from 'ui/registry/_registry';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 describe('Registry', function () {
   let Private;
-  let IndexedArray;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector) {
@@ -13,14 +10,14 @@ describe('Registry', function () {
   }));
 
   it('is technically a function', function () {
-    let reg = registry();
+    const reg = registry();
     expect(reg).to.be.a('function');
   });
 
   describe('#register', function () {
     it('accepts a Private module', function () {
-      let reg = registry();
-      let mod = function SomePrivateModule() {};
+      const reg = registry();
+      const mod = function SomePrivateModule() {};
 
       reg.register(mod);
       // modules are not exposed, so this is the most that we can test
@@ -29,13 +26,13 @@ describe('Registry', function () {
 
   describe('as a module', function () {
     it('exposes the list of registered modules', function () {
-      let reg = registry();
-      let mod = function SomePrivateModule(Private) {
+      const reg = registry();
+      const mod = function SomePrivateModule(Private) {
         this.PrivateModuleLoader = Private;
       };
 
       reg.register(mod);
-      let modules = Private(reg);
+      const modules = Private(reg);
       expect(modules).to.have.length(1);
       expect(modules[0]).to.have.property('PrivateModuleLoader', Private);
     });
@@ -43,16 +40,15 @@ describe('Registry', function () {
 
   describe('spec', function () {
     it('executes with the module list as "this", and can override it', function () {
-      let i = 0;
       let self;
 
-      let reg = registry({
+      const reg = registry({
         constructor: function () {
           return { mods: (self = this) };
         }
       });
 
-      let modules = Private(reg);
+      const modules = Private(reg);
       expect(modules).to.be.an('object');
       expect(modules).to.have.property('mods', self);
     });
@@ -60,7 +56,7 @@ describe('Registry', function () {
 
   describe('spec.name', function () {
     it('sets the displayName of the registry and the name param on the final instance', function () {
-      let reg = registry({
+      const reg = registry({
         name: 'visTypes'
       });
 
@@ -72,27 +68,26 @@ describe('Registry', function () {
   describe('spec.constructor', function () {
     it('executes before the modules are returned', function () {
       let i = 0;
-      let reg = registry({
+
+      registry({
         constructor: function () {
           i = i + 1;
         }
       });
 
-      let modules = Private(reg);
       expect(i).to.be(1);
     });
 
     it('executes with the module list as "this", and can override it', function () {
-      let i = 0;
       let self;
 
-      let reg = registry({
+      const reg = registry({
         constructor: function () {
           return { mods: (self = this) };
         }
       });
 
-      let modules = Private(reg);
+      const modules = Private(reg);
       expect(modules).to.be.an('object');
       expect(modules).to.have.property('mods', self);
     });
@@ -100,13 +95,13 @@ describe('Registry', function () {
 
   describe('spec[any]', function () {
     it('mixes the extra properties into the module list', function () {
-      let reg = registry({
+      const reg = registry({
         someMethod: function () {
           return this;
         }
       });
 
-      let modules = Private(reg);
+      const modules = Private(reg);
       expect(modules).to.have.property('someMethod');
       expect(modules.someMethod()).to.be(modules);
     });
diff --git a/src/ui/public/registry/_registry.js b/src/ui/public/registry/_registry.js
index 396ad08237ed8..6c0fe4c451739 100644
--- a/src/ui/public/registry/_registry.js
+++ b/src/ui/public/registry/_registry.js
@@ -1,7 +1,6 @@
 import _ from 'lodash';
 import IndexedArray from 'ui/indexed_array';
-import RegistryVisTypesProvider from 'ui/registry/vis_types';
-let notPropsOptNames = IndexedArray.OPT_NAMES.concat('constructor');
+const notPropsOptNames = IndexedArray.OPT_NAMES.concat('constructor');
 
 /**
  * Create a registry, which is just a Private module provider.
@@ -49,10 +48,10 @@ let notPropsOptNames = IndexedArray.OPT_NAMES.concat('constructor');
 export default function createRegistry(spec) {
   spec = spec || {};
 
-  let constructor = _.has(spec, 'constructor') && spec.constructor;
-  let iaOpts = _.defaults(_.pick(spec, IndexedArray.OPT_NAMES), { index: ['name'] });
-  let props = _.omit(spec, notPropsOptNames);
-  let providers = [];
+  const constructor = _.has(spec, 'constructor') && spec.constructor;
+  const iaOpts = _.defaults(_.pick(spec, IndexedArray.OPT_NAMES), { index: ['name'] });
+  const props = _.omit(spec, notPropsOptNames);
+  const providers = [];
 
   /**
    * This is the Private module that will be instanciated by
@@ -62,7 +61,7 @@ export default function createRegistry(spec) {
    *                          that were registered, the registry spec
    *                          defines how things will be indexed.
    */
-  let registry = function (Private, $injector) {
+  const registry = function (Private, $injector) {
     // index all of the modules
     iaOpts.initialSet = providers.map(Private);
     let modules = new IndexedArray(iaOpts);
@@ -86,5 +85,5 @@ export default function createRegistry(spec) {
   };
 
   return registry;
-};
+}
 
diff --git a/src/ui/public/registry/field_formats.js b/src/ui/public/registry/field_formats.js
index ca7895faca82f..393f2660afb47 100644
--- a/src/ui/public/registry/field_formats.js
+++ b/src/ui/public/registry/field_formats.js
@@ -7,7 +7,7 @@ export default uiRegistry({
   group: ['fieldType'],
 
   constructor: function (config) {
-    let self = this;
+    const self = this;
     let defaultMap;
 
     function init() {
@@ -54,7 +54,7 @@ export default uiRegistry({
      * @return {FieldFormat}
      */
     self.getInstance = _.memoize(function (formatId) {
-      let FieldFormat = self.byId[formatId];
+      const FieldFormat = self.byId[formatId];
       return new FieldFormat();
     });
 
@@ -65,8 +65,8 @@ export default uiRegistry({
      * @return {FieldFormat}
      */
     self.getDefaultInstance = _.memoize(function (fieldType) {
-      let conf = self.getDefaultConfig(fieldType);
-      let FieldFormat = self.byId[conf.id];
+      const conf = self.getDefaultConfig(fieldType);
+      const FieldFormat = self.byId[conf.id];
       return new FieldFormat(conf.params);
     });
 
diff --git a/src/ui/public/render_directive/render_directive.js b/src/ui/public/render_directive/render_directive.js
index 19a9502262334..f816f52f21457 100644
--- a/src/ui/public/render_directive/render_directive.js
+++ b/src/ui/public/render_directive/render_directive.js
@@ -1,5 +1,4 @@
 import { isPlainObject } from 'lodash';
-import $ from 'jquery';
 import uiModules from 'ui/modules';
 import applyScopeBindingsProvider from './apply_scope_bindings';
 
@@ -27,7 +26,7 @@ import applyScopeBindingsProvider from './apply_scope_bindings';
  */
 uiModules
 .get('kibana')
-.directive('renderDirective', function (Private, $parse) {
+.directive('renderDirective', function (Private) {
   const applyScopeBindings = Private(applyScopeBindingsProvider);
 
   return {
@@ -35,7 +34,7 @@ uiModules
     scope: {
       'definition': '='
     },
-    template: function ($el, $attrs) {
+    template: function ($el) {
       return $el.html();
     },
     controller: function ($scope, $element, $attrs, $transclude, $injector) {
diff --git a/src/ui/public/route_based_notifier/__tests__/index.js b/src/ui/public/route_based_notifier/__tests__/index.js
index 24916b8018477..c883b3ff55e2b 100644
--- a/src/ui/public/route_based_notifier/__tests__/index.js
+++ b/src/ui/public/route_based_notifier/__tests__/index.js
@@ -1,4 +1,4 @@
-import { filter, find, remove } from 'lodash';
+import { find } from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import Notifier from '../../notify/notifier';
diff --git a/src/ui/public/route_based_notifier/index.js b/src/ui/public/route_based_notifier/index.js
index 758eac14bda88..2fdcaccec8070 100644
--- a/src/ui/public/route_based_notifier/index.js
+++ b/src/ui/public/route_based_notifier/index.js
@@ -42,4 +42,4 @@ export default function routeBasedNotifierProvider($rootScope) {
       );
     }
   };
-};
+}
diff --git a/src/ui/public/routes/__tests__/_route_manager.js b/src/ui/public/routes/__tests__/_route_manager.js
index c854d88325400..b920e5d63dd14 100644
--- a/src/ui/public/routes/__tests__/_route_manager.js
+++ b/src/ui/public/routes/__tests__/_route_manager.js
@@ -5,7 +5,7 @@ import RouteManager from 'ui/routes/route_manager';
 import expect from 'expect.js';
 
 let routes; // will contain an new instance of RouteManager for each test
-let chainableMethods = [
+const chainableMethods = [
   { name: 'when', args: ['', {}] },
   { name: 'otherwise', args: [{}] },
   { name: 'defaults', args: [/regexp/, {}] }
@@ -31,7 +31,7 @@ describe('routes/route_manager', function () {
 
   describe('#otherwise', function () {
     it('should forward the last otherwise route', function () {
-      let otherRoute = {};
+      const otherRoute = {};
       routes.otherwise({});
       routes.otherwise(otherRoute);
 
@@ -68,7 +68,7 @@ describe('routes/route_manager', function () {
 
   describe('#config', function () {
     it('should add defined routes to the global $routeProvider service in order', function () {
-      let args = [
+      const args = [
         ['/one', {}],
         ['/two', {}]
       ];
@@ -81,8 +81,8 @@ describe('routes/route_manager', function () {
 
       expect($rp.when.callCount).to.be(args.length);
       _.times(args.length, function (i) {
-        let call = $rp.when.getCall(i);
-        let a = args.shift();
+        const call = $rp.when.getCall(i);
+        const a = args.shift();
 
         expect(call.args[0]).to.be(a[0]);
         expect(call.args[1]).to.be(a[1]);
diff --git a/src/ui/public/routes/__tests__/_work_queue.js b/src/ui/public/routes/__tests__/_work_queue.js
index 863f7345075bd..33044daeae835 100644
--- a/src/ui/public/routes/__tests__/_work_queue.js
+++ b/src/ui/public/routes/__tests__/_work_queue.js
@@ -25,10 +25,10 @@ describe('work queue', function () {
 
   describe('#resolveWhenFull', function () {
     it('resolves requests waiting for the queue to fill when appropriate', function () {
-      let size = _.random(5, 50);
+      const size = _.random(5, 50);
       queue.limit = size;
 
-      let whenFull = Promise.defer();
+      const whenFull = Promise.defer();
       sinon.stub(whenFull, 'resolve');
       queue.resolveWhenFull(whenFull);
 
@@ -53,11 +53,11 @@ describe('work queue', function () {
    *                         can manipulate the filled queue
    */
   function fillWithStubs(then) {
-    let size = _.random(5, 50);
-    let stub = sinon.stub();
+    const size = _.random(5, 50);
+    const stub = sinon.stub();
 
     _.times(size, function () {
-      let d = Promise.defer();
+      const d = Promise.defer();
       // overwrite the defer methods with the stub
       d.resolve = stub;
       d.reject = stub;
diff --git a/src/ui/public/routes/__tests__/_wrap_route_with_prep.js b/src/ui/public/routes/__tests__/_wrap_route_with_prep.js
index a56cb503e1d46..05087cd8ba3d4 100644
--- a/src/ui/public/routes/__tests__/_wrap_route_with_prep.js
+++ b/src/ui/public/routes/__tests__/_wrap_route_with_prep.js
@@ -2,10 +2,7 @@ import RouteManager from 'ui/routes/route_manager';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 
-import wrapRouteWithPrep from 'ui/routes/wrap_route_with_prep';
-import Promise from 'bluebird';
 import _ from 'lodash';
-import { stub } from 'auto-release-sinon';
 import 'ui/private';
 
 
@@ -18,23 +15,21 @@ describe('wrapRouteWithPrep fn', function () {
     routes = new RouteManager();
   });
 
-  let SchedulingTest = function (opts) {
+  const SchedulingTest = function (opts) {
     opts = opts || {};
 
-    let delaySetup = opts.delayUserWork ? 0 : 50;
-    let delayUserWork = opts.delayUserWork ? 50 : 0;
+    const delaySetup = opts.delayUserWork ? 0 : 50;
+    const delayUserWork = opts.delayUserWork ? 50 : 0;
 
     return function () {
       ngMock.module('kibana', 'kibana/notify');
       let setupComplete = false;
       let userWorkComplete = false;
       let route;
-      let Private;
       let Promise;
       let $injector;
 
       ngMock.inject(function ($rootScope, _Private_, _Promise_, _$injector_) {
-        Private = _Private_;
         Promise = _Promise_;
         $injector = _$injector_;
       });
@@ -42,7 +37,7 @@ describe('wrapRouteWithPrep fn', function () {
 
       routes
       .addSetupWork(function () {
-        return new Promise(function (resolve, reject) {
+        return new Promise(function (resolve) {
           setTimeout(function () {
             setupComplete = true;
             resolve();
diff --git a/src/ui/public/routes/route_manager.js b/src/ui/public/routes/route_manager.js
index e06c9fc6e55d5..22c6c1e518387 100644
--- a/src/ui/public/routes/route_manager.js
+++ b/src/ui/public/routes/route_manager.js
@@ -4,16 +4,16 @@ import wrapRouteWithPrep from './wrap_route_with_prep';
 import RouteSetupManager from './route_setup_manager';
 
 function RouteManager() {
-  let self = this;
-  let setup = new RouteSetupManager();
-  let when = [];
-  let defaults = [];
+  const self = this;
+  const setup = new RouteSetupManager();
+  const when = [];
+  const defaults = [];
   let otherwise;
 
   self.config = function ($routeProvider) {
     when.forEach(function (args) {
-      let path = args[0];
-      let route = args[1] || {};
+      const path = args[0];
+      const route = args[1] || {};
 
       // merge in any defaults
       defaults.forEach(function (args) {
@@ -40,7 +40,7 @@ function RouteManager() {
     }
   };
 
-  let wrapSetupAndChain = (fn, ...args) => {
+  const wrapSetupAndChain = (fn, ...args) => {
     fn.apply(setup, args);
     return this;
   };
diff --git a/src/ui/public/routes/route_setup_manager.js b/src/ui/public/routes/route_setup_manager.js
index 1cb89fe456455..15ab1b264149f 100644
--- a/src/ui/public/routes/route_setup_manager.js
+++ b/src/ui/public/routes/route_setup_manager.js
@@ -30,7 +30,7 @@ module.exports = class RouteSetupManager {
    */
   doWork(Promise, $injector, userWork) {
 
-    let invokeEach = (arr, locals) => {
+    const invokeEach = (arr, locals) => {
       return Promise.map(arr, fn => {
         if (!fn) return;
         return $injector.invoke(fn, null, locals);
@@ -39,16 +39,16 @@ module.exports = class RouteSetupManager {
 
     // call each error handler in order, until one of them resolves
     // or we run out of handlers
-    let callErrorHandlers = (handlers, origError) => {
+    const callErrorHandlers = (handlers, origError) => {
       if (!_.size(handlers)) throw origError;
 
       // clone so we don't discard handlers or loose them
       handlers = handlers.slice(0);
 
-      let next = (err) => {
+      const next = (err) => {
         if (!handlers.length) throw err;
 
-        let handler = handlers.shift();
+        const handler = handlers.shift();
         if (!handler) return next(err);
 
         return Promise.try(function () {
@@ -66,7 +66,7 @@ module.exports = class RouteSetupManager {
     )
     .then(() => {
       // wait for the queue to fill up, then do all the work
-      let defer = Promise.defer();
+      const defer = Promise.defer();
       userWork.resolveWhenFull(defer);
 
       return defer.promise.then(() => Promise.all(userWork.doWork()));
diff --git a/src/ui/public/routes/routes.js b/src/ui/public/routes/routes.js
index cbb9878df7a1e..077590cafa642 100644
--- a/src/ui/public/routes/routes.js
+++ b/src/ui/public/routes/routes.js
@@ -1,7 +1,7 @@
 import RouteManager from './route_manager';
 import 'angular-route/angular-route';
 import uiModules from 'ui/modules';
-let defaultRouteManager = new RouteManager();
+const defaultRouteManager = new RouteManager();
 
 module.exports = {
   ...defaultRouteManager,
diff --git a/src/ui/public/routes/work_queue.js b/src/ui/public/routes/work_queue.js
index 40f4294327829..271eeb820a6d8 100644
--- a/src/ui/public/routes/work_queue.js
+++ b/src/ui/public/routes/work_queue.js
@@ -1,10 +1,8 @@
-import _ from 'lodash';
-
 function WorkQueue() {
-  let q = this;
+  const q = this;
 
-  let work = [];
-  let fullDefers = [];
+  const work = [];
+  const fullDefers = [];
 
   q.limit = 0;
   Object.defineProperty(q, 'length', {
@@ -13,13 +11,13 @@ function WorkQueue() {
     }
   });
 
-  let resolve = function (defers) {
+  const resolve = function (defers) {
     return defers.splice(0).map(function (defer) {
       return defer.resolve();
     });
   };
 
-  let checkIfFull = function () {
+  const checkIfFull = function () {
     if (work.length >= q.limit && fullDefers.length) {
       resolve(fullDefers);
     }
@@ -31,7 +29,7 @@ function WorkQueue() {
   };
 
   q.doWork = function () {
-    let resps = resolve(work);
+    const resps = resolve(work);
     checkIfFull();
     return resps;
   };
diff --git a/src/ui/public/routes/wrap_route_with_prep.js b/src/ui/public/routes/wrap_route_with_prep.js
index 5c4b98a82d0a8..5b2607e4f387c 100644
--- a/src/ui/public/routes/wrap_route_with_prep.js
+++ b/src/ui/public/routes/wrap_route_with_prep.js
@@ -1,17 +1,16 @@
 import angular from 'angular';
 import _ from 'lodash';
 import WorkQueue from 'ui/routes/work_queue';
-import errors from 'ui/errors';
 
 
 function wrapRouteWithPrep(route, setup) {
   if (!route.resolve && route.redirectTo) return;
 
-  let userWork = new WorkQueue();
+  const userWork = new WorkQueue();
   // the point at which we will consider the queue "full"
   userWork.limit = _.keys(route.resolve).length;
 
-  let resolve = {
+  const resolve = {
     __prep__: function ($injector) {
       return $injector.invoke(setup.doWork, setup, { userWork });
     }
@@ -21,7 +20,7 @@ function wrapRouteWithPrep(route, setup) {
   // prep is complete
   _.forOwn(route.resolve || {}, function (expr, name) {
     resolve[name] = function ($injector, Promise) {
-      let defer = Promise.defer();
+      const defer = Promise.defer();
       userWork.push(defer);
       return defer.promise.then(function () {
         return $injector[angular.isString(expr) ? 'get' : 'invoke'](expr);
diff --git a/src/ui/public/share/__tests__/url_shortener.js b/src/ui/public/share/__tests__/url_shortener.js
index fd21cdd965044..0f885e5215ba6 100644
--- a/src/ui/public/share/__tests__/url_shortener.js
+++ b/src/ui/public/share/__tests__/url_shortener.js
@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import sinon from 'sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
@@ -6,17 +5,12 @@ import chrome from 'ui/chrome';
 import LibUrlShortenerProvider from 'ui/share/lib/url_shortener';
 
 describe('Url shortener', () => {
-  let $rootScope;
-  let $location;
-  let $http;
   let urlShortener;
   let $httpBackend;
   const shareId = 'id123';
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (_$rootScope_, _$location_, _$httpBackend_, Private) {
-    $location = _$location_;
-    $rootScope = _$rootScope_;
     $httpBackend = _$httpBackend_;
     urlShortener = Private(LibUrlShortenerProvider);
   }));
diff --git a/src/ui/public/share/directives/share.js b/src/ui/public/share/directives/share.js
index b5fdefee05bb5..1cef9b9c77540 100644
--- a/src/ui/public/share/directives/share.js
+++ b/src/ui/public/share/directives/share.js
@@ -28,7 +28,7 @@ app.directive('share', function (Private) {
     },
     template: shareTemplate,
     controllerAs: 'share',
-    controller: function ($scope, $document, $location, globalState) {
+    controller: function ($scope, $document, $location) {
       if ($scope.allowEmbed !== 'false' && $scope.allowEmbed !== undefined) {
         throw new Error('allowEmbed must be "false" or undefined');
       }
@@ -65,7 +65,7 @@ app.directive('share', function (Private) {
             },
           }),
         });
-      };
+      }
 
       function getSnapshotUrl() {
         const url = $location.absUrl();
diff --git a/src/ui/public/share/lib/url_shortener.js b/src/ui/public/share/lib/url_shortener.js
index 76b755771fc15..14c79fcecb9a8 100644
--- a/src/ui/public/share/lib/url_shortener.js
+++ b/src/ui/public/share/lib/url_shortener.js
@@ -1,7 +1,7 @@
 import chrome from 'ui/chrome';
 import url from 'url';
 
-export default function createUrlShortener(Notifier, $http, $location) {
+export default function createUrlShortener(Notifier, $http) {
   const notify = new Notifier({
     location: 'Url Shortener'
   });
@@ -30,4 +30,4 @@ export default function createUrlShortener(Notifier, $http, $location) {
   return {
     shortenUrl
   };
-};
+}
diff --git a/src/ui/public/state_management/__tests__/app_state.js b/src/ui/public/state_management/__tests__/app_state.js
index 6f9af310db4a4..f5c9d5fbad876 100644
--- a/src/ui/public/state_management/__tests__/app_state.js
+++ b/src/ui/public/state_management/__tests__/app_state.js
@@ -27,7 +27,7 @@ describe('State Management', function () {
     });
 
     it('should use passed in params', function () {
-      let params = {
+      const params = {
         test: true,
         mock: false
       };
@@ -46,8 +46,7 @@ describe('State Management', function () {
     });
 
     it('should be destroyed on $routeChangeStart', function () {
-      let destroySpy = sinon.spy(appState, 'destroy');
-      let url = '/test/path';
+      const destroySpy = sinon.spy(appState, 'destroy');
 
       $rootScope.$emit('$routeChangeStart');
 
diff --git a/src/ui/public/state_management/__tests__/global_state.js b/src/ui/public/state_management/__tests__/global_state.js
index 40f5073cfcc6d..83eebd8ba951c 100644
--- a/src/ui/public/state_management/__tests__/global_state.js
+++ b/src/ui/public/state_management/__tests__/global_state.js
@@ -1,11 +1,9 @@
 
-import sinon from 'sinon';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import 'ui/state_management/global_state';
 
 describe('State Management', function () {
-  let $rootScope;
   let $location;
   let state;
 
diff --git a/src/ui/public/state_management/__tests__/state.js b/src/ui/public/state_management/__tests__/state.js
index ae8153f0d326d..75a374db7c717 100644
--- a/src/ui/public/state_management/__tests__/state.js
+++ b/src/ui/public/state_management/__tests__/state.js
@@ -53,7 +53,7 @@ describe('State Management', function () {
     it('should reset the state to the defaults', function () {
       const { state, getUnhashedSearch } = setup({ initial: { message: ['test'] } });
       state.reset();
-      let search = getUnhashedSearch(state);
+      const search = getUnhashedSearch(state);
       expect(search).to.have.property('_s');
       expect(search._s).to.equal('(message:!(test))');
       expect(state.message).to.eql(['test']);
@@ -97,7 +97,7 @@ describe('State Management', function () {
     it('should save to $location.search()', function () {
       const { state, getUnhashedSearch } = setup({ initial: { test: 'foo' } });
       state.save();
-      let search = getUnhashedSearch(state);
+      const search = getUnhashedSearch(state);
       expect(search).to.have.property('_s');
       expect(search._s).to.equal('(test:foo)');
     });
@@ -160,7 +160,7 @@ describe('State Management', function () {
 
     it('should call fetch when $routeUpdate is fired on $rootScope', function () {
       const { state } = setup();
-      let spy = sinon.spy(state, 'fetch');
+      const spy = sinon.spy(state, 'fetch');
       $rootScope.$emit('$routeUpdate', 'test');
       sinon.assert.calledOnce(spy);
     });
diff --git a/src/ui/public/state_management/__tests__/state_monitor_factory.js b/src/ui/public/state_management/__tests__/state_monitor_factory.js
index 94b1873779249..babc8b1f60ffe 100644
--- a/src/ui/public/state_management/__tests__/state_monitor_factory.js
+++ b/src/ui/public/state_management/__tests__/state_monitor_factory.js
@@ -13,11 +13,9 @@ describe('stateMonitorFactory', function () {
   ];
 
   let mockState;
-  let stateJSON;
 
   function setState(mockState, obj, emit = true) {
     mockState.toJSON = () => cloneDeep(obj);
-    stateJSON = cloneDeep(obj);
     if (emit) mockState.emit(eventTypes[0]);
   }
 
@@ -226,7 +224,6 @@ describe('stateMonitorFactory', function () {
 
     describe('destroy', function () {
       let stateSpy;
-      let cleanMethod;
 
       beforeEach(() => {
         stateSpy = sinon.spy(mockState, 'off');
diff --git a/src/ui/public/state_management/app_state.js b/src/ui/public/state_management/app_state.js
index 903071a723677..533b273d70dcb 100644
--- a/src/ui/public/state_management/app_state.js
+++ b/src/ui/public/state_management/app_state.js
@@ -12,11 +12,11 @@ import _ from 'lodash';
 import modules from 'ui/modules';
 import StateManagementStateProvider from 'ui/state_management/state';
 import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state';
-let urlParam = '_a';
+const urlParam = '_a';
 
 function AppStateProvider(Private, $rootScope, $location) {
-  let State = Private(StateManagementStateProvider);
-  let PersistedState = Private(PersistedStatePersistedStateProvider);
+  const State = Private(StateManagementStateProvider);
+  const PersistedState = Private(PersistedStatePersistedStateProvider);
   let persistedStates;
   let eventUnsubscribers;
 
@@ -49,31 +49,31 @@ function AppStateProvider(Private, $rootScope, $location) {
    */
   AppState.prototype.makeStateful = function (prop) {
     if (persistedStates[prop]) return persistedStates[prop];
-    let self = this;
+    const self = this;
 
     // set up the ui state
     persistedStates[prop] = new PersistedState();
 
     // update the app state when the stateful instance changes
-    let updateOnChange = function () {
-      let replaceState = false; // TODO: debouncing logic
+    const updateOnChange = function () {
+      const replaceState = false; // TODO: debouncing logic
       self[prop] = persistedStates[prop].getChanges();
       // Save state to the URL.
       self.save(replaceState);
     };
-    let handlerOnChange = (method) => persistedStates[prop][method]('change', updateOnChange);
+    const handlerOnChange = (method) => persistedStates[prop][method]('change', updateOnChange);
     handlerOnChange('on');
     eventUnsubscribers.push(() => handlerOnChange('off'));
 
     // update the stateful object when the app state changes
-    let persistOnChange = function (changes) {
+    const persistOnChange = function (changes) {
       if (!changes) return;
 
       if (changes.indexOf(prop) !== -1) {
         persistedStates[prop].set(self[prop]);
       }
     };
-    let handlePersist = (method) => this[method]('fetch_with_changes', persistOnChange);
+    const handlePersist = (method) => this[method]('fetch_with_changes', persistOnChange);
     handlePersist('on');
     eventUnsubscribers.push(() => handlePersist('off'));
 
@@ -92,7 +92,7 @@ function AppStateProvider(Private, $rootScope, $location) {
 
     // Checks to see if the appState might already exist, even if it hasn't been newed up
     get.previouslyStored = function () {
-      let search = $location.search();
+      const search = $location.search();
       return search[urlParam] ? true : false;
     };
 
diff --git a/src/ui/public/state_management/global_state.js b/src/ui/public/state_management/global_state.js
index 7448822d7b8b8..bb63c6bc00ea5 100644
--- a/src/ui/public/state_management/global_state.js
+++ b/src/ui/public/state_management/global_state.js
@@ -1,14 +1,12 @@
 import _ from 'lodash';
-import angular from 'angular';
 import qs from 'ui/utils/query_string';
-import rison from 'rison-node';
 import StateManagementStateProvider from 'ui/state_management/state';
 import uiModules from 'ui/modules';
 
-let module = uiModules.get('kibana/global_state');
+const module = uiModules.get('kibana/global_state');
 
-function GlobalStateProvider(Private, $rootScope, $location) {
-  let State = Private(StateManagementStateProvider);
+function GlobalStateProvider(Private) {
+  const State = Private(StateManagementStateProvider);
 
   _.class(GlobalState).inherits(State);
   function GlobalState(defaults) {
diff --git a/src/ui/public/state_management/state.js b/src/ui/public/state_management/state.js
index 5dc113ecc6faa..4326d667f21b8 100644
--- a/src/ui/public/state_management/state.js
+++ b/src/ui/public/state_management/state.js
@@ -121,7 +121,7 @@ export default function StateProvider(Private, $rootScope, $location, config) {
 
     _.defaults(stash, this._defaults);
     // apply diff to state from stash, will change state in place via side effect
-    let diffResults = applyDiff(this, stash);
+    const diffResults = applyDiff(this, stash);
 
     if (diffResults.keys.length) {
       this.emit('fetch_with_changes', diffResults.keys);
@@ -134,7 +134,7 @@ export default function StateProvider(Private, $rootScope, $location, config) {
    */
   State.prototype.save = function (replace) {
     let stash = this._readFromURL();
-    let state = this.toObject();
+    const state = this.toObject();
     replace = replace || false;
 
     if (!stash) {
@@ -143,14 +143,14 @@ export default function StateProvider(Private, $rootScope, $location, config) {
     }
 
     // apply diff to state from stash, will change state in place via side effect
-    let diffResults = applyDiff(stash, _.defaults({}, state, this._defaults));
+    const diffResults = applyDiff(stash, _.defaults({}, state, this._defaults));
 
     if (diffResults.keys.length) {
       this.emit('save_with_changes', diffResults.keys);
     }
 
     // persist the state in the URL
-    let search = $location.search();
+    const search = $location.search();
     search[this._urlParam] = this.toQueryParam(state);
     if (replace) {
       $location.search(search).replace();
@@ -175,7 +175,7 @@ export default function StateProvider(Private, $rootScope, $location, config) {
   State.prototype.reset = function () {
     // apply diff to _attributes from defaults, this is side effecting so
     // it will change the state in place.
-    let diffResults = applyDiff(this, this._defaults);
+    const diffResults = applyDiff(this, this._defaults);
     if (diffResults.keys.length) {
       this.emit('reset_with_changes', diffResults.keys);
     }
@@ -275,4 +275,4 @@ export default function StateProvider(Private, $rootScope, $location, config) {
 
   return State;
 
-};
+}
diff --git a/src/ui/public/state_management/state_monitor_factory.js b/src/ui/public/state_management/state_monitor_factory.js
index 6fe7d89f08585..31f814671b460 100644
--- a/src/ui/public/state_management/state_monitor_factory.js
+++ b/src/ui/public/state_management/state_monitor_factory.js
@@ -44,15 +44,15 @@ function stateMonitor(state, customInitialState) {
 
   function dispatchFetch(keys) {
     dispatchChange('fetch_with_changes', keys);
-  };
+  }
 
   function dispatchSave(keys) {
     dispatchChange('save_with_changes', keys);
-  };
+  }
 
   function dispatchReset(keys) {
     dispatchChange('reset_with_changes', keys);
-  };
+  }
 
   return {
     setInitialState(customInitialState) {
diff --git a/src/ui/public/state_management/state_storage/__tests__/hashed_item_store.js b/src/ui/public/state_management/state_storage/__tests__/hashed_item_store.js
index fa6095ad01a8a..c618848badf55 100644
--- a/src/ui/public/state_management/state_storage/__tests__/hashed_item_store.js
+++ b/src/ui/public/state_management/state_storage/__tests__/hashed_item_store.js
@@ -35,7 +35,7 @@ describe('hashedItemStore', () => {
           // so let's protect ourselves from accidentally breaking this test.
           throw new Error('Missing HashedItemStore.PERSISTED_INDEX_KEY');
         }
-        sessionStorage.setItem(HashedItemStore.PERSISTED_INDEX_KEY, JSON.stringify({a, b, c}));
+        sessionStorage.setItem(HashedItemStore.PERSISTED_INDEX_KEY, JSON.stringify({ a, b, c }));
 
         const hashedItemStore = new HashedItemStore(sessionStorage);
         expect(hashedItemStore._indexedItems).to.eql([a, c, b]);
@@ -65,8 +65,8 @@ describe('hashedItemStore', () => {
         });
       });
 
-      describe(`if the item doesn't exist in sessionStorage`, () => {
-        describe(`if there's storage space`, () => {
+      describe('if the item doesn\'t exist in sessionStorage', () => {
+        describe('if there\'s storage space', () => {
           let sessionStorage;
           let hashedItemStore;
           const hash = 'a';
@@ -88,7 +88,7 @@ describe('hashedItemStore', () => {
           });
         });
 
-        describe(`if there isn't storage space`, () => {
+        describe('if there isn\'t storage space', () => {
           let fakeTimer;
           let sessionStorage;
           let hashedItemStore;
@@ -143,7 +143,7 @@ describe('hashedItemStore', () => {
             });
           });
 
-          describe(`and the item won't fit`, () => {
+          describe('and the item won\'t fit', () => {
             let itemTooBigToFit;
 
             beforeEach(() => {
@@ -161,7 +161,7 @@ describe('hashedItemStore', () => {
               expect(sessionStorage.getItem('c')).to.equal(null);
             });
 
-            it(`doesn't persist the item in sessionStorage`, () => {
+            it('doesn\'t persist the item in sessionStorage', () => {
               setItemLater(hash, itemTooBigToFit);
               expect(sessionStorage.getItem(hash)).to.equal(null);
             });
@@ -230,7 +230,7 @@ describe('hashedItemStore', () => {
         });
       });
 
-      describe(`if the item doesn't exist in sessionStorage`, () => {
+      describe('if the item doesn\'t exist in sessionStorage', () => {
         let sessionStorage;
         let hashedItemStore;
         const hash = 'a';
diff --git a/src/ui/public/state_management/state_storage/__tests__/state_hash.js b/src/ui/public/state_management/state_storage/__tests__/state_hash.js
index 97e93fcab4d67..3e53422f547aa 100644
--- a/src/ui/public/state_management/state_storage/__tests__/state_hash.js
+++ b/src/ui/public/state_management/state_storage/__tests__/state_hash.js
@@ -12,23 +12,23 @@ describe('stateHash', () => {
   describe('#createStateHash', () => {
 
     describe('returns a hash', () => {
-      const json = JSON.stringify({a: 'a'});
+      const json = JSON.stringify({ a: 'a' });
       const hash = createStateHash(json, existingJsonProvider);
       expect(isStateHash(hash)).to.be(true);
     });
 
     describe('returns the same hash for the same input', () => {
-      const json = JSON.stringify({a: 'a'});
+      const json = JSON.stringify({ a: 'a' });
       const hash1 = createStateHash(json, existingJsonProvider);
       const hash2 = createStateHash(json, existingJsonProvider);
       expect(hash1).to.equal(hash2);
     });
 
     describe('returns a different hash for different input', () => {
-      const json1 = JSON.stringify({a: 'a'});
+      const json1 = JSON.stringify({ a: 'a' });
       const hash1 = createStateHash(json1, existingJsonProvider);
 
-      const json2 = JSON.stringify({a: 'b'});
+      const json2 = JSON.stringify({ a: 'b' });
       const hash2 = createStateHash(json2, existingJsonProvider);
       expect(hash1).to.not.equal(hash2);
     });
@@ -36,19 +36,19 @@ describe('stateHash', () => {
 
   describe('#isStateHash', () => {
     it('returns true for values created using #createStateHash', () => {
-      const json = JSON.stringify({a: 'a'});
+      const json = JSON.stringify({ a: 'a' });
       const hash = createStateHash(json, existingJsonProvider);
       expect(isStateHash(hash)).to.be(true);
     });
 
     it('returns false for values not created using #createStateHash', () => {
-      const json = JSON.stringify({a: 'a'});
+      const json = JSON.stringify({ a: 'a' });
       expect(isStateHash(json)).to.be(false);
     });
 
     it('returns false for RISON', () => {
       // We're storing RISON in the URL, so let's test against this specifically.
-      const rison = encodeRison({a: 'a'});
+      const rison = encodeRison({ a: 'a' });
       expect(isStateHash(rison)).to.be(false);
     });
   });
diff --git a/src/ui/public/storage/__tests__/storage.js b/src/ui/public/storage/__tests__/storage.js
index 8a4d5e2872f7c..f5f5f7a7c425c 100644
--- a/src/ui/public/storage/__tests__/storage.js
+++ b/src/ui/public/storage/__tests__/storage.js
@@ -5,7 +5,7 @@ import 'ui/storage';
 
 let storage;
 let $window;
-let payload = { first: 'john', last: 'smith' };
+const payload = { first: 'john', last: 'smith' };
 
 
 function init() {
@@ -69,21 +69,21 @@ describe('StorageService', function () {
 
   describe('json data', function () {
     it('should parse JSON when reading from the store', function () {
-      let getItem = $window.localStorage.getItem;
+      const getItem = $window.localStorage.getItem;
       getItem.returns(JSON.stringify(payload));
 
-      let data = storage.get('name');
+      const data = storage.get('name');
       expect(data).to.eql(payload);
     });
 
     it('should write JSON string to the store', function () {
-      let setItem = $window.localStorage.setItem;
-      let key = 'name';
-      let value = payload;
+      const setItem = $window.localStorage.setItem;
+      const key = 'name';
+      const value = payload;
 
       storage.set(key, value);
 
-      let call = setItem.getCall(0);
+      const call = setItem.getCall(0);
       expect(call.args[0]).to.equal(key);
       expect(call.args[1]).to.equal(JSON.stringify(value));
     });
@@ -91,15 +91,15 @@ describe('StorageService', function () {
 
   describe('expected responses', function () {
     it('should return null when not exists', function () {
-      let data = storage.get('notexists');
+      const data = storage.get('notexists');
       expect(data).to.equal(null);
     });
 
     it('should return null when invalid JSON', function () {
-      let getItem = $window.localStorage.getItem;
+      const getItem = $window.localStorage.getItem;
       getItem.returns('not: json');
 
-      let data = storage.get('name');
+      const data = storage.get('name');
       expect(data).to.equal(null);
     });
   });
diff --git a/src/ui/public/storage/storage.js b/src/ui/public/storage/storage.js
index aa043158724bd..eaa243ed5be1d 100644
--- a/src/ui/public/storage/storage.js
+++ b/src/ui/public/storage/storage.js
@@ -2,7 +2,7 @@ import modules from 'ui/modules';
 import angular from 'angular';
 
 function Storage(store) {
-  let self = this;
+  const self = this;
   self.store = store;
 
   self.get = function (key) {
@@ -30,7 +30,7 @@ function Storage(store) {
   };
 }
 
-let createService = function (type) {
+const createService = function (type) {
   return function ($window) {
     return new Storage($window[type]);
   };
diff --git a/src/ui/public/stringify/__tests__/_color.js b/src/ui/public/stringify/__tests__/_color.js
index 98686bacc3148..05e3021dc902a 100644
--- a/src/ui/public/stringify/__tests__/_color.js
+++ b/src/ui/public/stringify/__tests__/_color.js
@@ -13,7 +13,7 @@ describe('Color Format', function () {
 
   context('field is a number', () => {
     it('should add colors if the value is in range', function () {
-      let colorer = new ColorFormat({
+      const colorer = new ColorFormat({
         fieldType: 'number',
         colors: [{
           range: '100:150',
@@ -28,7 +28,7 @@ describe('Color Format', function () {
     });
 
     it('should not convert invalid ranges', function () {
-      let colorer = new ColorFormat({
+      const colorer = new ColorFormat({
         fieldType: 'number',
         colors: [{
           range: '100150',
@@ -42,7 +42,7 @@ describe('Color Format', function () {
 
   context('field is a string', () => {
     it('should add colors if the regex matches', function () {
-      let colorer = new ColorFormat({
+      const colorer = new ColorFormat({
         fieldType: 'string',
         colors: [{
           regex: 'A.*',
@@ -51,7 +51,7 @@ describe('Color Format', function () {
         }]
       });
 
-      let converter = colorer.getConverterFor('html');
+      const converter = colorer.getConverterFor('html');
       expect(converter('B', 'html')).to.eql('B');
       expect(converter('AAA', 'html')).to.eql('<span style="color: blue;background-color: yellow;">AAA</span>');
       expect(converter('AB', 'html')).to.eql('<span style="color: blue;background-color: yellow;">AB</span>');
diff --git a/src/ui/public/stringify/__tests__/_date.js b/src/ui/public/stringify/__tests__/_date.js
index aec730580bf48..c3a90a2c1d7f1 100644
--- a/src/ui/public/stringify/__tests__/_date.js
+++ b/src/ui/public/stringify/__tests__/_date.js
@@ -15,8 +15,8 @@ describe('Date Format', function () {
     settings = config;
 
     fieldFormats = Private(RegistryFieldFormatsProvider);
-    let DateFormat = fieldFormats.getType('date');
-    let date = new DateFormat();
+    const DateFormat = fieldFormats.getType('date');
+    const date = new DateFormat();
 
     convert = date.convert.bind(date);
   }));
@@ -30,17 +30,17 @@ describe('Date Format', function () {
     function setDefaultTimezone() {
       moment.tz.setDefault(settings.get('dateFormat:tz'));
     }
-    let time = 1445027693942;
+    const time = 1445027693942;
 
     off = $scope.$on('change:config.dateFormat:tz', setDefaultTimezone);
 
     settings.set('dateFormat:tz', 'America/Chicago');
     $scope.$digest();
-    let chicagoTime = convert(time);
+    const chicagoTime = convert(time);
 
     settings.set('dateFormat:tz', 'America/Phoenix');
     $scope.$digest();
-    let phoenixTime = convert(time);
+    const phoenixTime = convert(time);
 
     expect(chicagoTime).not.to.equal(phoenixTime);
     off();
diff --git a/src/ui/public/stringify/__tests__/_source.js b/src/ui/public/stringify/__tests__/_source.js
index 63d4691c33b09..38806c03dbed0 100644
--- a/src/ui/public/stringify/__tests__/_source.js
+++ b/src/ui/public/stringify/__tests__/_source.js
@@ -28,8 +28,8 @@ describe('_source formatting', function () {
     }));
 
     it('uses the _source, field, and hit to create a <dl>', function () {
-      let hit = _.first(hits);
-      let $dl = $(convertHtml(hit._source, indexPattern.fields.byName._source, hit));
+      const hit = _.first(hits);
+      const $dl = $(convertHtml(hit._source, indexPattern.fields.byName._source, hit));
       expect($dl.is('dl')).to.be.ok();
       expect($dl.find('dt')).to.have.length(_.keys(indexPattern.flattenHit(hit)).length);
     });
diff --git a/src/ui/public/stringify/__tests__/_string.js b/src/ui/public/stringify/__tests__/_string.js
index f0b4b254db15e..19212e23b6670 100644
--- a/src/ui/public/stringify/__tests__/_string.js
+++ b/src/ui/public/stringify/__tests__/_string.js
@@ -10,16 +10,16 @@ describe('String Format', function () {
   }));
 
   it('decode a base64 string', function () {
-    let StringFormat = fieldFormats.getType('string');
-    let string = new StringFormat({
+    const StringFormat = fieldFormats.getType('string');
+    const string = new StringFormat({
       transform: 'base64'
     });
     expect(string.convert('Zm9vYmFy')).to.be('foobar');
   });
 
   it('convert a string to title case', function () {
-    let StringFormat = fieldFormats.getType('string');
-    let string = new StringFormat({
+    const StringFormat = fieldFormats.getType('string');
+    const string = new StringFormat({
       transform: 'title'
     });
     expect(string.convert('PLEASE DO NOT SHOUT')).to.be('Please Do Not Shout');
diff --git a/src/ui/public/stringify/__tests__/_truncate.js b/src/ui/public/stringify/__tests__/_truncate.js
index 7e9564944402a..73aec9f58752c 100644
--- a/src/ui/public/stringify/__tests__/_truncate.js
+++ b/src/ui/public/stringify/__tests__/_truncate.js
@@ -10,29 +10,29 @@ describe('String Truncate Format', function () {
   }));
 
   it('truncate large string', function () {
-    let Truncate = fieldFormats.getType('truncate');
-    let truncate = new Truncate({fieldLength: 4});
+    const Truncate = fieldFormats.getType('truncate');
+    const truncate = new Truncate({ fieldLength: 4 });
 
     expect(truncate.convert('This is some text')).to.be('This...');
   });
 
   it('does not truncate large string when field length is not a string', function () {
-    let Truncate = fieldFormats.getType('truncate');
-    let truncate = new Truncate({fieldLength: 'not number'});
+    const Truncate = fieldFormats.getType('truncate');
+    const truncate = new Truncate({ fieldLength: 'not number' });
 
     expect(truncate.convert('This is some text')).to.be('This is some text');
   });
 
   it('does not truncate large string when field length is null', function () {
-    let Truncate = fieldFormats.getType('truncate');
-    let truncate = new Truncate({fieldLength: null});
+    const Truncate = fieldFormats.getType('truncate');
+    const truncate = new Truncate({ fieldLength: null });
 
     expect(truncate.convert('This is some text')).to.be('This is some text');
   });
 
   it('does not truncate large string when field length larger than the text', function () {
-    let Truncate = fieldFormats.getType('truncate');
-    let truncate = new Truncate({fieldLength: 100000});
+    const Truncate = fieldFormats.getType('truncate');
+    const truncate = new Truncate({ fieldLength: 100000 });
 
     expect(truncate.convert('This is some text')).to.be('This is some text');
   });
diff --git a/src/ui/public/stringify/__tests__/_url.js b/src/ui/public/stringify/__tests__/_url.js
index 845ad0fb27885..d7dafd717fa88 100644
--- a/src/ui/public/stringify/__tests__/_url.js
+++ b/src/ui/public/stringify/__tests__/_url.js
@@ -19,9 +19,9 @@ describe('Url Format', function () {
     });
 
     it('ouputs a simple <a> tab by default', function () {
-      let url = new Url();
+      const url = new Url();
 
-      let $a = $(url.convert('http://elastic.co', 'html'));
+      const $a = $(url.convert('http://elastic.co', 'html'));
       expect($a.is('a')).to.be(true);
       expect($a.size()).to.be(1);
       expect($a.attr('href')).to.be('http://elastic.co');
@@ -30,17 +30,17 @@ describe('Url Format', function () {
     });
 
     it('outputs an <image> if type === "img"', function () {
-      let url = new Url({ type: 'img' });
+      const url = new Url({ type: 'img' });
 
-      let $img = $(url.convert('http://elastic.co', 'html'));
+      const $img = $(url.convert('http://elastic.co', 'html'));
       expect($img.is('img')).to.be(true);
       expect($img.attr('src')).to.be('http://elastic.co');
     });
 
     describe('url template', function () {
       it('accepts a template', function () {
-        let url = new Url({ urlTemplate: 'url: {{ value }}' });
-        let $a = $(url.convert('url', 'html'));
+        const url = new Url({ urlTemplate: 'url: {{ value }}' });
+        const $a = $(url.convert('url', 'html'));
         expect($a.is('a')).to.be(true);
         expect($a.size()).to.be(1);
         expect($a.attr('href')).to.be('url: url');
@@ -49,15 +49,15 @@ describe('Url Format', function () {
       });
 
       it('only outputs the url if the contentType === "text"', function () {
-        let url = new Url();
+        const url = new Url();
         expect(url.convert('url', 'text')).to.be('url');
       });
     });
 
     describe('label template', function () {
       it('accepts a template', function () {
-        let url = new Url({ labelTemplate: 'extension: {{ value }}' });
-        let $a = $(url.convert('php', 'html'));
+        const url = new Url({ labelTemplate: 'extension: {{ value }}' });
+        const $a = $(url.convert('php', 'html'));
         expect($a.is('a')).to.be(true);
         expect($a.size()).to.be(1);
         expect($a.attr('href')).to.be('php');
@@ -65,19 +65,19 @@ describe('Url Format', function () {
       });
 
       it('uses the label template for text formating', function () {
-        let url = new Url({ labelTemplate: 'external {{value }}'});
+        const url = new Url({ labelTemplate: 'external {{value }}' });
         expect(url.convert('url', 'text')).to.be('external url');
       });
 
       it('can use the raw value', function () {
-        let url = new Url({
+        const url = new Url({
           labelTemplate: 'external {{value}}'
         });
         expect(url.convert('url?', 'text')).to.be('external url?');
       });
 
       it('can use the url', function () {
-        let url = new Url({
+        const url = new Url({
           urlTemplate: 'http://google.com/{{value}}',
           labelTemplate: 'external {{url}}'
         });
@@ -87,19 +87,19 @@ describe('Url Format', function () {
 
     describe('templating', function () {
       it('ignores unknown variables', function () {
-        let url = new Url({ urlTemplate: '{{ not really a var }}' });
+        const url = new Url({ urlTemplate: '{{ not really a var }}' });
         expect(url.convert('url', 'text')).to.be('');
       });
 
       it('does not allow executing code in variable expressions', function () {
         window.SHOULD_NOT_BE_TRUE = false;
-        let url = new Url({ urlTemplate: '{{ (window.SHOULD_NOT_BE_TRUE = true) && value }}' });
+        const url = new Url({ urlTemplate: '{{ (window.SHOULD_NOT_BE_TRUE = true) && value }}' });
         expect(url.convert('url', 'text')).to.be('');
       });
 
       describe('', function () {
         it('does not get values from the prototype chain', function () {
-          let url = new Url({ urlTemplate: '{{ toString }}' });
+          const url = new Url({ urlTemplate: '{{ toString }}' });
           expect(url.convert('url', 'text')).to.be('');
         });
       });
diff --git a/src/ui/public/stringify/types/_numeral.js b/src/ui/public/stringify/types/_numeral.js
index ee55f155b4341..49ca348ec75b6 100644
--- a/src/ui/public/stringify/types/_numeral.js
+++ b/src/ui/public/stringify/types/_numeral.js
@@ -3,9 +3,9 @@ import 'ui/field_format_editor/numeral/numeral';
 import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
 import BoundToConfigObjProvider from 'ui/bound_to_config_obj';
 export default function AbstractNumeralFormatProvider(Private) {
-  let FieldFormat = Private(IndexPatternsFieldFormatProvider);
-  let BoundToConfigObj = Private(BoundToConfigObjProvider);
-  let numeral = require('numeral')();
+  const FieldFormat = Private(IndexPatternsFieldFormatProvider);
+  const BoundToConfigObj = Private(BoundToConfigObjProvider);
+  const numeral = require('numeral')();
 
   _.class(Numeral).inherits(FieldFormat);
   function Numeral(params) {
@@ -55,4 +55,4 @@ export default function AbstractNumeralFormatProvider(Private) {
   };
 
   return Numeral;
-};
+}
diff --git a/src/ui/public/stringify/types/boolean.js b/src/ui/public/stringify/types/boolean.js
index 651b129ad0783..8c58300c503c7 100644
--- a/src/ui/public/stringify/types/boolean.js
+++ b/src/ui/public/stringify/types/boolean.js
@@ -3,7 +3,7 @@ import _ from 'lodash';
 
 export default function TruncateFormatProvider(Private) {
 
-  let FieldFormat = Private(IndexPatternsFieldFormatProvider);
+  const FieldFormat = Private(IndexPatternsFieldFormatProvider);
 
   class Bool extends FieldFormat {
 
@@ -39,4 +39,4 @@ export default function TruncateFormatProvider(Private) {
   Bool.fieldType = ['boolean', 'number', 'string'];
 
   return Bool;
-};
+}
diff --git a/src/ui/public/stringify/types/bytes.js b/src/ui/public/stringify/types/bytes.js
index 88e72823a4a4c..cf084713af456 100644
--- a/src/ui/public/stringify/types/bytes.js
+++ b/src/ui/public/stringify/types/bytes.js
@@ -1,10 +1,10 @@
 import StringifyTypesNumeralProvider from 'ui/stringify/types/_numeral';
 
 export default function BytesFormatProvider(Private) {
-  let Numeral = Private(StringifyTypesNumeralProvider);
+  const Numeral = Private(StringifyTypesNumeralProvider);
   return Numeral.factory({
     id: 'bytes',
     title: 'Bytes',
     sampleInputs: [1024, 5150000, 1990000000]
   });
-};
+}
diff --git a/src/ui/public/stringify/types/color.js b/src/ui/public/stringify/types/color.js
index 221bc9acaec48..8c1ea96de5cf6 100644
--- a/src/ui/public/stringify/types/color.js
+++ b/src/ui/public/stringify/types/color.js
@@ -81,4 +81,4 @@ export default function ColorFormatProvider(Private) {
 
 
   return _Color;
-};
+}
diff --git a/src/ui/public/stringify/types/date.js b/src/ui/public/stringify/types/date.js
index d88ff3ed4d910..d4a80689a6e73 100644
--- a/src/ui/public/stringify/types/date.js
+++ b/src/ui/public/stringify/types/date.js
@@ -5,8 +5,8 @@ import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/fi
 import BoundToConfigObjProvider from 'ui/bound_to_config_obj';
 import dateTemplate from 'ui/stringify/editors/date.html';
 export default function DateTimeFormatProvider(Private) {
-  let FieldFormat = Private(IndexPatternsFieldFormatProvider);
-  let BoundToConfigObj = Private(BoundToConfigObjProvider);
+  const FieldFormat = Private(IndexPatternsFieldFormatProvider);
+  const BoundToConfigObj = Private(BoundToConfigObjProvider);
 
 
   _.class(DateTime).inherits(FieldFormat);
@@ -27,7 +27,7 @@ export default function DateTimeFormatProvider(Private) {
     template: dateTemplate,
     controllerAs: 'cntrl',
     controller: function ($interval, $scope) {
-      let self = this;
+      const self = this;
       self.sampleInputs = [
         Date.now(),
         +moment().startOf('year'),
@@ -43,11 +43,11 @@ export default function DateTimeFormatProvider(Private) {
   DateTime.prototype._convert = function (val) {
     // don't give away our ref to converter so
     // we can hot-swap when config changes
-    let pattern = this.param('pattern');
-    let timezone = this.param('timezone');
+    const pattern = this.param('pattern');
+    const timezone = this.param('timezone');
 
-    let timezoneChanged = this._timeZone !== timezone;
-    let datePatternChanged = this._memoizedPattern !== pattern;
+    const timezoneChanged = this._timeZone !== timezone;
+    const datePatternChanged = this._memoizedPattern !== pattern;
     if (timezoneChanged || datePatternChanged) {
       this._timeZone = timezone;
       this._memoizedPattern = pattern;
@@ -64,4 +64,4 @@ export default function DateTimeFormatProvider(Private) {
   };
 
   return DateTime;
-};
+}
diff --git a/src/ui/public/stringify/types/duration.js b/src/ui/public/stringify/types/duration.js
index c045c5578c99f..5e21ee239d381 100644
--- a/src/ui/public/stringify/types/duration.js
+++ b/src/ui/public/stringify/types/duration.js
@@ -1,5 +1,4 @@
 import 'ui/stringify/editors/duration.less';
-import _ from 'lodash';
 import moment from 'moment';
 import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
 import durationTemplate from 'ui/stringify/editors/duration.html';
@@ -67,7 +66,7 @@ export default function DurationFormatProvider(Private) {
   Duration.editor = {
     template: durationTemplate,
     controllerAs: 'cntrl',
-    controller($scope, $interval) {
+    controller() {
       this.sampleInputs = [
         -123,
         1,
@@ -95,4 +94,4 @@ export default function DurationFormatProvider(Private) {
     const kind = inputFormat in ratioToSeconds ? 'seconds' : inputFormat;
     return moment.duration(val * ratio, kind);
   }
-};
+}
diff --git a/src/ui/public/stringify/types/ip.js b/src/ui/public/stringify/types/ip.js
index 465d77fc3b41e..97001c68a975a 100644
--- a/src/ui/public/stringify/types/ip.js
+++ b/src/ui/public/stringify/types/ip.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
 export default function IpFormatProvider(Private) {
-  let FieldFormat = Private(IndexPatternsFieldFormatProvider);
+  const FieldFormat = Private(IndexPatternsFieldFormatProvider);
 
   _.class(Ip).inherits(FieldFormat);
   function Ip(params) {
@@ -21,4 +21,4 @@ export default function IpFormatProvider(Private) {
   };
 
   return Ip;
-};
+}
diff --git a/src/ui/public/stringify/types/number.js b/src/ui/public/stringify/types/number.js
index e9d12b1d241f2..b33a31f7e0d08 100644
--- a/src/ui/public/stringify/types/number.js
+++ b/src/ui/public/stringify/types/number.js
@@ -1,7 +1,7 @@
 import StringifyTypesNumeralProvider from 'ui/stringify/types/_numeral';
 
 export default function NumberFormatProvider(Private) {
-  let Numeral = Private(StringifyTypesNumeralProvider);
+  const Numeral = Private(StringifyTypesNumeralProvider);
   return Numeral.factory({
     id: 'number',
     title: 'Number',
@@ -9,4 +9,4 @@ export default function NumberFormatProvider(Private) {
       10000, 12.345678, -1, -999, 0.52
     ]
   });
-};
+}
diff --git a/src/ui/public/stringify/types/percent.js b/src/ui/public/stringify/types/percent.js
index f309604ef0f0b..e6a79361280c2 100644
--- a/src/ui/public/stringify/types/percent.js
+++ b/src/ui/public/stringify/types/percent.js
@@ -2,8 +2,8 @@ import _ from 'lodash';
 import BoundToConfigObjProvider from 'ui/bound_to_config_obj';
 import StringifyTypesNumeralProvider from 'ui/stringify/types/_numeral';
 export default function PercentFormatProvider(Private) {
-  let BoundToConfigObj = Private(BoundToConfigObjProvider);
-  let Numeral = Private(StringifyTypesNumeralProvider);
+  const BoundToConfigObj = Private(BoundToConfigObjProvider);
+  const Numeral = Private(StringifyTypesNumeralProvider);
 
   return Numeral.factory({
     id: 'percent',
@@ -21,4 +21,4 @@ export default function PercentFormatProvider(Private) {
       })
     }
   });
-};
+}
diff --git a/src/ui/public/stringify/types/source.js b/src/ui/public/stringify/types/source.js
index 9662bfebef4ec..1b8236fc88c1a 100644
--- a/src/ui/public/stringify/types/source.js
+++ b/src/ui/public/stringify/types/source.js
@@ -3,8 +3,8 @@ import noWhiteSpace from 'ui/utils/no_white_space';
 import angular from 'angular';
 import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
 export default function _SourceFormatProvider(Private, shortDotsFilter) {
-  let FieldFormat = Private(IndexPatternsFieldFormatProvider);
-  let template = _.template(noWhiteSpace(require('ui/stringify/types/_source.html')));
+  const FieldFormat = Private(IndexPatternsFieldFormatProvider);
+  const template = _.template(noWhiteSpace(require('ui/stringify/types/_source.html')));
 
   _.class(Source).inherits(FieldFormat);
   function Source(params) {
@@ -20,15 +20,15 @@ export default function _SourceFormatProvider(Private, shortDotsFilter) {
     html: function sourceToHtml(source, field, hit) {
       if (!field) return this.getConverter('text')(source, field, hit);
 
-      let highlights = (hit && hit.highlight) || {};
-      let formatted = field.indexPattern.formatHit(hit);
-      let highlightPairs = [];
-      let sourcePairs = [];
+      const highlights = (hit && hit.highlight) || {};
+      const formatted = field.indexPattern.formatHit(hit);
+      const highlightPairs = [];
+      const sourcePairs = [];
 
       _.keys(formatted).forEach(function (key) {
-        let pairs = highlights[key] ? highlightPairs : sourcePairs;
-        let field = shortDotsFilter(key);
-        let val = formatted[key];
+        const pairs = highlights[key] ? highlightPairs : sourcePairs;
+        const field = shortDotsFilter(key);
+        const val = formatted[key];
         pairs.push([field, val]);
       }, []);
 
@@ -37,4 +37,4 @@ export default function _SourceFormatProvider(Private, shortDotsFilter) {
   };
 
   return Source;
-};
+}
diff --git a/src/ui/public/stringify/types/string.js b/src/ui/public/stringify/types/string.js
index 3db37865534e7..3a60a898a847e 100644
--- a/src/ui/public/stringify/types/string.js
+++ b/src/ui/public/stringify/types/string.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import 'ui/field_format_editor/samples/samples';
 import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
 export default function StringFormatProvider(Private) {
-  let FieldFormat = Private(IndexPatternsFieldFormatProvider);
+  const FieldFormat = Private(IndexPatternsFieldFormatProvider);
 
 
   _.class(_String).inherits(FieldFormat);
@@ -38,7 +38,7 @@ export default function StringFormatProvider(Private) {
     { id: 'upper', name: 'Upper Case' },
     { id: 'title', name: 'Title Case' },
     { id: 'short', name: 'Short Dots' },
-    { id: 'base64', name: 'Base64 Decode'}
+    { id: 'base64', name: 'Base64 Decode' }
   ];
 
   _String.sampleInputs = [
@@ -73,4 +73,4 @@ export default function StringFormatProvider(Private) {
   };
 
   return _String;
-};
+}
diff --git a/src/ui/public/stringify/types/truncate.js b/src/ui/public/stringify/types/truncate.js
index 666add8819581..f93f5884cde55 100644
--- a/src/ui/public/stringify/types/truncate.js
+++ b/src/ui/public/stringify/types/truncate.js
@@ -2,8 +2,8 @@ import _ from 'lodash';
 
 import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
 export default function TruncateFormatProvider(Private) {
-  let FieldFormat = Private(IndexPatternsFieldFormatProvider);
-  let omission = '...';
+  const FieldFormat = Private(IndexPatternsFieldFormatProvider);
+  const omission = '...';
 
   _.class(Truncate).inherits(FieldFormat);
 
@@ -16,7 +16,7 @@ export default function TruncateFormatProvider(Private) {
   Truncate.fieldType = ['string'];
 
   Truncate.prototype._convert = function (val) {
-    let length = this.param('fieldLength');
+    const length = this.param('fieldLength');
     if (length > 0) {
       return _.trunc(val, {
         'length': length + omission.length,
@@ -32,4 +32,4 @@ export default function TruncateFormatProvider(Private) {
   Truncate.sampleInput = [ require('ui/stringify/samples/large.html') ];
 
   return Truncate;
-};
+}
diff --git a/src/ui/public/stringify/types/url.js b/src/ui/public/stringify/types/url.js
index eb1c46aeaaafe..e87f4e947838c 100644
--- a/src/ui/public/stringify/types/url.js
+++ b/src/ui/public/stringify/types/url.js
@@ -5,7 +5,7 @@ import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/fi
 import urlTemplate from 'ui/stringify/editors/url.html';
 export default function UrlFormatProvider(Private, highlightFilter) {
 
-  let FieldFormat = Private(IndexPatternsFieldFormatProvider);
+  const FieldFormat = Private(IndexPatternsFieldFormatProvider);
 
 
   _.class(Url).inherits(FieldFormat);
@@ -31,7 +31,7 @@ export default function UrlFormatProvider(Private, highlightFilter) {
     template: urlTemplate,
     controllerAs: 'url',
     controller: function ($scope) {
-      let iconPattern = '/bundles/src/ui/public/stringify/icons/{{value}}.png';
+      const iconPattern = '/bundles/src/ui/public/stringify/icons/{{value}}.png';
 
       this.samples = {
         a: [ 'john', '/some/pathname/asset.png', 1234 ],
@@ -39,7 +39,7 @@ export default function UrlFormatProvider(Private, highlightFilter) {
       };
 
       $scope.$watch('editor.formatParams.type', function (type, prev) {
-        let params = $scope.editor.formatParams;
+        const params = $scope.editor.formatParams;
         if (type === 'img' && type !== prev && !params.urlTemplate) {
           params.urlTemplate = iconPattern;
         }
@@ -60,7 +60,7 @@ export default function UrlFormatProvider(Private, highlightFilter) {
   ];
 
   Url.prototype._formatUrl = function (value) {
-    let template = this.param('urlTemplate');
+    const template = this.param('urlTemplate');
     if (!template) return value;
 
     return this._compileTemplate(template)({
@@ -70,7 +70,7 @@ export default function UrlFormatProvider(Private, highlightFilter) {
   };
 
   Url.prototype._formatLabel = function (value, url) {
-    let template = this.param('labelTemplate');
+    const template = this.param('labelTemplate');
     if (url == null) url = this._formatUrl(value);
     if (!template) return url;
 
@@ -86,7 +86,7 @@ export default function UrlFormatProvider(Private, highlightFilter) {
     },
 
     html: function (rawValue, field, hit) {
-      let url = _.escape(this._formatUrl(rawValue));
+      const url = _.escape(this._formatUrl(rawValue));
       let label = _.escape(this._formatLabel(rawValue, url));
 
       switch (this.param('type')) {
@@ -103,7 +103,7 @@ export default function UrlFormatProvider(Private, highlightFilter) {
   };
 
   Url.prototype._compileTemplate = function (template) {
-    let parts = template.split(Url.templateMatchRE).map(function (part, i) {
+    const parts = template.split(Url.templateMatchRE).map(function (part, i) {
       // trim all the odd bits, the variable names
       return (i % 2) ? part.trim() : part;
     });
@@ -115,7 +115,7 @@ export default function UrlFormatProvider(Private, highlightFilter) {
       while (++i < parts.length) {
         if (i % 2) {
           if (locals.hasOwnProperty(parts[i])) {
-            let local = locals[parts[i]];
+            const local = locals[parts[i]];
             output += local == null ? '' : local;
           }
         } else {
@@ -128,4 +128,4 @@ export default function UrlFormatProvider(Private, highlightFilter) {
   };
 
   return Url;
-};
+}
diff --git a/src/ui/public/style_compile/__tests__/style_compile.js b/src/ui/public/style_compile/__tests__/style_compile.js
index 3bb46d7f3cb27..804e0f0b59287 100644
--- a/src/ui/public/style_compile/__tests__/style_compile.js
+++ b/src/ui/public/style_compile/__tests__/style_compile.js
@@ -13,7 +13,7 @@ describe('styleCompile directive', function () {
   }));
 
   it('exports a few config values as css', function () {
-    let $style = $('#style-compile');
+    const $style = $('#style-compile');
 
     config.set('truncate:maxHeight', 0);
     $rootScope.$apply();
diff --git a/src/ui/public/style_compile/style_compile.js b/src/ui/public/style_compile/style_compile.js
index 4ec2bd7367c03..90fc2e09fecbd 100644
--- a/src/ui/public/style_compile/style_compile.js
+++ b/src/ui/public/style_compile/style_compile.js
@@ -2,15 +2,15 @@ import _ from 'lodash';
 import $ from 'jquery';
 import 'ui/config';
 import uiModules from 'ui/modules';
-let $style = $('<style>').appendTo('head').attr('id', 'style-compile');
+const $style = $('<style>').appendTo('head').attr('id', 'style-compile');
 
 
 uiModules
 .get('kibana')
 .run(function ($rootScope, $compile, config) {
-  let truncateGradientHeight = 15;
-  let template = _.template(require('./style_compile.css.tmpl'));
-  let locals = {};
+  const truncateGradientHeight = 15;
+  const template = _.template(require('./style_compile.css.tmpl'));
+  const locals = {};
 
   // watch the value of the truncate:maxHeight config param
   $rootScope.$watch(function () {
diff --git a/src/ui/public/system_api/__tests__/system_api.js b/src/ui/public/system_api/__tests__/system_api.js
index 026f08d1766f9..b1c0b3213e600 100644
--- a/src/ui/public/system_api/__tests__/system_api.js
+++ b/src/ui/public/system_api/__tests__/system_api.js
@@ -1,5 +1,4 @@
 import expect from 'expect.js';
-import ngMock from 'ng_mock';
 import { addSystemApiHeader, isSystemApiRequest } from '../system_api';
 
 describe('system_api', () => {
diff --git a/src/ui/public/template_vis_type/template_renderbot.js b/src/ui/public/template_vis_type/template_renderbot.js
index 1dfcfd31f8ae2..93fbfe2f35105 100644
--- a/src/ui/public/template_vis_type/template_renderbot.js
+++ b/src/ui/public/template_vis_type/template_renderbot.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import VisRenderbotProvider from 'ui/vis/renderbot';
 export default function TemplateRenderbotFactory(Private, $compile, $rootScope) {
-  let Renderbot = Private(VisRenderbotProvider);
+  const Renderbot = Private(VisRenderbotProvider);
 
   _.class(TemplateRenderbot).inherits(Renderbot);
   function TemplateRenderbot(vis, $el, uiState) {
@@ -23,4 +23,4 @@ export default function TemplateRenderbotFactory(Private, $compile, $rootScope)
   };
 
   return TemplateRenderbot;
-};
+}
diff --git a/src/ui/public/template_vis_type/template_vis_type.js b/src/ui/public/template_vis_type/template_vis_type.js
index 3203b047ac583..188284c9cbb0f 100644
--- a/src/ui/public/template_vis_type/template_vis_type.js
+++ b/src/ui/public/template_vis_type/template_vis_type.js
@@ -2,8 +2,8 @@ import _ from 'lodash';
 import VisVisTypeProvider from 'ui/vis/vis_type';
 import TemplateVisTypeTemplateRenderbotProvider from 'ui/template_vis_type/template_renderbot';
 export default function TemplateVisTypeFactory(Private) {
-  let VisType = Private(VisVisTypeProvider);
-  let TemplateRenderbot = Private(TemplateVisTypeTemplateRenderbotProvider);
+  const VisType = Private(VisVisTypeProvider);
+  const TemplateRenderbot = Private(TemplateVisTypeTemplateRenderbotProvider);
 
   _.class(TemplateVisType).inherits(VisType);
   function TemplateVisType(opts) {
@@ -20,4 +20,4 @@ export default function TemplateVisTypeFactory(Private) {
   };
 
   return TemplateVisType;
-};
+}
diff --git a/src/ui/public/test_harness/test_sharding/setup_top_level_describe_filter.js b/src/ui/public/test_harness/test_sharding/setup_top_level_describe_filter.js
index 2f2fdb1859527..ba05341152fb3 100644
--- a/src/ui/public/test_harness/test_sharding/setup_top_level_describe_filter.js
+++ b/src/ui/public/test_harness/test_sharding/setup_top_level_describe_filter.js
@@ -65,7 +65,6 @@ export function setupTopLevelDescribeFilter(test) {
    *  @type {Number}
    */
   let describeCallDepth = 0;
-  const ignoredCalls = [];
 
   const describeInterceptor = function (describeName, describeBody) {
     const context = this;
diff --git a/src/ui/public/time_buckets/calc_auto_interval.js b/src/ui/public/time_buckets/calc_auto_interval.js
index 4c0889ffe16c9..761e303fe6493 100644
--- a/src/ui/public/time_buckets/calc_auto_interval.js
+++ b/src/ui/public/time_buckets/calc_auto_interval.js
@@ -3,7 +3,7 @@ import moment from 'moment';
 export default function DateIntervalRoundingRulesProvider() {
   // these are the rounding rules used by roundInterval()
 
-  let roundingRules = [
+  const roundingRules = [
     [ d(500, 'ms'), d(100, 'ms') ],
     [ d(5, 'second'), d(1, 'second') ],
     [ d(7.5, 'second'), d(5, 'second') ],
@@ -22,16 +22,16 @@ export default function DateIntervalRoundingRulesProvider() {
     [ Infinity, d(1, 'year') ]
   ];
 
-  let revRoundingRules = roundingRules.slice(0).reverse();
+  const revRoundingRules = roundingRules.slice(0).reverse();
 
   function find(rules, check, last) {
     function pick(buckets, duration) {
-      let target = duration / buckets;
+      const target = duration / buckets;
       let lastResp;
 
       for (let i = 0; i < rules.length; i++) {
-        let rule = rules[i];
-        let resp = check(rule[0], rule[1], target);
+        const rule = rules[i];
+        const resp = check(rule[0], rule[1], target);
 
         if (resp == null) {
           if (!last) continue;
@@ -44,12 +44,12 @@ export default function DateIntervalRoundingRulesProvider() {
       }
 
       // fallback to just a number of milliseconds, ensure ms is >= 1
-      let ms = Math.max(Math.floor(target), 1);
+      const ms = Math.max(Math.floor(target), 1);
       return moment.duration(ms, 'ms');
     }
 
     return function (buckets, duration) {
-      let interval = pick(buckets, duration);
+      const interval = pick(buckets, duration);
       if (interval) return moment.duration(interval._data);
     };
   }
@@ -67,4 +67,4 @@ export default function DateIntervalRoundingRulesProvider() {
       if (interval <= target) return interval;
     }),
   };
-};
+}
diff --git a/src/ui/public/time_buckets/calc_es_interval.js b/src/ui/public/time_buckets/calc_es_interval.js
index 9723273b372af..2eb4c976f725b 100644
--- a/src/ui/public/time_buckets/calc_es_interval.js
+++ b/src/ui/public/time_buckets/calc_es_interval.js
@@ -1,9 +1,8 @@
-import moment from 'moment';
 import dateMath from '@elastic/datemath';
 export default function () {
 
-  let unitsDesc = dateMath.unitsDesc;
-  let largeMax = unitsDesc.indexOf('M');
+  const unitsDesc = dateMath.unitsDesc;
+  const largeMax = unitsDesc.indexOf('M');
 
   /**
    * Convert a moment.duration into an es
@@ -15,8 +14,8 @@ export default function () {
    */
   function esDuration(duration) {
     for (let i = 0; i < unitsDesc.length; i++) {
-      let unit = unitsDesc[i];
-      let val = duration.as(unit);
+      const unit = unitsDesc[i];
+      const val = duration.as(unit);
       // find a unit that rounds neatly
       if (val >= 1 && Math.floor(val) === val) {
 
@@ -35,7 +34,7 @@ export default function () {
       }
     }
 
-    let ms = duration.as('ms');
+    const ms = duration.as('ms');
     return {
       value: ms,
       unit: 'ms',
@@ -45,4 +44,4 @@ export default function () {
 
 
   return esDuration;
-};
+}
diff --git a/src/ui/public/time_buckets/time_buckets.js b/src/ui/public/time_buckets/time_buckets.js
index aa3ead7760714..c7af2e574badc 100644
--- a/src/ui/public/time_buckets/time_buckets.js
+++ b/src/ui/public/time_buckets/time_buckets.js
@@ -1,14 +1,11 @@
 import _ from 'lodash';
 import moment from 'moment';
-import dateMath from '@elastic/datemath';
 import parseInterval from 'ui/utils/parse_interval';
 import TimeBucketsCalcAutoIntervalProvider from 'ui/time_buckets/calc_auto_interval';
 import TimeBucketsCalcEsIntervalProvider from 'ui/time_buckets/calc_es_interval';
 export default function IntervalHelperProvider(Private, timefilter, config) {
-
-  let calcAuto = Private(TimeBucketsCalcAutoIntervalProvider);
-  let calcEsInterval = Private(TimeBucketsCalcEsIntervalProvider);
-  let tzOffset = moment().format('Z');
+  const calcAuto = Private(TimeBucketsCalcAutoIntervalProvider);
+  const calcEsInterval = Private(TimeBucketsCalcEsIntervalProvider);
 
   function isValidMoment(m) {
     return m && ('isValid' in m) && m.isValid();
@@ -51,11 +48,11 @@ export default function IntervalHelperProvider(Private, timefilter, config) {
       bounds = _.isArray(input) ? input : [];
     }
 
-    let moments = _(bounds)
+    const moments = _(bounds)
     .map(_.ary(moment, 1))
     .sortBy(Number);
 
-    let valid = moments.size() === 2 && moments.every(isValidMoment);
+    const valid = moments.size() === 2 && moments.every(isValidMoment);
     if (!valid) {
       this.clearBounds();
       throw new Error('invalid bounds set: ' + input);
@@ -197,13 +194,13 @@ export default function IntervalHelperProvider(Private, timefilter, config) {
    * @return {[type]} [description]
    */
   TimeBuckets.prototype.getInterval = function () {
-    let self = this;
-    let duration = self.getDuration();
+    const self = this;
+    const duration = self.getDuration();
     return decorateInterval(maybeScaleInterval(readInterval()));
 
     // either pull the interval from state or calculate the auto-interval
     function readInterval() {
-      let interval = self._i;
+      const interval = self._i;
       if (moment.isDuration(interval)) return interval;
       return calcAuto.near(config.get('histogram:barTarget'), duration);
     }
@@ -212,8 +209,8 @@ export default function IntervalHelperProvider(Private, timefilter, config) {
     function maybeScaleInterval(interval) {
       if (!self.hasBounds()) return interval;
 
-      let maxLength = config.get('histogram:maxBars');
-      let approxLen = duration / interval;
+      const maxLength = config.get('histogram:maxBars');
+      const approxLen = duration / interval;
       let scaled;
 
       if (approxLen > maxLength) {
@@ -234,13 +231,13 @@ export default function IntervalHelperProvider(Private, timefilter, config) {
 
     // append some TimeBuckets specific props to the interval
     function decorateInterval(interval) {
-      let esInterval = calcEsInterval(interval);
+      const esInterval = calcEsInterval(interval);
       interval.esValue = esInterval.value;
       interval.esUnit = esInterval.unit;
       interval.expression = esInterval.expression;
       interval.overflow = duration > interval ? moment.duration(interval - duration) : false;
 
-      let prettyUnits = moment.normalizeUnits(esInterval.unit);
+      const prettyUnits = moment.normalizeUnits(esInterval.unit);
       if (esInterval.value === 1) {
         interval.description = prettyUnits;
       } else {
@@ -263,11 +260,11 @@ export default function IntervalHelperProvider(Private, timefilter, config) {
    * @return {string}
    */
   TimeBuckets.prototype.getScaledDateFormat = function () {
-    let interval = this.getInterval();
-    let rules = config.get('dateFormat:scaled');
+    const interval = this.getInterval();
+    const rules = config.get('dateFormat:scaled');
 
     for (let i = rules.length - 1; i >= 0; i--) {
-      let rule = rules[i];
+      const rule = rules[i];
       if (!rule[0] || interval >= moment.duration(rule[0])) {
         return rule[1];
       }
@@ -279,22 +276,22 @@ export default function IntervalHelperProvider(Private, timefilter, config) {
 
   TimeBuckets.__cached__ = function (self) {
     let cache = {};
-    let sameMoment = same(moment.isMoment);
-    let sameDuration = same(moment.isDuration);
+    const sameMoment = same(moment.isMoment);
+    const sameDuration = same(moment.isDuration);
 
-    let desc = {
+    const desc = {
       __cached__: {
         value: self
       },
     };
 
-    let breakers = {
+    const breakers = {
       setBounds: 'bounds',
       clearBounds: 'bounds',
       setInterval: 'interval'
     };
 
-    let resources = {
+    const resources = {
       bounds: {
         setup: function () {
           return [self._lb, self._ub];
@@ -326,16 +323,15 @@ export default function IntervalHelperProvider(Private, timefilter, config) {
     }
 
     function cacheBreaker(prop) {
-      let resource = resources[breakers[prop]];
-      let setup = resource.setup;
-      let changes = resource.changes;
-      let deps = resource.deps;
-      let fn = self[prop];
+      const resource = resources[breakers[prop]];
+      const setup = resource.setup;
+      const changes = resource.changes;
+      const fn = self[prop];
 
       return {
-        value: function cacheBreaker(input) {
-          let prev = setup.call(self);
-          let ret = fn.apply(self, arguments);
+        value: function cacheBreaker() {
+          const prev = setup.call(self);
+          const ret = fn.apply(self, arguments);
 
           if (changes.call(self, prev)) {
             cache = {};
@@ -369,4 +365,4 @@ export default function IntervalHelperProvider(Private, timefilter, config) {
   };
 
   return TimeBuckets;
-};
+}
diff --git a/src/ui/public/timefilter/__tests__/diff_interval.js b/src/ui/public/timefilter/__tests__/diff_interval.js
index cfc784a1e8059..a2af4b6c3954e 100644
--- a/src/ui/public/timefilter/__tests__/diff_interval.js
+++ b/src/ui/public/timefilter/__tests__/diff_interval.js
@@ -31,47 +31,47 @@ describe('Timefilter service', function () {
     }));
 
     it('not emit anything if nothing has changed', function () {
-      timefilter.refreshInterval = {pause: false, value: 0};
+      timefilter.refreshInterval = { pause: false, value: 0 };
       fn();
       expect(update.called).to.be(false);
       expect(fetch.called).to.be(false);
     });
 
     it('emit only an update when paused', function () {
-      timefilter.refreshInterval = {pause: true, value: 5000};
+      timefilter.refreshInterval = { pause: true, value: 5000 };
       fn();
       expect(update.called).to.be(true);
       expect(fetch.called).to.be(false);
     });
 
     it('emit update, not fetch, when switching to value: 0', function () {
-      timefilter.refreshInterval = {pause: false, value: 5000};
+      timefilter.refreshInterval = { pause: false, value: 5000 };
       fn();
       expect(update.calledOnce).to.be(true);
       expect(fetch.calledOnce).to.be(true);
-      timefilter.refreshInterval = {pause: false, value: 0};
+      timefilter.refreshInterval = { pause: false, value: 0 };
       fn();
       expect(update.calledTwice).to.be(true);
       expect(fetch.calledTwice).to.be(false);
     });
 
     it('should emit update, not fetch, when moving from unpaused to paused', function () {
-      timefilter.refreshInterval = {pause: false, value: 5000};
+      timefilter.refreshInterval = { pause: false, value: 5000 };
       fn();
       expect(update.calledOnce).to.be(true);
       expect(fetch.calledOnce).to.be(true);
-      timefilter.refreshInterval = {pause: true, value: 5000};
+      timefilter.refreshInterval = { pause: true, value: 5000 };
       fn();
       expect(update.calledTwice).to.be(true);
       expect(fetch.calledTwice).to.be(false);
     });
 
     it('should emit update and fetch when unpaused', function () {
-      timefilter.refreshInterval = {pause: true, value: 5000};
+      timefilter.refreshInterval = { pause: true, value: 5000 };
       fn();
       expect(update.calledOnce).to.be(true);
       expect(fetch.calledOnce).to.be(false);
-      timefilter.refreshInterval = {pause: false, value: 5000};
+      timefilter.refreshInterval = { pause: false, value: 5000 };
       fn();
       expect(update.calledTwice).to.be(true);
       expect(fetch.calledOnce).to.be(true);
diff --git a/src/ui/public/timefilter/__tests__/diff_time.js b/src/ui/public/timefilter/__tests__/diff_time.js
index e783e1d5b2a51..267fa3407f73d 100644
--- a/src/ui/public/timefilter/__tests__/diff_time.js
+++ b/src/ui/public/timefilter/__tests__/diff_time.js
@@ -30,14 +30,14 @@ describe('Timefilter service', function () {
     }));
 
     it('not emit anything if the time has not changed', function () {
-      timefilter.time = {from: 0, to: 1};
+      timefilter.time = { from: 0, to: 1 };
       fn();
       expect(update.called).to.be(false);
       expect(fetch.called).to.be(false);
     });
 
     it('emit update and fetch if the time has changed', function () {
-      timefilter.time = {from: 5, to: 10};
+      timefilter.time = { from: 5, to: 10 };
       fn();
       expect(update.called).to.be(true);
       expect(fetch.called).to.be(true);
diff --git a/src/ui/public/timefilter/lib/diff_interval.js b/src/ui/public/timefilter/lib/diff_interval.js
index 9137e8d9dc65e..305f455a679c2 100644
--- a/src/ui/public/timefilter/lib/diff_interval.js
+++ b/src/ui/public/timefilter/lib/diff_interval.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import UtilsDiffTimePickerValsProvider from 'ui/utils/diff_time_picker_vals';
 export default function diffTimeProvider(Private) {
-  let diff = Private(UtilsDiffTimePickerValsProvider);
+  const diff = Private(UtilsDiffTimePickerValsProvider);
 
   return function (self) {
     let oldRefreshInterval = _.clone(self.refreshInterval);
@@ -17,4 +17,4 @@ export default function diffTimeProvider(Private) {
       oldRefreshInterval = _.clone(self.refreshInterval);
     };
   };
-};
+}
diff --git a/src/ui/public/timefilter/lib/diff_time.js b/src/ui/public/timefilter/lib/diff_time.js
index 39c1204cb46fe..d554c32beba01 100644
--- a/src/ui/public/timefilter/lib/diff_time.js
+++ b/src/ui/public/timefilter/lib/diff_time.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import UtilsDiffTimePickerValsProvider from 'ui/utils/diff_time_picker_vals';
 export default function diffTimeProvider(Private) {
-  let diff = Private(UtilsDiffTimePickerValsProvider);
+  const diff = Private(UtilsDiffTimePickerValsProvider);
 
   return function (self) {
     let oldTime = _.clone(self.time);
@@ -13,4 +13,4 @@ export default function diffTimeProvider(Private) {
       oldTime = _.clone(self.time);
     };
   };
-};
+}
diff --git a/src/ui/public/timefilter/timefilter.js b/src/ui/public/timefilter/timefilter.js
index 257bbc8e54d68..ffe57ba89dc7a 100644
--- a/src/ui/public/timefilter/timefilter.js
+++ b/src/ui/public/timefilter/timefilter.js
@@ -1,11 +1,9 @@
 import _ from 'lodash';
-import angular from 'angular';
 import moment from 'moment';
 import dateMath from '@elastic/datemath';
 import 'ui/state_management/global_state';
 import 'ui/config';
 import EventsProvider from 'ui/events';
-import UtilsDiffTimePickerValsProvider from 'ui/utils/diff_time_picker_vals';
 import TimefilterLibDiffTimeProvider from 'ui/timefilter/lib/diff_time';
 import TimefilterLibDiffIntervalProvider from 'ui/timefilter/lib/diff_interval';
 import uiRoutes from 'ui/routes';
@@ -19,11 +17,10 @@ uiRoutes
 uiModules
 .get('kibana')
 .service('timefilter', function (Private, globalState, $rootScope, config) {
-  let Events = Private(EventsProvider);
-  let diff = Private(UtilsDiffTimePickerValsProvider);
+  const Events = Private(EventsProvider);
 
   function convertISO8601(stringTime) {
-    let obj = moment(stringTime, 'YYYY-MM-DDTHH:mm:ss.SSSZ', true);
+    const obj = moment(stringTime, 'YYYY-MM-DDTHH:mm:ss.SSSZ', true);
     return obj.isValid() ? obj : stringTime;
   }
 
@@ -31,15 +28,15 @@ uiModules
   function Timefilter() {
     Timefilter.Super.call(this);
 
-    let self = this;
-    let diffTime = Private(TimefilterLibDiffTimeProvider)(self);
-    let diffInterval = Private(TimefilterLibDiffIntervalProvider)(self);
+    const self = this;
+    const diffTime = Private(TimefilterLibDiffTimeProvider)(self);
+    const diffInterval = Private(TimefilterLibDiffIntervalProvider)(self);
 
     self.enabled = false;
 
     self.init = _.once(function () {
-      let timeDefaults = config.get('timepicker:timeDefaults');
-      let refreshIntervalDefaults = config.get('timepicker:refreshIntervalDefaults');
+      const timeDefaults = config.get('timepicker:timeDefaults');
+      const refreshIntervalDefaults = config.get('timepicker:refreshIntervalDefaults');
 
       // These can be date math strings or moments.
       self.time = _.defaults(globalState.time || {}, timeDefaults);
@@ -47,8 +44,8 @@ uiModules
 
       globalState.on('fetch_with_changes', function () {
         // clone and default to {} in one
-        let newTime = _.defaults({}, globalState.time, timeDefaults);
-        let newRefreshInterval = _.defaults({}, globalState.refreshInterval, refreshIntervalDefaults);
+        const newTime = _.defaults({}, globalState.time, timeDefaults);
+        const newRefreshInterval = _.defaults({}, globalState.refreshInterval, refreshIntervalDefaults);
 
         if (newTime) {
           if (newTime.to) newTime.to = convertISO8601(newTime.to);
@@ -78,11 +75,11 @@ uiModules
 
   Timefilter.prototype.get = function (indexPattern) {
     let filter;
-    let timefield = indexPattern.timeFieldName && _.find(indexPattern.fields, {name: indexPattern.timeFieldName});
+    const timefield = indexPattern.timeFieldName && _.find(indexPattern.fields, { name: indexPattern.timeFieldName });
 
     if (timefield) {
-      let bounds = this.getBounds();
-      filter = {range : {}};
+      const bounds = this.getBounds();
+      filter = { range : {} };
       filter.range[timefield.name] = {
         gte: bounds.min.valueOf(),
         lte: bounds.max.valueOf(),
@@ -93,7 +90,7 @@ uiModules
     return filter;
   };
 
-  Timefilter.prototype.getBounds = function (timefield) {
+  Timefilter.prototype.getBounds = function () {
     return {
       min: dateMath.parse(this.time.from),
       max: dateMath.parse(this.time.to, true)
diff --git a/src/ui/public/timepicker/__tests__/toggle.js b/src/ui/public/timepicker/__tests__/toggle.js
index efb2c9ec0eccd..145b0deb15eeb 100644
--- a/src/ui/public/timepicker/__tests__/toggle.js
+++ b/src/ui/public/timepicker/__tests__/toggle.js
@@ -1,6 +1,5 @@
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import uiModules from 'ui/modules';
 import $ from 'jquery';
 
 describe('kbnGlobalTimepicker', function () {
diff --git a/src/ui/public/timepicker/kbn_global_timepicker.js b/src/ui/public/timepicker/kbn_global_timepicker.js
index 0656f3258e20d..db2b8544362cb 100644
--- a/src/ui/public/timepicker/kbn_global_timepicker.js
+++ b/src/ui/public/timepicker/kbn_global_timepicker.js
@@ -1,15 +1,13 @@
-import moment from 'moment';
 import UiModules from 'ui/modules';
-import chromeNavControlsRegistry from 'ui/registry/chrome_nav_controls';
 import { once, clone } from 'lodash';
 
 import toggleHtml from './kbn_global_timepicker.html';
 
 UiModules
 .get('kibana')
-.directive('kbnGlobalTimepicker', (timefilter, globalState, $rootScope, config) => {
+.directive('kbnGlobalTimepicker', (timefilter, globalState, $rootScope) => {
   const listenForUpdates = once($scope => {
-    $scope.$listen(timefilter, 'update', (newVal, oldVal) => {
+    $scope.$listen(timefilter, 'update', () => {
       globalState.time = clone(timefilter.time);
       globalState.refreshInterval = clone(timefilter.refreshInterval);
       globalState.save();
@@ -19,7 +17,7 @@ UiModules
   return {
     template: toggleHtml,
     replace: true,
-    link: ($scope, $el, attrs) => {
+    link: () => {
       listenForUpdates($rootScope);
 
       $rootScope.timefilter = timefilter;
diff --git a/src/ui/public/timepicker/quick_ranges.js b/src/ui/public/timepicker/quick_ranges.js
index 78b7c33b3fcca..8a983f6a288be 100644
--- a/src/ui/public/timepicker/quick_ranges.js
+++ b/src/ui/public/timepicker/quick_ranges.js
@@ -1,5 +1,5 @@
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.constant('quickRanges', [
   { from: 'now/d',    to: 'now/d',    display: 'Today',                 section: 0 },
diff --git a/src/ui/public/timepicker/refresh_intervals.js b/src/ui/public/timepicker/refresh_intervals.js
index 3845f2110e685..a355b13750ed8 100644
--- a/src/ui/public/timepicker/refresh_intervals.js
+++ b/src/ui/public/timepicker/refresh_intervals.js
@@ -1,22 +1,22 @@
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.constant('refreshIntervals', [
-  { value : 0, display: 'Off', section: 0},
+  { value : 0, display: 'Off', section: 0 },
 
-  { value : 5000, display: '5 seconds', section: 1},
-  { value : 10000, display: '10 seconds', section: 1},
-  { value : 30000, display: '30 seconds', section: 1},
-  { value : 45000, display: '45 seconds', section: 1},
+  { value : 5000, display: '5 seconds', section: 1 },
+  { value : 10000, display: '10 seconds', section: 1 },
+  { value : 30000, display: '30 seconds', section: 1 },
+  { value : 45000, display: '45 seconds', section: 1 },
 
-  { value : 60000, display: '1 minute', section: 2},
-  { value : 300000, display: '5 minutes', section: 2},
-  { value : 900000, display: '15 minutes', section: 2},
-  { value : 1800000, display: '30 minutes', section: 2},
+  { value : 60000, display: '1 minute', section: 2 },
+  { value : 300000, display: '5 minutes', section: 2 },
+  { value : 900000, display: '15 minutes', section: 2 },
+  { value : 1800000, display: '30 minutes', section: 2 },
 
-  { value : 3600000, display: '1 hour', section: 3},
-  { value : 7200000, display: '2 hour', section: 3},
-  { value : 43200000, display: '12 hour', section: 3},
-  { value : 86400000, display: '1 day', section: 3}
+  { value : 3600000, display: '1 hour', section: 3 },
+  { value : 7200000, display: '2 hour', section: 3 },
+  { value : 43200000, display: '12 hour', section: 3 },
+  { value : 86400000, display: '1 day', section: 3 }
 ]);
 
diff --git a/src/ui/public/timepicker/time_units.js b/src/ui/public/timepicker/time_units.js
index da8960a2df646..73b53d16e09d7 100644
--- a/src/ui/public/timepicker/time_units.js
+++ b/src/ui/public/timepicker/time_units.js
@@ -1,5 +1,5 @@
 import uiModules from 'ui/modules';
-let module = uiModules.get('kibana');
+const module = uiModules.get('kibana');
 
 module.constant('timeUnits', {
   s: 'second',
diff --git a/src/ui/public/timepicker/timepicker.js b/src/ui/public/timepicker/timepicker.js
index f5aab7dbb758c..a54310a16aa9a 100644
--- a/src/ui/public/timepicker/timepicker.js
+++ b/src/ui/public/timepicker/timepicker.js
@@ -10,8 +10,8 @@ import 'ui/timepicker/refresh_intervals';
 import 'ui/timepicker/time_units';
 import 'ui/timepicker/kbn_global_timepicker';
 import uiModules from 'ui/modules';
-let module = uiModules.get('ui/timepicker');
-let notify = new Notifier({
+const module = uiModules.get('ui/timepicker');
+const notify = new Notifier({
   location: 'timepicker',
 });
 
@@ -51,13 +51,13 @@ module.directive('kbnTimepicker', function (quickRanges, timeUnits, refreshInter
       $scope.units = timeUnits;
 
       $scope.relativeOptions = [
-        {text: 'Seconds ago', value: 's'},
-        {text: 'Minutes ago', value: 'm'},
-        {text: 'Hours ago', value: 'h'},
-        {text: 'Days ago', value: 'd'},
-        {text: 'Weeks ago', value: 'w'},
-        {text: 'Months ago', value: 'M'},
-        {text: 'Years ago', value: 'y'},
+        { text: 'Seconds ago', value: 's' },
+        { text: 'Minutes ago', value: 'm' },
+        { text: 'Hours ago', value: 'h' },
+        { text: 'Days ago', value: 'd' },
+        { text: 'Weeks ago', value: 'w' },
+        { text: 'Months ago', value: 'M' },
+        { text: 'Years ago', value: 'y' },
       ];
 
       $scope.$watch('from', function (date) {
@@ -85,7 +85,7 @@ module.directive('kbnTimepicker', function (quickRanges, timeUnits, refreshInter
           case 'quick':
             break;
           case 'relative':
-            let fromParts = $scope.from.toString().split('-');
+            const fromParts = $scope.from.toString().split('-');
             let relativeParts = [];
 
             // Try to parse the relative time, if we can't use moment duration to guestimate
@@ -96,11 +96,11 @@ module.directive('kbnTimepicker', function (quickRanges, timeUnits, refreshInter
               $scope.relative.count = parseInt(relativeParts[1], 10);
               $scope.relative.unit = relativeParts[2];
             } else {
-              let duration = moment.duration(moment().diff(dateMath.parse($scope.from)));
-              let units = _.pluck(_.clone($scope.relativeOptions).reverse(), 'value');
+              const duration = moment.duration(moment().diff(dateMath.parse($scope.from)));
+              const units = _.pluck(_.clone($scope.relativeOptions).reverse(), 'value');
               if ($scope.from.toString().split('/')[1]) $scope.relative.round = true;
               for (let i = 0; i < units.length; i++) {
-                let as = duration.as(units[i]);
+                const as = duration.as(units[i]);
                 if (as > 1) {
                   $scope.relative.count = Math.round(as);
                   $scope.relative.unit = units[i];
@@ -132,7 +132,7 @@ module.directive('kbnTimepicker', function (quickRanges, timeUnits, refreshInter
       };
 
       $scope.formatRelative = function () {
-        let parsed = dateMath.parse(getRelativeString());
+        const parsed = dateMath.parse(getRelativeString());
         $scope.relative.preview =  parsed ? parsed.format($scope.format) : undefined;
         return parsed;
       };
diff --git a/src/ui/public/typeahead/_input.js b/src/ui/public/typeahead/_input.js
index 88d8130102b48..6975b398470a9 100644
--- a/src/ui/public/typeahead/_input.js
+++ b/src/ui/public/typeahead/_input.js
@@ -1,7 +1,6 @@
-import _ from 'lodash';
 import 'ui/notify/directives';
 import uiModules from 'ui/modules';
-let typeahead = uiModules.get('kibana/typeahead');
+const typeahead = uiModules.get('kibana/typeahead');
 
 
 typeahead.directive('kbnTypeaheadInput', function ($rootScope) {
@@ -11,8 +10,8 @@ typeahead.directive('kbnTypeaheadInput', function ($rootScope) {
     require: ['^ngModel', '^kbnTypeahead'],
 
     link: function ($scope, $el, $attr, deps) {
-      let model = deps[0];
-      let typeaheadCtrl = deps[1];
+      const model = deps[0];
+      const typeaheadCtrl = deps[1];
 
       typeaheadCtrl.setInputModel(model);
 
diff --git a/src/ui/public/typeahead/_items.js b/src/ui/public/typeahead/_items.js
index 9f2bf9941c0e1..54e8d924f1983 100644
--- a/src/ui/public/typeahead/_items.js
+++ b/src/ui/public/typeahead/_items.js
@@ -1,8 +1,7 @@
-import _ from 'lodash';
 import listTemplate from 'ui/typeahead/partials/typeahead-items.html';
 import 'ui/notify/directives';
 import uiModules from 'ui/modules';
-let typeahead = uiModules.get('kibana/typeahead');
+const typeahead = uiModules.get('kibana/typeahead');
 
 
 typeahead.directive('kbnTypeaheadItems', function () {
diff --git a/src/ui/public/typeahead/typeahead.js b/src/ui/public/typeahead/typeahead.js
index a97ffd4f6f634..571137f786ecb 100644
--- a/src/ui/public/typeahead/typeahead.js
+++ b/src/ui/public/typeahead/typeahead.js
@@ -3,11 +3,11 @@ import 'ui/typeahead/typeahead.less';
 import 'ui/typeahead/_input';
 import 'ui/typeahead/_items';
 import uiModules from 'ui/modules';
-let typeahead = uiModules.get('kibana/typeahead');
+const typeahead = uiModules.get('kibana/typeahead');
 
 
 typeahead.directive('kbnTypeahead', function () {
-  let keyMap = {
+  const keyMap = {
     ESC: 27,
     UP: 38,
     DOWN: 40,
@@ -23,7 +23,7 @@ typeahead.directive('kbnTypeahead', function () {
     controllerAs: 'typeahead',
 
     controller: function ($scope, $element, $timeout, PersistedLog, config) {
-      let self = this;
+      const self = this;
       self.form = $element.closest('form');
       self.query = '';
       self.hidden = true;
@@ -138,7 +138,7 @@ typeahead.directive('kbnTypeahead', function () {
       };
 
       self.keypressHandler = function (ev) {
-        let keyCode = ev.which || ev.keyCode;
+        const keyCode = ev.which || ev.keyCode;
 
         if (self.focused) {
           self.hidden = false;
@@ -194,11 +194,11 @@ typeahead.directive('kbnTypeahead', function () {
         }
 
         // update the filteredItems using the query
-        let beginningMatches = $scope.items.filter(function (item) {
+        const beginningMatches = $scope.items.filter(function (item) {
           return item.indexOf(query) === 0;
         });
 
-        let otherMatches = $scope.items.filter(function (item) {
+        const otherMatches = $scope.items.filter(function (item) {
           return item.indexOf(query) > 0;
         });
 
@@ -210,7 +210,7 @@ typeahead.directive('kbnTypeahead', function () {
       };
 
       // handle updates to parent scope history
-      $scope.$watch('items', function (items) {
+      $scope.$watch('items', function () {
         if (self.query) {
           self.filterItemsByQuery(self.query);
         }
@@ -226,7 +226,7 @@ typeahead.directive('kbnTypeahead', function () {
       });
     },
 
-    link: function ($scope, $el, attr) {
+    link: function ($scope, $el) {
       // should be defined via setInput() method
       if (!$scope.inputModel) {
         throw new Error('kbn-typeahead-input must be defined');
diff --git a/src/ui/public/url/__tests__/url.js b/src/ui/public/url/__tests__/url.js
index f72469b6297b9..d29dfa4a69c9b 100644
--- a/src/ui/public/url/__tests__/url.js
+++ b/src/ui/public/url/__tests__/url.js
@@ -4,7 +4,6 @@ import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import faker from 'faker';
 import _ from 'lodash';
-import MockState from 'fixtures/mock_state';
 import AppStateProvider from 'ui/state_management/app_state';
 import 'ui/url';
 
@@ -79,7 +78,7 @@ describe('kbnUrl', function () {
         }
       };
 
-      let unbind = sinon.stub();
+      const unbind = sinon.stub();
       sinon.stub($rootScope, '$on').returns(unbind);
       $route.reload = sinon.stub();
 
@@ -87,7 +86,7 @@ describe('kbnUrl', function () {
       kbnUrl.change('/url');
       expect($rootScope.$on.callCount).to.be(1);
 
-      let handler = $rootScope.$on.firstCall.args[1];
+      const handler = $rootScope.$on.firstCall.args[1];
       handler();
       expect(unbind.callCount).to.be(1);
       expect($route.reload.callCount).to.be(1);
@@ -149,9 +148,9 @@ describe('kbnUrl', function () {
     });
 
     it('should uri encode replaced params', function () {
-      let url = '/some/path/';
-      let params = { replace: faker.Lorem.words(3).join(' ') };
-      let check = encodeURIComponent(params.replace);
+      const url = '/some/path/';
+      const params = { replace: faker.Lorem.words(3).join(' ') };
+      const check = encodeURIComponent(params.replace);
       sinon.stub($location, 'url');
 
       kbnUrl.change(url + '{{replace}}', params);
@@ -161,22 +160,22 @@ describe('kbnUrl', function () {
 
     it('should parse angular expression in substitutions and uri encode the results', function () {
       // build url by piecing together these parts
-      let urlParts = ['/', '/', '?', '&', '#'];
+      const urlParts = ['/', '/', '?', '&', '#'];
       // make sure it can parse templates with weird spacing
-      let wrappers = [ ['{{', '}}'], ['{{ ', ' }}'], ['{{', '  }}'], ['{{    ', '}}'], ['{{    ', '         }}']];
+      const wrappers = [ ['{{', '}}'], ['{{ ', ' }}'], ['{{', '  }}'], ['{{    ', '}}'], ['{{    ', '         }}']];
       // make sure filters are evaluated via angular expressions
-      let objIndex = 4; // used to case one replace as an object
-      let filters = ['', 'uppercase', '', 'uppercase', 'rison'];
+      const objIndex = 4; // used to case one replace as an object
+      const filters = ['', 'uppercase', '', 'uppercase', 'rison'];
 
       // the words (template keys) used must all be unique
-      let words = _.uniq(faker.Lorem.words(10)).slice(0, urlParts.length).map(function (word, i) {
+      const words = _.uniq(faker.Lorem.words(10)).slice(0, urlParts.length).map(function (word, i) {
         if (filters[i].length) {
           return word + '|' + filters[i];
         }
         return word;
       });
 
-      let replacements = faker.Lorem.words(urlParts.length).map(function (word, i) {
+      const replacements = faker.Lorem.words(urlParts.length).map(function (word, i) {
         // make selected replacement into an object
         if (i === objIndex) {
           return { replace: word };
@@ -190,15 +189,15 @@ describe('kbnUrl', function () {
       let testUrl = '';
       urlParts.forEach(function (part, i) {
         url += part + wrappers[i][0] + words[i] + wrappers[i][1];
-        let locals = {};
+        const locals = {};
         locals[words[i].split('|')[0]] = replacements[i];
         testUrl += part + encodeURIComponent($rootScope.$eval(words[i], locals));
       });
 
       // create the locals replacement object
-      let params = {};
+      const params = {};
       replacements.forEach(function (replacement, i) {
-        let word = words[i].split('|')[0];
+        const word = words[i].split('|')[0];
         params[word] = replacement;
       });
 
@@ -211,7 +210,7 @@ describe('kbnUrl', function () {
     });
 
     it('should handle dot notation', function () {
-      let url = '/some/thing/{{that.is.substituted}}';
+      const url = '/some/thing/{{that.is.substituted}}';
 
       kbnUrl.change(url, {
         that: {
@@ -225,8 +224,8 @@ describe('kbnUrl', function () {
     });
 
     it('should throw when params are missing', function () {
-      let url = '/{{replace_me}}';
-      let params = {};
+      const url = '/{{replace_me}}';
+      const params = {};
 
       try {
         kbnUrl.change(url, params);
@@ -238,8 +237,8 @@ describe('kbnUrl', function () {
     });
 
     it('should throw when filtered params are missing', function () {
-      let url = '/{{replace_me|number}}';
-      let params = {};
+      const url = '/{{replace_me|number}}';
+      const params = {};
 
       try {
         kbnUrl.change(url, params);
@@ -251,10 +250,10 @@ describe('kbnUrl', function () {
     });
 
     it('should change the entire url', function () {
-      let path = '/test/path';
-      let search = {search: 'test'};
-      let hash = 'hash';
-      let newPath = '/new/location';
+      const path = '/test/path';
+      const search = { search: 'test' };
+      const hash = 'hash';
+      const newPath = '/new/location';
 
       $location.path(path).search(search).hash(hash);
 
@@ -272,10 +271,10 @@ describe('kbnUrl', function () {
     });
 
     it('should allow setting app state on the target url', function () {
-      let path = '/test/path';
-      let search = {search: 'test'};
-      let hash = 'hash';
-      let newPath = '/new/location';
+      const path = '/test/path';
+      const search = { search: 'test' };
+      const hash = 'hash';
+      const newPath = '/new/location';
 
       $location.path(path).search(search).hash(hash);
 
@@ -295,10 +294,10 @@ describe('kbnUrl', function () {
 
   describe('changePath', function () {
     it('should change just the path', function () {
-      let path = '/test/path';
-      let search = {search: 'test'};
-      let hash = 'hash';
-      let newPath = '/new/location';
+      const path = '/test/path';
+      const search = { search: 'test' };
+      const hash = 'hash';
+      const newPath = '/new/location';
 
       $location.path(path).search(search).hash(hash);
 
@@ -318,10 +317,10 @@ describe('kbnUrl', function () {
 
   describe('redirect', function () {
     it('should change the entire url', function () {
-      let path = '/test/path';
-      let search = {search: 'test'};
-      let hash = 'hash';
-      let newPath = '/new/location';
+      const path = '/test/path';
+      const search = { search: 'test' };
+      const hash = 'hash';
+      const newPath = '/new/location';
 
       $location.path(path).search(search).hash(hash);
 
@@ -339,10 +338,10 @@ describe('kbnUrl', function () {
     });
 
     it('should allow setting app state on the target url', function () {
-      let path = '/test/path';
-      let search = {search: 'test'};
-      let hash = 'hash';
-      let newPath = '/new/location';
+      const path = '/test/path';
+      const search = { search: 'test' };
+      const hash = 'hash';
+      const newPath = '/new/location';
 
       $location.path(path).search(search).hash(hash);
 
@@ -380,10 +379,10 @@ describe('kbnUrl', function () {
 
   describe('redirectPath', function () {
     it('should only change the path', function () {
-      let path = '/test/path';
-      let search = {search: 'test'};
-      let hash = 'hash';
-      let newPath = '/new/location';
+      const path = '/test/path';
+      const search = { search: 'test' };
+      const hash = 'hash';
+      const newPath = '/new/location';
 
       $location
         .path(path)
diff --git a/src/ui/public/url/url.js b/src/ui/public/url/url.js
index 951a486ecbc8c..2292bbca56a22 100644
--- a/src/ui/public/url/url.js
+++ b/src/ui/public/url/url.js
@@ -2,14 +2,13 @@ import _ from 'lodash';
 import 'ui/filters/uriescape';
 import 'ui/filters/rison';
 import uiModules from 'ui/modules';
-import rison from 'rison-node';
 import AppStateProvider from 'ui/state_management/app_state';
 
 uiModules.get('kibana/url')
 .service('kbnUrl', function (Private) { return Private(KbnUrlProvider); });
 
 function KbnUrlProvider($injector, $location, $rootScope, $parse, Private) {
-  let self = this;
+  const self = this;
 
   /**
    * Navigate to a url
@@ -71,10 +70,10 @@ function KbnUrlProvider($injector, $location, $rootScope, $parse, Private) {
 
     return template.replace(/\{\{([^\}]+)\}\}/g, function (match, expr) {
       // remove filters
-      let key = expr.split('|')[0].trim();
+      const key = expr.split('|')[0].trim();
 
       // verify that the expression can be evaluated
-      let p = $parse(key)(paramObj);
+      const p = $parse(key)(paramObj);
 
       // if evaluation can't be made, throw
       if (_.isUndefined(p)) {
@@ -110,7 +109,7 @@ function KbnUrlProvider($injector, $location, $rootScope, $parse, Private) {
    * @return {string} - the computed url
    */
   self.getRouteUrl = function (obj, route) {
-    let template = obj && obj.routes && obj.routes[route];
+    const template = obj && obj.routes && obj.routes[route];
     if (template) return self.eval(template, obj);
   };
 
@@ -144,7 +143,7 @@ function KbnUrlProvider($injector, $location, $rootScope, $parse, Private) {
   let reloading;
 
   self._changeLocation = function (type, url, paramObj, replace, appState) {
-    let prev = {
+    const prev = {
       path: $location.path(),
       search: $location.search()
     };
@@ -157,7 +156,7 @@ function KbnUrlProvider($injector, $location, $rootScope, $parse, Private) {
       $location.search(appState.getQueryParamName(), appState.toQueryParam());
     }
 
-    let next = {
+    const next = {
       path: $location.path(),
       search: $location.search()
     };
@@ -184,7 +183,7 @@ function KbnUrlProvider($injector, $location, $rootScope, $parse, Private) {
   self._shouldForceReload = function (next, prev, $route) {
     if (reloading) return false;
 
-    let route = $route.current && $route.current.$$route;
+    const route = $route.current && $route.current.$$route;
     if (!route) return false;
 
     // for the purposes of determining whether the router will
@@ -193,8 +192,9 @@ function KbnUrlProvider($injector, $location, $rootScope, $parse, Private) {
     const prevPath = prev.path || '/';
     if (nextPath !== prevPath) return false;
 
-    let reloadOnSearch = route.reloadOnSearch;
-    let searchSame = _.isEqual(next.search, prev.search);
+    const reloadOnSearch = route.reloadOnSearch;
+    const searchSame = _.isEqual(next.search, prev.search);
+
     return (reloadOnSearch && searchSame) || !reloadOnSearch;
   };
 }
diff --git a/src/ui/public/utils/__tests__/add_word_breaks.js b/src/ui/public/utils/__tests__/add_word_breaks.js
index 594029f7e4045..c120df81d7a23 100644
--- a/src/ui/public/utils/__tests__/add_word_breaks.js
+++ b/src/ui/public/utils/__tests__/add_word_breaks.js
@@ -4,7 +4,7 @@ import addWordBreaks from 'ui/utils/add_word_breaks';
 
 describe('addWordBreaks', function () {
 
-  let fixtures = [
+  const fixtures = [
     ['aaaaaaaaaaaaaaaaaaaa', 'aaaaaaaaaaa<wbr>aaaaaaaaa'],
     ['aaaa aaaaaaaaaaaaaaa', 'aaaa aaaaaaaaaaa<wbr>aaaa'],
     ['aaaa;aaaaaaaaaaaaaaa', 'aaaa;aaaaaaaaaaa<wbr>aaaa'],
@@ -16,9 +16,9 @@ describe('addWordBreaks', function () {
   ];
 
   _.each(fixtures, function (fixture) {
-    let msg = 'should convert ' + fixture[0] + ' to ' + fixture[1];
+    const msg = 'should convert ' + fixture[0] + ' to ' + fixture[1];
     it(msg, function () {
-      let results = addWordBreaks(fixture[0], 10);
+      const results = addWordBreaks(fixture[0], 10);
       expect(results).to.be(fixture[1]);
     });
   });
diff --git a/src/ui/public/utils/__tests__/aggressive_parse.js b/src/ui/public/utils/__tests__/aggressive_parse.js
index e1d5d00509238..963f269cb0dac 100644
--- a/src/ui/public/utils/__tests__/aggressive_parse.js
+++ b/src/ui/public/utils/__tests__/aggressive_parse.js
@@ -58,11 +58,11 @@ describe('aggressiveParse', () => {
 
     context('with arity of 3', () => {
       beforeEach(() => {
-        result = aggressiveParse.toJson({foo: 'bar'}, undefined, 2);
+        result = aggressiveParse.toJson({ foo: 'bar' }, undefined, 2);
       });
 
       it('formats the json string with the number of spaces given', () => {
-        const formattedJson = JSON.stringify({foo: 'bar'}, null, 2);
+        const formattedJson = JSON.stringify({ foo: 'bar' }, null, 2);
         expect(result).to.be(formattedJson);
       });
     });
diff --git a/src/ui/public/utils/__tests__/decode_geo_hash.js b/src/ui/public/utils/__tests__/decode_geo_hash.js
index a868ac53bd500..590af7964277c 100644
--- a/src/ui/public/utils/__tests__/decode_geo_hash.js
+++ b/src/ui/public/utils/__tests__/decode_geo_hash.js
@@ -1,5 +1,5 @@
 import expect from 'expect.js';
-import {geohashColumns} from 'ui/utils/decode_geo_hash';
+import { geohashColumns } from 'ui/utils/decode_geo_hash';
 
 describe('decode_geo_hash', function () {
   it('geohashColumns', function () {
diff --git a/src/ui/public/utils/__tests__/diff_object.js b/src/ui/public/utils/__tests__/diff_object.js
index 9ae29007ad3c0..b05376a757bca 100644
--- a/src/ui/public/utils/__tests__/diff_object.js
+++ b/src/ui/public/utils/__tests__/diff_object.js
@@ -5,70 +5,70 @@ import _ from 'lodash';
 describe('ui/utils/diff_object', function () {
 
   it('should list the removed keys', function () {
-    let target = { test: 'foo' };
-    let source = { foo: 'test' };
-    let results = diff(target, source);
+    const target = { test: 'foo' };
+    const source = { foo: 'test' };
+    const results = diff(target, source);
     expect(results).to.have.property('removed');
     expect(results.removed).to.eql(['test']);
   });
 
   it('should list the changed keys', function () {
-    let target = { foo: 'bar' };
-    let source = { foo: 'test' };
-    let results = diff(target, source);
+    const target = { foo: 'bar' };
+    const source = { foo: 'test' };
+    const results = diff(target, source);
     expect(results).to.have.property('changed');
     expect(results.changed).to.eql(['foo']);
   });
 
   it('should list the added keys', function () {
-    let target = { };
-    let source = { foo: 'test' };
-    let results = diff(target, source);
+    const target = { };
+    const source = { foo: 'test' };
+    const results = diff(target, source);
     expect(results).to.have.property('added');
     expect(results.added).to.eql(['foo']);
   });
 
   it('should list all the keys that are change or removed', function () {
-    let target = { foo: 'bar', test: 'foo' };
-    let source = { foo: 'test' };
-    let results = diff(target, source);
+    const target = { foo: 'bar', test: 'foo' };
+    const source = { foo: 'test' };
+    const results = diff(target, source);
     expect(results).to.have.property('keys');
     expect(results.keys).to.eql(['foo', 'test']);
   });
 
   it('should ignore functions', function () {
-    let target = { foo: 'bar', test: 'foo' };
-    let source = { foo: 'test', fn: _.noop };
+    const target = { foo: 'bar', test: 'foo' };
+    const source = { foo: 'test', fn: _.noop };
     diff(target, source);
     expect(target).to.not.have.property('fn');
   });
 
   it('should ignore underscores', function () {
-    let target = { foo: 'bar', test: 'foo' };
-    let source = { foo: 'test', _private: 'foo' };
+    const target = { foo: 'bar', test: 'foo' };
+    const source = { foo: 'test', _private: 'foo' };
     diff(target, source);
     expect(target).to.not.have.property('_private');
   });
 
   it('should ignore dollar signs', function () {
-    let target = { foo: 'bar', test: 'foo' };
-    let source = { foo: 'test', $private: 'foo' };
+    const target = { foo: 'bar', test: 'foo' };
+    const source = { foo: 'test', $private: 'foo' };
     diff(target, source);
     expect(target).to.not.have.property('$private');
   });
 
   it('should not list any changes for similar objects', function () {
-    let target = { foo: 'bar', test: 'foo' };
-    let source = { foo: 'bar', test: 'foo', $private: 'foo' };
-    let results = diff(target, source);
+    const target = { foo: 'bar', test: 'foo' };
+    const source = { foo: 'bar', test: 'foo', $private: 'foo' };
+    const results = diff(target, source);
     expect(results.changed).to.be.empty();
   });
 
   it('should only change keys that actually changed', function () {
-    let obj = { 'message': 'foo' };
-    let target = { obj: obj, message: 'foo' };
-    let source = { obj: _.cloneDeep(obj), message: 'test' };
-    let results = diff(target, source);
+    const obj = { 'message': 'foo' };
+    const target = { obj: obj, message: 'foo' };
+    const source = { obj: _.cloneDeep(obj), message: 'test' };
+    diff(target, source);
     expect(target.obj).to.be(obj);
   });
 
diff --git a/src/ui/public/utils/__tests__/diff_time_picker_vals.js b/src/ui/public/utils/__tests__/diff_time_picker_vals.js
index 3fa98ac573c2f..5e0d4c4c5d902 100644
--- a/src/ui/public/utils/__tests__/diff_time_picker_vals.js
+++ b/src/ui/public/utils/__tests__/diff_time_picker_vals.js
@@ -13,13 +13,13 @@ describe('Diff Time Picker Values', function () {
   }));
 
   it('accepts two undefined values', function () {
-    let diff = diffTimePickerValues(undefined, undefined);
+    const diff = diffTimePickerValues(undefined, undefined);
     expect(diff).to.be(false);
   });
 
   describe('dateMath ranges', function () {
     it('knows a match', function () {
-      let diff = diffTimePickerValues(
+      const diff = diffTimePickerValues(
         {
           to: 'now',
           from: 'now-7d'
@@ -33,7 +33,7 @@ describe('Diff Time Picker Values', function () {
       expect(diff).to.be(false);
     });
     it('knows a difference', function () {
-      let diff = diffTimePickerValues(
+      const diff = diffTimePickerValues(
         {
           to: 'now',
           from: 'now-7d'
@@ -50,7 +50,7 @@ describe('Diff Time Picker Values', function () {
 
   describe('a dateMath range, and a moment range', function () {
     it('is always different', function () {
-      let diff = diffTimePickerValues(
+      const diff = diffTimePickerValues(
         {
           to: moment(),
           from: moment()
@@ -67,10 +67,10 @@ describe('Diff Time Picker Values', function () {
 
   describe('moment ranges', function () {
     it('uses the time value of moments for comparison', function () {
-      let to = moment();
-      let from = moment().add(1, 'day');
+      const to = moment();
+      const from = moment().add(1, 'day');
 
-      let diff = diffTimePickerValues(
+      const diff = diffTimePickerValues(
         {
           to: to.clone(),
           from: from.clone()
@@ -85,11 +85,11 @@ describe('Diff Time Picker Values', function () {
     });
 
     it('fails if any to or from is different', function () {
-      let to = moment();
-      let from = moment().add(1, 'day');
-      let from2 = moment().add(2, 'day');
+      const to = moment();
+      const from = moment().add(1, 'day');
+      const from2 = moment().add(2, 'day');
 
-      let diff = diffTimePickerValues(
+      const diff = diffTimePickerValues(
         {
           to: to.clone(),
           from: from.clone()
@@ -105,7 +105,7 @@ describe('Diff Time Picker Values', function () {
   });
 
   it('does not fall apart with unusual values', function () {
-    let diff = diffTimePickerValues({}, {});
+    const diff = diffTimePickerValues({}, {});
     expect(diff).to.be(false);
   });
 });
diff --git a/src/ui/public/utils/__tests__/mapping_setup.js b/src/ui/public/utils/__tests__/mapping_setup.js
index 347c6c6c0b089..621f55d43cd78 100644
--- a/src/ui/public/utils/__tests__/mapping_setup.js
+++ b/src/ui/public/utils/__tests__/mapping_setup.js
@@ -18,7 +18,7 @@ describe('ui/utils/mapping_setup', function () {
     });
 
     it('can set type as an option', function () {
-      const mapping = mappingSetup.expandShorthand({ foo: {type: 'integer'} });
+      const mapping = mappingSetup.expandShorthand({ foo: { type: 'integer' } });
       expect(mapping.foo.type).to.be('integer');
     });
 
diff --git a/src/ui/public/utils/__tests__/obj_define.js b/src/ui/public/utils/__tests__/obj_define.js
index fb4588fd0922d..7a8575b3985bd 100644
--- a/src/ui/public/utils/__tests__/obj_define.js
+++ b/src/ui/public/utils/__tests__/obj_define.js
@@ -9,10 +9,10 @@ describe('ObjDefine Utility', function () {
 
   describe('#writ', function () {
     it('creates writeable properties', function () {
-      let def = new ObjDefine();
+      const def = new ObjDefine();
       def.writ('name', 'foo');
 
-      let obj = def.create();
+      const obj = def.create();
       expect(obj).to.have.property('name', 'foo');
 
       obj.name = 'bar';
@@ -20,13 +20,13 @@ describe('ObjDefine Utility', function () {
     });
 
     it('exports the property to JSON', function () {
-      let def = new ObjDefine();
+      const def = new ObjDefine();
       def.writ('name', 'foo');
       expect(flatten(def.create())).to.have.property('name', 'foo');
     });
 
     it('does not export property to JSON it it\'s undefined or null', function () {
-      let def = new ObjDefine();
+      const def = new ObjDefine();
       def.writ('name');
       expect(flatten(def.create())).to.not.have.property('name');
 
@@ -35,10 +35,10 @@ describe('ObjDefine Utility', function () {
     });
 
     it('switched to exporting if a value is written', function () {
-      let def = new ObjDefine();
+      const def = new ObjDefine();
       def.writ('name');
 
-      let obj = def.create();
+      const obj = def.create();
       expect(flatten(obj)).to.not.have.property('name');
 
       obj.name = null;
@@ -49,10 +49,10 @@ describe('ObjDefine Utility', function () {
     });
 
     it('setting a writ value to null prevents it from exporting', function () {
-      let def = new ObjDefine();
+      const def = new ObjDefine();
       def.writ('name', 'foo');
 
-      let obj = def.create();
+      const obj = def.create();
       expect(flatten(obj)).to.have.property('name', 'foo');
 
       obj.name = null;
@@ -63,11 +63,11 @@ describe('ObjDefine Utility', function () {
 
   describe('#fact', function () {
     it('creates an immutable field', function () {
-      let def = new ObjDefine();
-      let val = 'foo';
-      let notval = 'bar';
+      const def = new ObjDefine();
+      const val = 'foo';
+      const notval = 'bar';
       def.fact('name', val);
-      let obj = def.create();
+      const obj = def.create();
 
 
       obj.name = notval; // UPDATE SHOULD BE IGNORED
@@ -75,7 +75,7 @@ describe('ObjDefine Utility', function () {
     });
 
     it('exports the fact to JSON', function () {
-      let def = new ObjDefine();
+      const def = new ObjDefine();
       def.fact('name', 'foo');
       expect(flatten(def.create())).to.have.property('name', 'foo');
     });
@@ -83,11 +83,11 @@ describe('ObjDefine Utility', function () {
 
   describe('#comp', function () {
     it('creates an immutable field', function () {
-      let def = new ObjDefine();
-      let val = 'foo';
-      let notval = 'bar';
+      const def = new ObjDefine();
+      const val = 'foo';
+      const notval = 'bar';
       def.comp('name', val);
-      let obj = def.create();
+      const obj = def.create();
 
       expect(function () {
         'use strict'; // eslint-disable-line strict
@@ -97,7 +97,7 @@ describe('ObjDefine Utility', function () {
     });
 
     it('does not export the computed value to JSON', function () {
-      let def = new ObjDefine();
+      const def = new ObjDefine();
       def.comp('name', 'foo');
       expect(flatten(def.create())).to.not.have.property('name');
     });
@@ -108,24 +108,24 @@ describe('ObjDefine Utility', function () {
     it('creates object that inherits from the prototype', function () {
       function SomeClass() {}
 
-      let def = new ObjDefine(null, SomeClass.prototype);
-      let obj = def.create();
+      const def = new ObjDefine(null, SomeClass.prototype);
+      const obj = def.create();
 
       expect(obj).to.be.a(SomeClass);
     });
 
     it('uses the defaults for property values', function () {
-      let def = new ObjDefine({ name: 'bar' });
+      const def = new ObjDefine({ name: 'bar' });
       def.fact('name');
 
-      let obj = def.create();
+      const obj = def.create();
 
       expect(obj).to.have.property('name', 'bar');
     });
 
     it('ignores default values that are not defined propertyes', function () {
-      let def = new ObjDefine({ name: 'foo', name2: 'bar' });
-      let obj = def.create();
+      const def = new ObjDefine({ name: 'foo', name2: 'bar' });
+      const obj = def.create();
 
       expect(obj).to.not.have.property('name');
       expect(obj).to.not.have.property('name2');
diff --git a/src/ui/public/utils/__tests__/ordinal_suffix.js b/src/ui/public/utils/__tests__/ordinal_suffix.js
index 1fc5c716ca646..0d545d86a04d6 100644
--- a/src/ui/public/utils/__tests__/ordinal_suffix.js
+++ b/src/ui/public/utils/__tests__/ordinal_suffix.js
@@ -3,7 +3,7 @@ import addOrdinalSuffix from 'ui/utils/ordinal_suffix';
 import expect from 'expect.js';
 
 describe('ordinal suffix util', function () {
-  let checks = {
+  const checks = {
     1: 'st',
     2: 'nd',
     3: 'rd',
@@ -37,8 +37,8 @@ describe('ordinal suffix util', function () {
   };
 
   _.forOwn(checks, function (expected, num) {
-    let int = parseInt(num, 10);
-    let float = int + Math.random();
+    const int = parseInt(num, 10);
+    const float = int + Math.random();
 
     it('knowns ' + int, function () {
       expect(addOrdinalSuffix(num)).to.be(num + '' + expected);
diff --git a/src/ui/public/utils/__tests__/range.js b/src/ui/public/utils/__tests__/range.js
index de403fc61728d..0b835845cffb6 100644
--- a/src/ui/public/utils/__tests__/range.js
+++ b/src/ui/public/utils/__tests__/range.js
@@ -25,7 +25,7 @@ describe('Range parsing utility', function () {
     }).to.throwException(TypeError);
   });
 
-  let tests = {
+  const tests = {
     '[ 0 , 100 ]': {
       props: {
         min: 0,
@@ -92,7 +92,7 @@ describe('Range parsing utility', function () {
   _.forOwn(tests, function (spec, str) {
 
     describe(str, function () {
-      let range = parse(str);
+      const range = parse(str);
 
       it('creation', function () {
         expect(range).to.eql(spec.props);
diff --git a/src/ui/public/utils/__tests__/scanner.js b/src/ui/public/utils/__tests__/scanner.js
index 1d3feb196a36d..fb0860c8125c1 100644
--- a/src/ui/public/utils/__tests__/scanner.js
+++ b/src/ui/public/utils/__tests__/scanner.js
@@ -41,8 +41,8 @@ describe('Scanner', function () {
     let search;
     let scroll;
     let scanner;
-    let mockSearch = {'_scroll_id':'abc','took':1,'timed_out':false,'_shards':{'total':1,'successful':1,'failed':0},'hits':{'total':2,'max_score':0.0,'hits':[]}}; // eslint-disable-line max-len
-    let mockScroll = {'took':1,'timed_out':false,'_shards':{'total':1,'successful':1,'failed':0},'hits':{'total':2,'max_score':0.0,'hits':['one', 'two']}}; // eslint-disable-line max-len
+    const mockSearch = { '_scroll_id':'abc','took':1,'timed_out':false,'_shards':{ 'total':1,'successful':1,'failed':0 },'hits':{ 'total':2,'max_score':0.0,'hits':[] } }; // eslint-disable-line max-len
+    const mockScroll = { 'took':1,'timed_out':false,'_shards':{ 'total':1,'successful':1,'failed':0 },'hits':{ 'total':2,'max_score':0.0,'hits':['one', 'two'] } }; // eslint-disable-line max-len
 
     beforeEach(function () {
       scanner = new Scanner(es, {
@@ -57,7 +57,7 @@ describe('Scanner', function () {
       search.restore();
       search = sinon.stub(scanner.client, 'search', (req, cb) => cb(new Error('fail.')));
       return scanner.scanAndMap('')
-      .then(function (response) {
+      .then(function () {
         done(new Error('should reject'));
       })
       .catch(function (error) {
@@ -68,7 +68,7 @@ describe('Scanner', function () {
 
     it('should search and then scroll for results', function () {
       return scanner.scanAndMap('')
-      .then(function (response) {
+      .then(function () {
         expect(search.called).to.be(true);
         expect(scroll.called).to.be(true);
       });
@@ -85,7 +85,7 @@ describe('Scanner', function () {
     });
 
     it('should only return the requested number of documents', function () {
-      return scanner.scanAndMap(null, {docCount: 1}, function (hit) {
+      return scanner.scanAndMap(null, { docCount: 1 }, function (hit) {
         return hit.toUpperCase();
       })
       .then(function (response) {
@@ -96,9 +96,9 @@ describe('Scanner', function () {
 
     it('should scroll across multiple pages', function () {
       scroll.restore();
-      let oneResult = {'took':1,'timed_out':false,'_shards':{'total':1,'successful':1,'failed':0},'hits':{'total':2,'max_score':0.0,'hits':['one']}}; // eslint-disable-line max-len
+      const oneResult = { 'took':1,'timed_out':false,'_shards':{ 'total':1,'successful':1,'failed':0 },'hits':{ 'total':2,'max_score':0.0,'hits':['one'] } }; // eslint-disable-line max-len
       scroll = sinon.stub(scanner.client, 'scroll', (req, cb) => cb(null, oneResult));
-      return scanner.scanAndMap(null, {pageSize: 1})
+      return scanner.scanAndMap(null, { pageSize: 1 })
       .then(function (response) {
         expect(scroll.calledTwice);
         expect(response.hits.length).to.be(2);
diff --git a/src/ui/public/utils/__tests__/sequencer.js b/src/ui/public/utils/__tests__/sequencer.js
index ef03a16b8f939..3a163ff6ad76e 100644
--- a/src/ui/public/utils/__tests__/sequencer.js
+++ b/src/ui/public/utils/__tests__/sequencer.js
@@ -3,7 +3,7 @@ import sequencer from 'ui/utils/sequencer';
 import expect from 'expect.js';
 describe('sequencer util', function () {
 
-  let opts = [
+  const opts = [
     { min: 500, max: 7500, length: 1500 },
     { min: 50, max: 500, length: 1000 },
     { min: 5, max: 50, length: 100 }
diff --git a/src/ui/public/utils/__tests__/simple_emitter.js b/src/ui/public/utils/__tests__/simple_emitter.js
index 41518bbe877d9..1d8aee66f1d52 100644
--- a/src/ui/public/utils/__tests__/simple_emitter.js
+++ b/src/ui/public/utils/__tests__/simple_emitter.js
@@ -40,7 +40,7 @@ describe('SimpleEmitter class', function () {
 
   describe('#on', function () {
     it('registers a handler', function () {
-      let handler = sinon.stub();
+      const handler = sinon.stub();
       emitter.on('a', handler);
       expect(emitter.listenerCount('a')).to.be(1);
 
@@ -56,7 +56,7 @@ describe('SimpleEmitter class', function () {
     });
 
     it('allows the same function to be registered multiple times', function () {
-      let handler = function () {};
+      const handler = function () {};
       emitter.on('a', handler);
       expect(emitter.listenerCount()).to.be(1);
       emitter.on('a', handler);
@@ -66,7 +66,7 @@ describe('SimpleEmitter class', function () {
 
   describe('#off', function () {
     it('removes a listener if it was registered', function () {
-      let handler = sinon.stub();
+      const handler = sinon.stub();
       expect(emitter.listenerCount()).to.be(0);
       emitter.on('a', handler);
       expect(emitter.listenerCount('a')).to.be(1);
@@ -94,11 +94,11 @@ describe('SimpleEmitter class', function () {
   describe('#emit', function () {
     it('calls the handlers in the order they were defined', function () {
       let i = 0;
-      let incr = function () { return ++i; };
-      let one = sinon.spy(incr);
-      let two = sinon.spy(incr);
-      let three = sinon.spy(incr);
-      let four = sinon.spy(incr);
+      const incr = function () { return ++i; };
+      const one = sinon.spy(incr);
+      const two = sinon.spy(incr);
+      const three = sinon.spy(incr);
+      const four = sinon.spy(incr);
 
       emitter
       .on('a', one)
@@ -122,11 +122,11 @@ describe('SimpleEmitter class', function () {
 
     it('always emits the handlers that were initially registered', function () {
 
-      let destructive = sinon.spy(function () {
+      const destructive = sinon.spy(function () {
         emitter.removeAllListeners();
         expect(emitter.listenerCount()).to.be(0);
       });
-      let stub = sinon.stub();
+      const stub = sinon.stub();
 
       emitter.on('run', destructive).on('run', stub).emit('run');
 
diff --git a/src/ui/public/utils/__tests__/slugify_id.js b/src/ui/public/utils/__tests__/slugify_id.js
index 57f7f2181501b..d28b46fac20ab 100644
--- a/src/ui/public/utils/__tests__/slugify_id.js
+++ b/src/ui/public/utils/__tests__/slugify_id.js
@@ -4,7 +4,7 @@ import expect from 'expect.js';
 
 describe('slugifyId()', function () {
 
-  let fixtures = [
+  const fixtures = [
     ['test/test', 'test-slash-test'],
     ['test?test', 'test-questionmark-test'],
     ['test=test', 'test-equal-test'],
@@ -28,9 +28,9 @@ describe('slugifyId()', function () {
   ];
 
   _.each(fixtures, function (fixture) {
-    let msg = 'should convert ' + fixture[0] + ' to ' + fixture[1];
+    const msg = 'should convert ' + fixture[0] + ' to ' + fixture[1];
     it(msg, function () {
-      let results = slugifyId(fixture[0]);
+      const results = slugifyId(fixture[0]);
       expect(results).to.be(fixture[1]);
     });
   });
diff --git a/src/ui/public/utils/add_word_breaks.js b/src/ui/public/utils/add_word_breaks.js
index 6f2454e93ebe4..46e20d8330706 100644
--- a/src/ui/public/utils/add_word_breaks.js
+++ b/src/ui/public/utils/add_word_breaks.js
@@ -1,49 +1,47 @@
-define(function () {
-  return function addWordBreaks(text, minLineLength) {
-    text = text || '';
-    let lineSize = 0;
-    let newText = '';
-    let inHtmlTag = false;
-    let inHtmlChar = false;
+export default function addWordBreaks(text, minLineLength) {
+  text = text || '';
+  let lineSize = 0;
+  let newText = '';
+  let inHtmlTag = false;
+  let inHtmlChar = false;
 
-    for (let i = 0, len = text.length; i < len; i++) {
-      let chr = text.charAt(i);
-      newText += chr;
+  for (let i = 0, len = text.length; i < len; i++) {
+    const chr = text.charAt(i);
+    newText += chr;
 
-      switch (chr) {
-        case ' ':
-        case ':':
-        case ',':
-          // natural line break, reset line size
-          lineSize = 0;
-          break;
-        case '<':
-          inHtmlTag = true;
-          break;
-        case '>':
-          inHtmlTag = false;
-          lineSize = 0;
-          break;
-        case '&':
-          inHtmlChar = true;
-          break;
-        case ';':
-          inHtmlChar = false;
-          lineSize = 0;
-          break;
-        default:
-          if (!inHtmlTag && !inHtmlChar) lineSize++;
-          break;
-      }
-
-      if (lineSize > minLineLength) {
-        // continuous text is longer then we want,
-        // so break it up with a <wbr>
+    switch (chr) {
+      case ' ':
+      case ':':
+      case ',':
+        // natural line break, reset line size
+        lineSize = 0;
+        break;
+      case '<':
+        inHtmlTag = true;
+        break;
+      case '>':
+        inHtmlTag = false;
+        lineSize = 0;
+        break;
+      case '&':
+        inHtmlChar = true;
+        break;
+      case ';':
+        inHtmlChar = false;
         lineSize = 0;
-        newText += '<wbr>';
-      }
+        break;
+      default:
+        if (!inHtmlTag && !inHtmlChar) lineSize++;
+        break;
+    }
+
+    if (lineSize > minLineLength) {
+      // continuous text is longer then we want,
+      // so break it up with a <wbr>
+      lineSize = 0;
+      newText += '<wbr>';
     }
+  }
 
-    return newText;
-  };
-});
+  return newText;
+}
diff --git a/src/ui/public/utils/aggressive_parse.js b/src/ui/public/utils/aggressive_parse.js
index 340ae74597dc1..767c97a9ebf5f 100644
--- a/src/ui/public/utils/aggressive_parse.js
+++ b/src/ui/public/utils/aggressive_parse.js
@@ -17,7 +17,7 @@ export function toJson(object, jsonFn, space) {
     object = JSON.parse(jsonFn(object));
   }
   return JSON.stringify(object, replacer, space);
-};
+}
 
 /**
  * Returns the given value if the key does not begin with a dollar sign ($)
diff --git a/src/ui/public/utils/brush_event.js b/src/ui/public/utils/brush_event.js
index 9ecdc074d784d..b5a83798dbbc4 100644
--- a/src/ui/public/utils/brush_event.js
+++ b/src/ui/public/utils/brush_event.js
@@ -1,8 +1,8 @@
 import moment from 'moment';
 export default function brushEventProvider(timefilter) {
   return function (event) {
-    let from = moment(event.range[0]);
-    let to = moment(event.range[1]);
+    const from = moment(event.range[0]);
+    const to = moment(event.range[1]);
 
     if (to - from === 0) return;
 
@@ -10,4 +10,4 @@ export default function brushEventProvider(timefilter) {
     timefilter.time.to = to;
     timefilter.time.mode = 'absolute';
   };
-};
+}
diff --git a/src/ui/public/utils/cidr_mask.js b/src/ui/public/utils/cidr_mask.js
index a0ae16709538c..5bc8ff8174e61 100644
--- a/src/ui/public/utils/cidr_mask.js
+++ b/src/ui/public/utils/cidr_mask.js
@@ -1,12 +1,12 @@
 import Ipv4Address from 'ui/utils/ipv4_address';
-let NUM_BITS = 32;
+const NUM_BITS = 32;
 
 function throwError(mask) {
   throw Error('Invalid CIDR mask: ' + mask);
 }
 
 function CidrMask(mask) {
-  let splits = mask.split('\/');
+  const splits = mask.split('\/');
   if (splits.length !== 2) throwError(mask);
   this.initialAddress = new Ipv4Address(splits[0]);
   this.prefixLength = Number(splits[1]);
@@ -14,9 +14,9 @@ function CidrMask(mask) {
 }
 
 CidrMask.prototype.getRange = function () {
-  let variableBits = NUM_BITS - this.prefixLength;
-  let fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned
-  let numAddresses = Math.pow(2, variableBits);
+  const variableBits = NUM_BITS - this.prefixLength;
+  const fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned
+  const numAddresses = Math.pow(2, variableBits);
   return {
     from: new Ipv4Address(fromAddress).toString(),
     to: new Ipv4Address(fromAddress + numAddresses - 1).toString()
diff --git a/src/ui/public/utils/date_range.js b/src/ui/public/utils/date_range.js
index 4b4b153fbafbf..f0c067ce25797 100644
--- a/src/ui/public/utils/date_range.js
+++ b/src/ui/public/utils/date_range.js
@@ -12,13 +12,13 @@ export default {
   },
   parse: function (rangeString, format) {
     let chunks = rangeString.split(' to ');
-    if (chunks.length === 2) return {from: moment(chunks[0], format), to: moment(chunks[1], format)};
+    if (chunks.length === 2) return { from: moment(chunks[0], format), to: moment(chunks[1], format) };
 
     chunks = rangeString.split('Before ');
-    if (chunks.length === 2) return {to: moment(chunks[1], format)};
+    if (chunks.length === 2) return { to: moment(chunks[1], format) };
 
     chunks = rangeString.split('After ');
-    if (chunks.length === 2) return {from: moment(chunks[1], format)};
+    if (chunks.length === 2) return { from: moment(chunks[1], format) };
 
     throw new Error('Error attempting to parse date range: ' + rangeString);
   }
diff --git a/src/ui/public/utils/diff_object.js b/src/ui/public/utils/diff_object.js
index 25df114df3729..32f2d41111b1f 100644
--- a/src/ui/public/utils/diff_object.js
+++ b/src/ui/public/utils/diff_object.js
@@ -3,14 +3,14 @@ import angular from 'angular';
 
 export default function (target, source) {
 
-  let diff = {};
+  const diff = {};
 
   /**
    * Filter the private vars
    * @param {string} key The keys
    * @returns {boolean}
    */
-  let filterPrivateAndMethods = function (obj) {
+  const filterPrivateAndMethods = function (obj) {
     return function (key) {
       if (_.isFunction(obj[key])) return false;
       if (key.charAt(0) === '$') return false;
@@ -18,8 +18,8 @@ export default function (target, source) {
     };
   };
 
-  let targetKeys = _.keys(target).filter(filterPrivateAndMethods(target));
-  let sourceKeys = _.keys(source).filter(filterPrivateAndMethods(source));
+  const targetKeys = _.keys(target).filter(filterPrivateAndMethods(target));
+  const sourceKeys = _.keys(source).filter(filterPrivateAndMethods(source));
 
   // Find the keys to be removed
   diff.removed = _.difference(targetKeys, sourceKeys);
@@ -47,4 +47,4 @@ export default function (target, source) {
 
   return diff;
 
-};
+}
diff --git a/src/ui/public/utils/diff_time_picker_vals.js b/src/ui/public/utils/diff_time_picker_vals.js
index 43fcfcd5d38d6..0f0ca2874e992 100644
--- a/src/ui/public/utils/diff_time_picker_vals.js
+++ b/src/ui/public/utils/diff_time_picker_vals.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 import angular from 'angular';
 export default function DiffTimePickerValuesFn() {
 
-  let valueOf = function (o) {
+  const valueOf = function (o) {
     if (o) return o.valueOf();
   };
 
@@ -22,4 +22,4 @@ export default function DiffTimePickerValuesFn() {
 
     return false;
   };
-};
+}
diff --git a/src/ui/public/utils/es_bool.js b/src/ui/public/utils/es_bool.js
new file mode 100644
index 0000000000000..fa5d52f008ef4
--- /dev/null
+++ b/src/ui/public/utils/es_bool.js
@@ -0,0 +1,20 @@
+const map = {
+  'false': false,
+  'off': false,
+  'no': false,
+  '0': false,
+  'true': true,
+  'on': true,
+  'yes': true,
+  '1': true
+};
+
+export default function (str) {
+  const bool = map[String(str)];
+
+  if (typeof bool !== 'boolean') {
+    throw new TypeError('"' + str + '" does not map to an esBool');
+  }
+
+  return bool;
+}
diff --git a/src/ui/public/utils/find_by_param.js b/src/ui/public/utils/find_by_param.js
index 60763f07f8478..20dd45773c6a0 100644
--- a/src/ui/public/utils/find_by_param.js
+++ b/src/ui/public/utils/find_by_param.js
@@ -3,9 +3,9 @@ import _ from 'lodash';
 // if the param is missing, return undefined
 export default function findByParam(values, param) {
   if (_.isArray(values)) { // point series chart
-    let index = _.findIndex(values, param);
+    const index = _.findIndex(values, param);
     if (index === -1) return;
     return values[index][param];
   }
   return values[param]; // pie chart
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/ui/public/utils/ipv4_address.js b/src/ui/public/utils/ipv4_address.js
index d8c396d02ab6b..c40a6b4af5994 100644
--- a/src/ui/public/utils/ipv4_address.js
+++ b/src/ui/public/utils/ipv4_address.js
@@ -1,50 +1,48 @@
-define(function () {
-  let NUM_BYTES = 4;
-  let BYTE_SIZE = 256;
+const NUM_BYTES = 4;
+const BYTE_SIZE = 256;
 
-  function throwError(ipAddress) {
-    throw Error('Invalid IPv4 address: ' + ipAddress);
-  }
+function throwError(ipAddress) {
+  throw Error('Invalid IPv4 address: ' + ipAddress);
+}
 
-  function isIntegerInRange(integer, min, max) {
-    return !isNaN(integer)
-      && integer >= min
-      && integer < max
-      && integer % 1 === 0;
-  }
+function isIntegerInRange(integer, min, max) {
+  return !isNaN(integer)
+    && integer >= min
+    && integer < max
+    && integer % 1 === 0;
+}
 
-  function Ipv4Address(ipAddress) {
-    this.value = ipAddress;
+function Ipv4Address(ipAddress) {
+  this.value = ipAddress;
 
-    if (typeof ipAddress === 'string') {
-      this.value = 0;
+  if (typeof ipAddress === 'string') {
+    this.value = 0;
 
-      let bytes = ipAddress.split('.');
-      if (bytes.length !== NUM_BYTES) throwError(ipAddress);
+    const bytes = ipAddress.split('.');
+    if (bytes.length !== NUM_BYTES) throwError(ipAddress);
 
-      for (let i = 0; i < bytes.length; i++) {
-        let byte = Number(bytes[i]);
-        if (!isIntegerInRange(byte, 0, BYTE_SIZE)) throwError(ipAddress);
-        this.value += Math.pow(BYTE_SIZE, NUM_BYTES - 1 - i) * byte;
-      }
+    for (let i = 0; i < bytes.length; i++) {
+      const byte = Number(bytes[i]);
+      if (!isIntegerInRange(byte, 0, BYTE_SIZE)) throwError(ipAddress);
+      this.value += Math.pow(BYTE_SIZE, NUM_BYTES - 1 - i) * byte;
     }
-
-    if (!isIntegerInRange(this.value, 0, Math.pow(BYTE_SIZE, NUM_BYTES))) throwError(ipAddress);
   }
 
-  Ipv4Address.prototype.toString = function () {
-    let value = this.value;
-    let bytes = [];
-    for (let i = 0; i < NUM_BYTES; i++) {
-      bytes.unshift(value % 256);
-      value = Math.floor(value / 256);
-    }
-    return bytes.join('.');
-  };
+  if (!isIntegerInRange(this.value, 0, Math.pow(BYTE_SIZE, NUM_BYTES))) throwError(ipAddress);
+}
+
+Ipv4Address.prototype.toString = function () {
+  let value = this.value;
+  const bytes = [];
+  for (let i = 0; i < NUM_BYTES; i++) {
+    bytes.unshift(value % 256);
+    value = Math.floor(value / 256);
+  }
+  return bytes.join('.');
+};
 
-  Ipv4Address.prototype.valueOf = function () {
-    return this.value;
-  };
+Ipv4Address.prototype.valueOf = function () {
+  return this.value;
+};
 
-  return Ipv4Address;
-});
+export default Ipv4Address;
diff --git a/src/ui/public/utils/lodash-mixins/collection.js b/src/ui/public/utils/lodash-mixins/collection.js
index f2c5041281292..72088a4073f68 100644
--- a/src/ui/public/utils/lodash-mixins/collection.js
+++ b/src/ui/public/utils/lodash-mixins/collection.js
@@ -123,4 +123,4 @@ export default function (_) {
 
 
   });
-};
+}
diff --git a/src/ui/public/utils/lodash-mixins/function.js b/src/ui/public/utils/lodash-mixins/function.js
index 1d3c022ad6cfe..4bda037781b4c 100644
--- a/src/ui/public/utils/lodash-mixins/function.js
+++ b/src/ui/public/utils/lodash-mixins/function.js
@@ -62,4 +62,4 @@ export default function (_) {
     }
 
   });
-};
+}
diff --git a/src/ui/public/utils/lodash-mixins/lang.js b/src/ui/public/utils/lodash-mixins/lang.js
index 963a01717c634..b4be54c058808 100644
--- a/src/ui/public/utils/lodash-mixins/lang.js
+++ b/src/ui/public/utils/lodash-mixins/lang.js
@@ -16,4 +16,4 @@ export default function (_) {
     },
 
   });
-};
+}
diff --git a/src/ui/public/utils/lodash-mixins/object.js b/src/ui/public/utils/lodash-mixins/object.js
index 334e1b5d8af4a..54925df86c020 100644
--- a/src/ui/public/utils/lodash-mixins/object.js
+++ b/src/ui/public/utils/lodash-mixins/object.js
@@ -35,4 +35,4 @@ export default function (_) {
     }
 
   });
-};
+}
diff --git a/src/ui/public/utils/lodash-mixins/oop.js b/src/ui/public/utils/lodash-mixins/oop.js
index b8a148f280048..2dc26c7cc3930 100644
--- a/src/ui/public/utils/lodash-mixins/oop.js
+++ b/src/ui/public/utils/lodash-mixins/oop.js
@@ -41,4 +41,4 @@ export default function (_) {
       return Object.defineProperties(ClassConstructor, props);
     }
   });
-};
+}
diff --git a/src/ui/public/utils/lodash-mixins/string.js b/src/ui/public/utils/lodash-mixins/string.js
index a4ab8bfdb91e5..e50545d275335 100644
--- a/src/ui/public/utils/lodash-mixins/string.js
+++ b/src/ui/public/utils/lodash-mixins/string.js
@@ -50,4 +50,4 @@ export default function (_) {
     }
 
   });
-};
+}
diff --git a/src/ui/public/utils/mapping_setup.js b/src/ui/public/utils/mapping_setup.js
index fdca52ff7afc9..41780d5305095 100644
--- a/src/ui/public/utils/mapping_setup.js
+++ b/src/ui/public/utils/mapping_setup.js
@@ -1,110 +1,108 @@
 import angular from 'angular';
 import _ from 'lodash';
-define(function () {
-  return function MappingSetupService(kbnIndex, es) {
-    let mappingSetup = this;
 
-    let json = {
-      _serialize: function (val) {
-        if (val != null) return angular.toJson(val);
-      },
-      _deserialize: function (val) {
-        if (val != null) return JSON.parse(val);
-      }
-    };
+export default function MappingSetupService(kbnIndex, es) {
+  const mappingSetup = this;
 
-    /**
-     * Use to create the mappings, but that should only happen one at a time
-     */
-    let activeTypeCreations = {};
+  const json = {
+    _serialize: function (val) {
+      if (val != null) return angular.toJson(val);
+    },
+    _deserialize: function (val) {
+      if (val != null) return JSON.parse(val);
+    }
+  };
 
-    /**
-     * Get the list of type's mapped in elasticsearch
-     * @return {[type]} [description]
-     */
-    let getKnownKibanaTypes = _.once(function () {
-      return es.indices.getFieldMapping({
-        // only concerned with types in this kibana index
-        index: kbnIndex,
-        // check all types
-        type: '*',
-        // limit the response to just the _source field for each index
-        fields: '_source'
-      }).then(function (resp) {
-        // kbnIndex is not sufficient here, if the kibana indexed is aliased we need to use
-        // the root index name as key
-        const index = _.keys(resp)[0];
-        return _.keys(resp[index].mappings);
-      });
+  /**
+   * Use to create the mappings, but that should only happen one at a time
+   */
+  const activeTypeCreations = {};
+
+  /**
+   * Get the list of type's mapped in elasticsearch
+   * @return {[type]} [description]
+   */
+  const getKnownKibanaTypes = _.once(function () {
+    return es.indices.getFieldMapping({
+      // only concerned with types in this kibana index
+      index: kbnIndex,
+      // check all types
+      type: '*',
+      // limit the response to just the _source field for each index
+      fields: '_source'
+    }).then(function (resp) {
+      // kbnIndex is not sufficient here, if the kibana indexed is aliased we need to use
+      // the root index name as key
+      const index = _.keys(resp)[0];
+      return _.keys(resp[index].mappings);
     });
+  });
 
-    mappingSetup.expandShorthand = function (sh) {
-      return _.mapValues(sh || {}, function (val, prop) {
-        // allow shortcuts for the field types, by just setting the value
-        // to the type name
-        if (typeof val === 'string') val = { type: val };
+  mappingSetup.expandShorthand = function (sh) {
+    return _.mapValues(sh || {}, function (val) {
+      // allow shortcuts for the field types, by just setting the value
+      // to the type name
+      if (typeof val === 'string') val = { type: val };
 
-        if (val.type === 'json') {
-          val.type = 'string';
-          val._serialize = json._serialize;
-          val._deserialize = json._deserialize;
-        }
+      if (val.type === 'json') {
+        val.type = 'string';
+        val._serialize = json._serialize;
+        val._deserialize = json._deserialize;
+      }
 
-        return val;
-      });
-    };
+      return val;
+    });
+  };
 
-    mappingSetup.isDefined = function (type) {
-      return getKnownKibanaTypes()
-      .then(function (knownTypes) {
-        // if the type is in the knownTypes array already
-        return !!(~knownTypes.indexOf(type));
-      });
-    };
+  mappingSetup.isDefined = function (type) {
+    return getKnownKibanaTypes()
+    .then(function (knownTypes) {
+      // if the type is in the knownTypes array already
+      return !!(~knownTypes.indexOf(type));
+    });
+  };
 
-    mappingSetup.setup = function (type, mapping) {
-      // if there is already a creation running for this index type
-      if (activeTypeCreations[type]) {
-        // return a promise that will reexecute the setup once the
-        // current is complete.
-        return activeTypeCreations[type].then(function () {
-          return mappingSetup.setup(type, mapping);
-        });
-      }
+  mappingSetup.setup = function (type, mapping) {
+    // if there is already a creation running for this index type
+    if (activeTypeCreations[type]) {
+      // return a promise that will reexecute the setup once the
+      // current is complete.
+      return activeTypeCreations[type].then(function () {
+        return mappingSetup.setup(type, mapping);
+      });
+    }
 
-      let prom = getKnownKibanaTypes()
-      .then(function (knownTypes) {
-        // if the type is in the knownTypes array already
-        if (~knownTypes.indexOf(type)) return false;
+    const prom = getKnownKibanaTypes()
+    .then(function (knownTypes) {
+      // if the type is in the knownTypes array already
+      if (~knownTypes.indexOf(type)) return false;
 
-        // we need to create the mapping
-        let body = {};
-        body[type] = {
-          properties: mapping
-        };
+      // we need to create the mapping
+      const body = {};
+      body[type] = {
+        properties: mapping
+      };
 
-        return es.indices.putMapping({
-          index: kbnIndex,
-          type: type,
-          body: body
-        }).then(function (resp) {
-          // add this type to the list of knownTypes
-          knownTypes.push(type);
+      return es.indices.putMapping({
+        index: kbnIndex,
+        type: type,
+        body: body
+      }).then(function () {
+        // add this type to the list of knownTypes
+        knownTypes.push(type);
 
-          // cast the response to "true", meaning
-          // the mapping exists
-          return true;
-        });
-      })
-      // wether this fails or not, remove it from the activeTypeCreations obj
-      // once complete
-      .finally(function () {
-        delete activeTypeCreations[type];
+        // cast the response to "true", meaning
+        // the mapping exists
+        return true;
       });
+    })
+    // wether this fails or not, remove it from the activeTypeCreations obj
+    // once complete
+    .finally(function () {
+      delete activeTypeCreations[type];
+    });
 
-      activeTypeCreations[type] = prom;
-      return prom;
-    };
+    activeTypeCreations[type] = prom;
+    return prom;
   };
-
-});
+}
diff --git a/src/ui/public/utils/no_white_space.js b/src/ui/public/utils/no_white_space.js
index c57cc58fcb95d..015051eb29dd9 100644
--- a/src/ui/public/utils/no_white_space.js
+++ b/src/ui/public/utils/no_white_space.js
@@ -1,4 +1,4 @@
-let TAGS_WITH_WS = />\s+</g;
+const TAGS_WITH_WS = />\s+</g;
 
 /**
  * Remove all of the whitespace between html tags
@@ -15,4 +15,4 @@ let TAGS_WITH_WS = />\s+</g;
  */
 export default function noWhiteSpace(html) {
   return html.replace(TAGS_WITH_WS, '><');
-};
+}
diff --git a/src/ui/public/utils/obj_define.js b/src/ui/public/utils/obj_define.js
index 664c6fcfb2168..9e841055f99c8 100644
--- a/src/ui/public/utils/obj_define.js
+++ b/src/ui/public/utils/obj_define.js
@@ -9,7 +9,7 @@ function ObjDefine(defaults, prototype) {
 }
 
 ObjDefine.REDEFINE_SUPPORTED = (function () {
-  let a = Object.create(Object.prototype, {
+  const a = Object.create(Object.prototype, {
     prop: {
       configurable: true,
       value: 1
@@ -66,7 +66,7 @@ ObjDefine.prototype.comp = function (name, val) {
  * @return {object} - created object
  */
 ObjDefine.prototype.create = function () {
-  let self = this;
+  const self = this;
   self.obj = Object.create(this.prototype, self.descs);
 
   if (!ObjDefine.REDEFINE_SUPPORTED && !self.prototype.toJSON) {
@@ -76,7 +76,7 @@ ObjDefine.prototype.create = function () {
     // due to https://github.com/ariya/phantomjs/issues/11856
     self.obj.toJSON = function () {
       return _.transform(self.obj, function (json, val, key) {
-        let desc = self.descs[key];
+        const desc = self.descs[key];
         if (desc && desc.enumerable && val == null) return;
         json[key] = val;
       }, {});
@@ -97,8 +97,8 @@ ObjDefine.prototype._define = function (name, val, exported, changeable) {
 };
 
 ObjDefine.prototype._describe = function (name, val, exported, changeable) {
-  let self = this;
-  let exists = val != null;
+  const self = this;
+  const exists = val != null;
 
   if (exported && ObjDefine.REDEFINE_SUPPORTED) {
     return {
diff --git a/src/ui/public/utils/ordinal_suffix.js b/src/ui/public/utils/ordinal_suffix.js
index 54038effa2bd9..1cf6c04183401 100644
--- a/src/ui/public/utils/ordinal_suffix.js
+++ b/src/ui/public/utils/ordinal_suffix.js
@@ -1,16 +1,15 @@
-import _ from 'lodash';
 // adopted from http://stackoverflow.com/questions/3109978/php-display-number-with-ordinal-suffix
 export default function addOrdinalSuffix(num) {
   return num + '' + suffix(num);
-};
+}
 
 function suffix(num) {
-  let int = Math.floor(parseFloat(num));
+  const int = Math.floor(parseFloat(num));
 
-  let hunth = int % 100;
+  const hunth = int % 100;
   if (hunth >= 11 && hunth <= 13) return 'th';
 
-  let tenth = int % 10;
+  const tenth = int % 10;
   if (tenth === 1) return 'st';
   if (tenth === 2) return 'nd';
   if (tenth === 3) return 'rd';
diff --git a/src/ui/public/utils/parse_interval.js b/src/ui/public/utils/parse_interval.js
index 6054c68f8d800..4bc6017f62b38 100644
--- a/src/ui/public/utils/parse_interval.js
+++ b/src/ui/public/utils/parse_interval.js
@@ -3,18 +3,18 @@ import moment from 'moment';
 import dateMath from '@elastic/datemath';
 
 // Assume interval is in the form (value)(unit), such as "1h"
-let INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + dateMath.units.join('|') + ')$');
+const INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + dateMath.units.join('|') + ')$');
 
 export default function parseInterval(interval) {
-  let matches = String(interval).trim().match(INTERVAL_STRING_RE);
+  const matches = String(interval).trim().match(INTERVAL_STRING_RE);
 
   if (!matches) return null;
 
   try {
-    let value = parseFloat(matches[1]) || 1;
-    let unit = matches[2];
+    const value = parseFloat(matches[1]) || 1;
+    const unit = matches[2];
 
-    let duration = moment.duration(value, unit);
+    const duration = moment.duration(value, unit);
 
     // There is an error with moment, where if you have a fractional interval between 0 and 1, then when you add that
     // interval to an existing moment object, it will remain unchanged, which causes problems in the ordered_x_keys
@@ -23,7 +23,7 @@ export default function parseInterval(interval) {
     // adding 0.5 days until we hit the end date. However, since there is a bug in moment, when you add 0.5 days to
     // the start date, you get the same exact date (instead of being ahead by 12 hours). So instead of returning
     // a duration corresponding to 0.5 hours, we return a duration corresponding to 12 hours.
-    let selectedUnit = _.find(dateMath.units, function (unit) {
+    const selectedUnit = _.find(dateMath.units, function (unit) {
       return Math.abs(duration.as(unit)) >= 1;
     });
 
@@ -31,4 +31,4 @@ export default function parseInterval(interval) {
   } catch (e) {
     return null;
   }
-};
+}
diff --git a/src/ui/public/utils/query_string.js b/src/ui/public/utils/query_string.js
index adf714cd64030..c45be4b3f25f1 100644
--- a/src/ui/public/utils/query_string.js
+++ b/src/ui/public/utils/query_string.js
@@ -1,4 +1,4 @@
-let qs = {};
+const qs = {};
 
 /*****
 /*** orignally copied from angular, modified our purposes
@@ -37,7 +37,7 @@ function encodeUriQuery(val, pctEncodeSpaces) {
  * @returns {Object.<string,boolean|Array>}
  */
 qs.decode = function (keyValue) {
-  let obj = {};
+  const obj = {};
   let keyValueParts;
   let key;
 
@@ -46,7 +46,7 @@ qs.decode = function (keyValue) {
       keyValueParts = keyValue.split('=');
       key = tryDecodeURIComponent(keyValueParts[0]);
       if (key !== void 0) {
-        let val = keyValueParts[1] !== void 0 ? tryDecodeURIComponent(keyValueParts[1]) : true;
+        const val = keyValueParts[1] !== void 0 ? tryDecodeURIComponent(keyValueParts[1]) : true;
         if (!obj[key]) {
           obj[key] = val;
         } else if (Array.isArray(obj[key])) {
@@ -66,10 +66,10 @@ qs.decode = function (keyValue) {
  * @return {String}
  */
 qs.encode = function (obj) {
-  let parts = [];
-  let keys = Object.keys(obj).sort();
+  const parts = [];
+  const keys = Object.keys(obj).sort();
   keys.forEach(function (key) {
-    let value = obj[key];
+    const value = obj[key];
     if (Array.isArray(value)) {
       value.forEach(function (arrayValue) {
         parts.push(qs.param(key, arrayValue));
@@ -111,8 +111,8 @@ qs.findInUrl = function (url) {
 };
 
 qs.replaceParamInUrl = function (url, param, newVal) {
-  let loc = qs.findInUrl(url);
-  let parsed = qs.decode(url.substring(loc.start + 1, loc.end));
+  const loc = qs.findInUrl(url);
+  const parsed = qs.decode(url.substring(loc.start + 1, loc.end));
 
   if (newVal != null) {
     parsed[param] = newVal;
@@ -120,7 +120,7 @@ qs.replaceParamInUrl = function (url, param, newVal) {
     delete parsed[param];
   }
 
-  let chars = url.split('');
+  const chars = url.split('');
   chars.splice(loc.start, loc.end - loc.start, '?' + qs.encode(parsed));
   return chars.join('');
 };
diff --git a/src/ui/public/utils/range.js b/src/ui/public/utils/range.js
index dc34e4ab650e0..af9fb1f5a9644 100644
--- a/src/ui/public/utils/range.js
+++ b/src/ui/public/utils/range.js
@@ -13,7 +13,7 @@ import _ from 'lodash';
  *
  * @type {String}
  */
-let _RE_NUMBER = '(\\-?(?:\\d+(?:\\.\\d+)?|Infinity))';
+const _RE_NUMBER = '(\\-?(?:\\d+(?:\\.\\d+)?|Infinity))';
 
 /**
  * Regexp for the interval notation
@@ -25,11 +25,11 @@ let _RE_NUMBER = '(\\-?(?:\\d+(?:\\.\\d+)?|Infinity))';
  *
  * @type {RegExp}
  */
-let RANGE_RE = new RegExp('^\\s*([\\[|\\(])\\s*' + _RE_NUMBER + '\\s*,\\s*' + _RE_NUMBER + '\\s*([\\]|\\)])\\s*$');
+const RANGE_RE = new RegExp('^\\s*([\\[|\\(])\\s*' + _RE_NUMBER + '\\s*,\\s*' + _RE_NUMBER + '\\s*([\\]|\\)])\\s*$');
 
 function parse(input) {
 
-  let match = String(input).match(RANGE_RE);
+  const match = String(input).match(RANGE_RE);
   if (!match) {
     throw new TypeError('expected input to be in interval notation eg. (100, 200]');
   }
@@ -43,7 +43,7 @@ function parse(input) {
 }
 
 function Range(/* minIncl, min, max, maxIncl */) {
-  let args = _.toArray(arguments);
+  const args = _.toArray(arguments);
   if (args[1] > args[2]) args.reverse();
 
   this.minInclusive = args[0];
diff --git a/src/ui/public/utils/scanner.js b/src/ui/public/utils/scanner.js
index 93ddc988d66a2..866b918bfd960 100644
--- a/src/ui/public/utils/scanner.js
+++ b/src/ui/public/utils/scanner.js
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 
-let Scanner = function (client, {index, type} = {}) {
+const Scanner = function (client, { index, type } = {}) {
   if (!index) throw new Error('Expected index');
   if (!type) throw new Error('Expected type');
   if (!client) throw new Error('Expected client');
@@ -13,7 +13,7 @@ let Scanner = function (client, {index, type} = {}) {
 Scanner.prototype.scanAndMap = function (searchString, options, mapFn) {
   let scrollId;
   let body;
-  let allResults = {
+  const allResults = {
     hits: [],
     total: 0
   };
@@ -33,7 +33,7 @@ Scanner.prototype.scanAndMap = function (searchString, options, mapFn) {
       }
     };
   } else {
-    body = { query: {match_all: {}}};
+    body = { query: { match_all: {} } };
   }
 
   return new Promise((resolve, reject) => {
diff --git a/src/ui/public/utils/sequencer.js b/src/ui/public/utils/sequencer.js
index 5656890c8f101..7f314426b602d 100644
--- a/src/ui/public/utils/sequencer.js
+++ b/src/ui/public/utils/sequencer.js
@@ -1,18 +1,18 @@
 import _ from 'lodash';
 
 function create(min, max, length, mod) {
-  let seq = new Array(length);
+  const seq = new Array(length);
 
-  let valueDist = max - min;
+  const valueDist = max - min;
 
   // range of values that the mod creates
-  let modRange = [mod(0, length), mod(length - 1, length)];
+  const modRange = [mod(0, length), mod(length - 1, length)];
 
   // distance between
-  let modRangeDist = modRange[1] - modRange[0];
+  const modRangeDist = modRange[1] - modRange[0];
 
   _.times(length, function (i) {
-    let modIPercent = (mod(i, length) - modRange[0]) / modRangeDist;
+    const modIPercent = (mod(i, length) - modRange[0]) / modRangeDist;
 
     // percent applied to distance and added to min to
     // produce value
@@ -48,7 +48,7 @@ export default {
    * @param {number} length - the number of values to produce
    * @return {number[]} - an array containing the sequence
    */
-  createEaseIn: _.partialRight(create, function (i, length) {
+  createEaseIn: _.partialRight(create, function (i) {
     // generates numbers from 1 to +Infinity
     return i * Math.pow(i, 1.1111);
   }),
@@ -80,8 +80,8 @@ export default {
     // adapted from output of http://www.timotheegroleau.com/Flash/experiments/easing_function_generator.htm
     // generates numbers from 0 to 100
 
-    let ts = (i /= length) * i;
-    let tc = ts * i;
+    const ts = (i /= length) * i;
+    const tc = ts * i;
     return 100 * (
       0.5 * tc * ts +
       -3 * ts * ts +
diff --git a/src/ui/public/utils/simple_emitter.js b/src/ui/public/utils/simple_emitter.js
index f9a6f69a24eee..f6a9afbf6a83e 100644
--- a/src/ui/public/utils/simple_emitter.js
+++ b/src/ui/public/utils/simple_emitter.js
@@ -68,7 +68,7 @@ SimpleEmitter.prototype.removeAllListeners = function () {
  */
 SimpleEmitter.prototype.emit = _.restParam(function (name, args) {
   if (!this._listeners[name]) return this;
-  let listeners = this.listeners(name);
+  const listeners = this.listeners(name);
   let i = -1;
 
   while (++i < listeners.length) {
diff --git a/src/ui/public/utils/slugify_id.js b/src/ui/public/utils/slugify_id.js
index 0894d9356593e..5aeabfaa0ff37 100644
--- a/src/ui/public/utils/slugify_id.js
+++ b/src/ui/public/utils/slugify_id.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
 export default function (id) {
   if (id == null) return;
 
-  let trans = {
+  const trans = {
     '/' : '-slash-',
     '\\?' : '-questionmark-',
     '\\&' : '-ampersand-',
@@ -10,10 +10,10 @@ export default function (id) {
     '%' : '-percent-'
   };
   _.each(trans, function (val, key) {
-    let regex = new RegExp(key, 'g');
+    const regex = new RegExp(key, 'g');
     id = id.replace(regex, val);
   });
   id = id.replace(/[\s]+/g, '-');
   id = id.replace(/[\-]+/g, '-');
   return id;
-};
+}
diff --git a/src/ui/public/utils/supports.js b/src/ui/public/utils/supports.js
index cf8cd4835c65f..ec959686fe158 100644
--- a/src/ui/public/utils/supports.js
+++ b/src/ui/public/utils/supports.js
@@ -5,14 +5,14 @@ import _ from 'lodash';
  */
 export default {
   cssFilters: (function () {
-    let e = document.createElement('img');
-    let rules = ['webkitFilter', 'mozFilter', 'msFilter', 'filter'];
-    let test = 'grayscale(1)';
+    const e = document.createElement('img');
+    const rules = ['webkitFilter', 'mozFilter', 'msFilter', 'filter'];
+    const test = 'grayscale(1)';
     rules.forEach(function (rule) { e.style[rule] = test; });
 
     document.body.appendChild(e);
-    let styles = window.getComputedStyle(e);
-    let can = _(styles).pick(rules).includes(test);
+    const styles = window.getComputedStyle(e);
+    const can = _(styles).pick(rules).includes(test);
     document.body.removeChild(e);
 
     return can;
diff --git a/src/ui/public/vis/__tests__/_agg_config.js b/src/ui/public/vis/__tests__/_agg_config.js
index d7d148caf32cf..0c50e3b90b6d7 100644
--- a/src/ui/public/vis/__tests__/_agg_config.js
+++ b/src/ui/public/vis/__tests__/_agg_config.js
@@ -25,7 +25,7 @@ describe('AggConfig', function () {
 
   describe('#toDsl', function () {
     it('calls #write()', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -35,15 +35,15 @@ describe('AggConfig', function () {
         ]
       });
 
-      let aggConfig = vis.aggs.byTypeName.date_histogram[0];
-      let stub = sinon.stub(aggConfig, 'write').returns({ params: {} });
+      const aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      const stub = sinon.stub(aggConfig, 'write').returns({ params: {} });
 
       aggConfig.toDsl();
       expect(stub.callCount).to.be(1);
     });
 
     it('uses the type name as the agg name', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -53,15 +53,15 @@ describe('AggConfig', function () {
         ]
       });
 
-      let aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      const aggConfig = vis.aggs.byTypeName.date_histogram[0];
       sinon.stub(aggConfig, 'write').returns({ params: {} });
 
-      let dsl = aggConfig.toDsl();
+      const dsl = aggConfig.toDsl();
       expect(dsl).to.have.property('date_histogram');
     });
 
     it('uses the params from #write() output as the agg params', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -71,17 +71,17 @@ describe('AggConfig', function () {
         ]
       });
 
-      let aggConfig = vis.aggs.byTypeName.date_histogram[0];
-      let football = {};
+      const aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      const football = {};
 
       sinon.stub(aggConfig, 'write').returns({ params: football });
 
-      let dsl = aggConfig.toDsl();
+      const dsl = aggConfig.toDsl();
       expect(dsl.date_histogram).to.be(football);
     });
 
     it('includes subAggs from #write() output', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -95,14 +95,14 @@ describe('AggConfig', function () {
         ]
       });
 
-      let histoConfig = vis.aggs.byTypeName.date_histogram[0];
-      let avgConfig = vis.aggs.byTypeName.avg[0];
-      let football = {};
+      const histoConfig = vis.aggs.byTypeName.date_histogram[0];
+      const avgConfig = vis.aggs.byTypeName.avg[0];
+      const football = {};
 
       sinon.stub(histoConfig, 'write').returns({ params: {}, subAggs: [avgConfig] });
       sinon.stub(avgConfig, 'write').returns({ params: football });
 
-      let dsl = histoConfig.toDsl();
+      const dsl = histoConfig.toDsl();
 
       // didn't use .eql() because of variable key names, and final check is strict
       expect(dsl).to.have.property('aggs');
@@ -114,7 +114,7 @@ describe('AggConfig', function () {
 
   describe('::ensureIds', function () {
     it('accepts an array of objects and assigns ids to them', function () {
-      let objs = [
+      const objs = [
         {},
         {},
         {},
@@ -128,7 +128,7 @@ describe('AggConfig', function () {
     });
 
     it('assigns ids relative to the other items in the list', function () {
-      let objs = [
+      const objs = [
         { id: '100' },
         {},
       ];
@@ -138,7 +138,7 @@ describe('AggConfig', function () {
     });
 
     it('assigns ids relative to the other items in the list', function () {
-      let objs = [
+      const objs = [
         { id: '100' },
         { id: '200' },
         { id: '500' },
@@ -155,14 +155,14 @@ describe('AggConfig', function () {
 
     it('uses ::nextId to get the starting value', function () {
       sinon.stub(AggConfig, 'nextId').returns(534);
-      let objs = AggConfig.ensureIds([{}]);
+      const objs = AggConfig.ensureIds([{}]);
       expect(objs[0]).to.have.property('id', '534');
     });
 
     it('only calls ::nextId once', function () {
-      let start = 420;
+      const start = 420;
       sinon.stub(AggConfig, 'nextId').returns(start);
-      let objs = AggConfig.ensureIds([{}, {}, {}, {}, {}, {}, {}]);
+      const objs = AggConfig.ensureIds([{}, {}, {}, {}, {}, {}, {}]);
 
       expect(AggConfig.nextId).to.have.property('callCount', 1);
       objs.forEach(function (obj, i) {
@@ -173,12 +173,12 @@ describe('AggConfig', function () {
 
   describe('::nextId', function () {
     it('accepts a list of objects and picks the next id', function () {
-      let next = AggConfig.nextId([ {id: 100}, {id: 500} ]);
+      const next = AggConfig.nextId([ { id: 100 }, { id: 500 } ]);
       expect(next).to.be(501);
     });
 
     it('handles an empty list', function () {
-      let next = AggConfig.nextId([]);
+      const next = AggConfig.nextId([]);
       expect(next).to.be(1);
     });
 
@@ -197,7 +197,7 @@ describe('AggConfig', function () {
         {
           type: 'count',
           schema: 'metric',
-          params: {field: '@timestamp'}
+          params: { field: '@timestamp' }
         }
       ]
     }, {
@@ -295,7 +295,7 @@ describe('AggConfig', function () {
           {
             type: 'count',
             schema: 'metric',
-            params: {field: '@timestamp'}
+            params: { field: '@timestamp' }
           }
         ]
       },
@@ -305,7 +305,7 @@ describe('AggConfig', function () {
           {
             type: 'count',
             schema: 'metric',
-            params: {field: '@timestamp'}
+            params: { field: '@timestamp' }
           },
           {
             type: 'date_histogram',
@@ -328,7 +328,7 @@ describe('AggConfig', function () {
 
   describe('#toJSON', function () {
     it('includes the aggs id, params, type and schema', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -338,13 +338,13 @@ describe('AggConfig', function () {
         ]
       });
 
-      let aggConfig = vis.aggs.byTypeName.date_histogram[0];
+      const aggConfig = vis.aggs.byTypeName.date_histogram[0];
       expect(aggConfig.id).to.be('1');
       expect(aggConfig.params).to.be.an('object');
       expect(aggConfig.type).to.be.an(AggType).and.have.property('name', 'date_histogram');
       expect(aggConfig.schema).to.be.an('object').and.have.property('name', 'segment');
 
-      let state = aggConfig.toJSON();
+      const state = aggConfig.toJSON();
       expect(state).to.have.property('id', '1');
       expect(state.params).to.be.an('object');
       expect(state).to.have.property('type', 'date_histogram');
@@ -354,7 +354,7 @@ describe('AggConfig', function () {
 
 
     it('test serialization  order is identical (for visual consistency)', function () {
-      let vis1 = new Vis(indexPattern, {
+      const vis1 = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -363,7 +363,7 @@ describe('AggConfig', function () {
           }
         ]
       });
-      let vis2 = new Vis(indexPattern, {
+      const vis2 = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -385,30 +385,30 @@ describe('AggConfig', function () {
 
   describe('#makeLabel', function () {
     it('uses the custom label if it is defined', function () {
-      let vis = new Vis(indexPattern, {});
-      let aggConfig = vis.aggs[0];
+      const vis = new Vis(indexPattern, {});
+      const aggConfig = vis.aggs[0];
       aggConfig.params.customLabel = 'Custom label';
-      let label = aggConfig.makeLabel();
+      const label = aggConfig.makeLabel();
       expect(label).to.be(aggConfig.params.customLabel);
     });
     it('default label should be "Count"', function () {
-      let vis = new Vis(indexPattern, {});
-      let aggConfig = vis.aggs[0];
-      let label = aggConfig.makeLabel();
+      const vis = new Vis(indexPattern, {});
+      const aggConfig = vis.aggs[0];
+      const label = aggConfig.makeLabel();
       expect(label).to.be('Count');
     });
     it('default label should be "Percentage of Count" when Vis is in percentage mode', function () {
-      let vis = new Vis(indexPattern, {});
-      let aggConfig = vis.aggs[0];
+      const vis = new Vis(indexPattern, {});
+      const aggConfig = vis.aggs[0];
       aggConfig.vis.params.mode = 'percentage';
-      let label = aggConfig.makeLabel();
+      const label = aggConfig.makeLabel();
       expect(label).to.be('Percentage of Count');
     });
     it('empty label if the Vis type is not defined', function () {
-      let vis = new Vis(indexPattern, {});
-      let aggConfig = vis.aggs[0];
+      const vis = new Vis(indexPattern, {});
+      const aggConfig = vis.aggs[0];
       aggConfig.type = undefined;
-      let label = aggConfig.makeLabel();
+      const label = aggConfig.makeLabel();
       expect(label).to.be('');
     });
   });
@@ -441,7 +441,7 @@ describe('AggConfig', function () {
     });
 
     it('returns the string format if the field does not have a format', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -452,13 +452,13 @@ describe('AggConfig', function () {
         ]
       });
 
-      let agg = vis.aggs[0];
+      const agg = vis.aggs[0];
       agg.params.field = { type: 'date', format: null };
       expect(agg.fieldFormatter()).to.be(fieldFormat.getDefaultInstance('string').getConverterFor());
     });
 
     it('returns the string format if their is no field', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -469,13 +469,13 @@ describe('AggConfig', function () {
         ]
       });
 
-      let agg = vis.aggs[0];
+      const agg = vis.aggs[0];
       delete agg.params.field;
       expect(agg.fieldFormatter()).to.be(fieldFormat.getDefaultInstance('string').getConverterFor());
     });
 
     it('returns the html converter if "html" is passed in', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           {
@@ -486,7 +486,7 @@ describe('AggConfig', function () {
         ]
       });
 
-      let field = indexPattern.fields.byName.bytes;
+      const field = indexPattern.fields.byName.bytes;
       expect(vis.aggs[0].fieldFormatter('html')).to.be(field.format.getConverterFor('html'));
     });
   });
diff --git a/src/ui/public/vis/__tests__/_agg_config_result.js b/src/ui/public/vis/__tests__/_agg_config_result.js
index 100549de9a924..409093b8f9327 100644
--- a/src/ui/public/vis/__tests__/_agg_config_result.js
+++ b/src/ui/public/vis/__tests__/_agg_config_result.js
@@ -1,31 +1,26 @@
-import _ from 'lodash';
 import AggConfigResult from 'ui/vis/agg_config_result';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import VisProvider from 'ui/vis';
-import VisAggConfigProvider from 'ui/vis/agg_config';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 describe('AggConfigResult', function () {
-
-  let AggConfig;
   let indexPattern;
   let Vis;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     Vis = Private(VisProvider);
-    AggConfig = Private(VisAggConfigProvider);
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
   }));
 
   describe('initialization', function () {
     it('should set the type to bucket for bucket based results', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [ { type: 'terms', schema: 'segment', params: { field: '_type' } } ]
       });
-      let aggConfig = vis.aggs.byTypeName.terms[0];
-      let results = new AggConfigResult(aggConfig, null, 10, 'apache');
+      const aggConfig = vis.aggs.byTypeName.terms[0];
+      const results = new AggConfigResult(aggConfig, null, 10, 'apache');
       expect(results).to.have.property('aggConfig', aggConfig);
       expect(results).to.have.property('$parent', null);
       expect(results).to.have.property('type', 'bucket');
@@ -34,12 +29,12 @@ describe('AggConfigResult', function () {
     });
 
     it('should set the type to metric for metric based results', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [ { type: 'avg', schema: 'metric', params: { field: 'bytes' } } ]
       });
-      let aggConfig = vis.aggs.byTypeName.avg[0];
-      let results = new AggConfigResult(aggConfig, null, 1024);
+      const aggConfig = vis.aggs.byTypeName.avg[0];
+      const results = new AggConfigResult(aggConfig, null, 1024);
       expect(results).to.have.property('aggConfig', aggConfig);
       expect(results).to.have.property('$parent', null);
       expect(results).to.have.property('type', 'metric');
@@ -53,18 +48,18 @@ describe('AggConfigResult', function () {
     describe('getPath()', function () {
 
       it('should return the parent and itself (in an array) for the path', function () {
-        let vis = new Vis(indexPattern, {
+        const vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', schema: 'segment', params: { field: '_type' } },
             { type: 'terms', schema: 'segment', params: { field: 'extension' } }
           ]
         });
-        let parentAggConfig = vis.aggs.byTypeName.terms[0];
-        let aggConfig = vis.aggs.byTypeName.terms[1];
-        let parentResult = new AggConfigResult(parentAggConfig, null, 20, 'apache');
-        let result = new AggConfigResult(aggConfig, parentResult, 15, 'php');
-        let path = result.getPath();
+        const parentAggConfig = vis.aggs.byTypeName.terms[0];
+        const aggConfig = vis.aggs.byTypeName.terms[1];
+        const parentResult = new AggConfigResult(parentAggConfig, null, 20, 'apache');
+        const result = new AggConfigResult(aggConfig, parentResult, 15, 'php');
+        const path = result.getPath();
         expect(path).to.be.an(Array);
         expect(path).to.have.length(2);
         expect(path[0]).to.be(parentResult);
@@ -72,15 +67,15 @@ describe('AggConfigResult', function () {
       });
 
       it('should return itself (in an array) for the path', function () {
-        let vis = new Vis(indexPattern, {
+        const vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', schema: 'segment', params: { field: 'extension' } }
           ]
         });
-        let aggConfig = vis.aggs.byTypeName.terms[0];
-        let result = new AggConfigResult(aggConfig, null, 15, 'php');
-        let path = result.getPath();
+        const aggConfig = vis.aggs.byTypeName.terms[0];
+        const result = new AggConfigResult(aggConfig, null, 15, 'php');
+        const path = result.getPath();
         expect(path).to.be.an(Array);
         expect(path).to.have.length(1);
         expect(path[0]).to.be(result);
@@ -90,15 +85,15 @@ describe('AggConfigResult', function () {
 
     describe('createFilter', function () {
       it('should return a filter object that represents the result', function () {
-        let vis = new Vis(indexPattern, {
+        const vis = new Vis(indexPattern, {
           type: 'histogram',
           aggs: [
             { type: 'terms', schema: 'segment', params: { field: 'extension' } }
           ]
         });
-        let aggConfig = vis.aggs.byTypeName.terms[0];
-        let result = new AggConfigResult(aggConfig, null, 15, 'php');
-        let filter = result.createFilter();
+        const aggConfig = vis.aggs.byTypeName.terms[0];
+        const result = new AggConfigResult(aggConfig, null, 15, 'php');
+        const filter = result.createFilter();
         expect(filter).to.have.property('query');
         expect(filter.query).to.have.property('match');
         expect(filter.query.match).to.have.property('extension');
diff --git a/src/ui/public/vis/__tests__/_agg_configs.js b/src/ui/public/vis/__tests__/_agg_configs.js
index b8e4b72dd9d1b..9b79cd6375344 100644
--- a/src/ui/public/vis/__tests__/_agg_configs.js
+++ b/src/ui/public/vis/__tests__/_agg_configs.js
@@ -22,7 +22,7 @@ describe('AggConfigs', function () {
   beforeEach(ngMock.inject(function (Private) {
     // replace the AggConfig module with a spy
     AggConfig = Private(RealAggConfigPM);
-    let spy = sinon.spy(AggConfig);
+    const spy = sinon.spy(AggConfig);
     Object.defineProperty(spy, 'aggTypes', {
       get: function () { return AggConfig.aggTypes; },
       set: function (val) { AggConfig.aggTypes = val; }
@@ -40,28 +40,28 @@ describe('AggConfigs', function () {
   }));
 
   it('extends IndexedArray', function () {
-    let ac = new AggConfigs();
+    const ac = new AggConfigs();
     expect(ac).to.be.a(IndexedArray);
   });
 
   describe('constructor', function () {
     it('handles passing just a vis', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: []
       });
 
-      let ac = new AggConfigs(vis);
+      const ac = new AggConfigs(vis);
       expect(ac).to.have.length(1);
     });
 
     it('converts configStates into AggConfig objects if they are not already', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: []
       });
 
-      let ac = new AggConfigs(vis, [
+      const ac = new AggConfigs(vis, [
         {
           type: 'date_histogram',
           schema: 'segment'
@@ -77,12 +77,12 @@ describe('AggConfigs', function () {
     });
 
     it('attemps to ensure that all states have an id', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: []
       });
 
-      let states = [
+      const states = [
         {
           type: 'date_histogram',
           schema: 'segment'
@@ -93,8 +93,8 @@ describe('AggConfigs', function () {
         }
       ];
 
-      let spy = sinon.spy(SpiedAggConfig, 'ensureIds');
-      let ac = new AggConfigs(vis, states);
+      const spy = sinon.spy(SpiedAggConfig, 'ensureIds');
+      new AggConfigs(vis, states);
       expect(spy.callCount).to.be(1);
       expect(spy.firstCall.args[0]).to.be(states);
     });
@@ -135,17 +135,17 @@ describe('AggConfigs', function () {
       });
 
       it('should only set the number of defaults defined by the max', function () {
-        let ac = new AggConfigs(vis);
+        const ac = new AggConfigs(vis);
         expect(ac.bySchemaName.metric).to.have.length(2);
       });
 
       it('should set the defaults defined in the schema when none exist', function () {
-        let ac = new AggConfigs(vis);
+        const ac = new AggConfigs(vis);
         expect(ac).to.have.length(3);
       });
 
       it('should NOT set the defaults defined in the schema when some exist', function () {
-        let ac = new AggConfigs(vis, [{ schema: 'segment', type: 'date_histogram' }]);
+        const ac = new AggConfigs(vis, [{ schema: 'segment', type: 'date_histogram' }]);
         expect(ac).to.have.length(3);
         expect(ac.bySchemaName.segment[0].type.name).to.equal('date_histogram');
       });
@@ -154,7 +154,7 @@ describe('AggConfigs', function () {
 
   describe('#getRequestAggs', function () {
     it('performs a stable sort, but moves metrics to the bottom', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'avg', schema: 'metric' },
@@ -167,8 +167,8 @@ describe('AggConfigs', function () {
         ]
       });
 
-      let sorted = vis.aggs.getRequestAggs();
-      let aggs = _.indexBy(vis.aggs, function (agg) {
+      const sorted = vis.aggs.getRequestAggs();
+      const aggs = _.indexBy(vis.aggs, function (agg) {
         return agg.type.name;
       });
 
@@ -185,7 +185,7 @@ describe('AggConfigs', function () {
 
   describe('#getResponseAggs', function () {
     it('returns all request aggs for basic aggs', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'terms', schema: 'split' },
@@ -194,8 +194,8 @@ describe('AggConfigs', function () {
         ]
       });
 
-      let sorted = vis.aggs.getResponseAggs();
-      let aggs = _.indexBy(vis.aggs, function (agg) {
+      const sorted = vis.aggs.getResponseAggs();
+      const aggs = _.indexBy(vis.aggs, function (agg) {
         return agg.type.name;
       });
 
@@ -206,17 +206,17 @@ describe('AggConfigs', function () {
     });
 
     it('expands aggs that have multiple responses', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'terms', schema: 'split' },
           { type: 'date_histogram', schema: 'segment' },
-          { type: 'percentiles', schema: 'metric', params: { percents: [1, 2, 3]} }
+          { type: 'percentiles', schema: 'metric', params: { percents: [1, 2, 3] } }
         ]
       });
 
-      let sorted = vis.aggs.getResponseAggs();
-      let aggs = _.indexBy(vis.aggs, function (agg) {
+      const sorted = vis.aggs.getResponseAggs();
+      const aggs = _.indexBy(vis.aggs, function (agg) {
         return agg.type.name;
       });
 
@@ -231,14 +231,14 @@ describe('AggConfigs', function () {
 
   describe('#toDsl', function () {
     it('uses the sorted aggs', function () {
-      let vis = new Vis(indexPattern, { type: 'histogram' });
+      const vis = new Vis(indexPattern, { type: 'histogram' });
       sinon.spy(vis.aggs, 'getRequestAggs');
       vis.aggs.toDsl();
       expect(vis.aggs.getRequestAggs).to.have.property('callCount', 1);
     });
 
     it('calls aggConfig#toDsl() on each aggConfig and compiles the nested output', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'date_histogram', schema: 'segment' },
@@ -246,8 +246,8 @@ describe('AggConfigs', function () {
         ]
       });
 
-      let aggInfos = vis.aggs.map(function (aggConfig) {
-        let football = {};
+      const aggInfos = vis.aggs.map(function (aggConfig) {
+        const football = {};
 
         sinon.stub(aggConfig, 'toDsl', function () {
           return football;
@@ -260,7 +260,7 @@ describe('AggConfigs', function () {
       });
 
       (function recurse(lvl) {
-        let info = aggInfos.shift();
+        const info = aggInfos.shift();
 
         expect(lvl).to.have.property(info.id);
         expect(lvl[info.id]).to.be(info.football);
@@ -274,7 +274,7 @@ describe('AggConfigs', function () {
     });
 
     it('skips aggs that don\'t have a dsl representation', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
@@ -282,9 +282,9 @@ describe('AggConfigs', function () {
         ]
       });
 
-      let dsl = vis.aggs.toDsl();
-      let histo = vis.aggs.byTypeName.date_histogram[0];
-      let count = vis.aggs.byTypeName.count[0];
+      const dsl = vis.aggs.toDsl();
+      const histo = vis.aggs.byTypeName.date_histogram[0];
+      const count = vis.aggs.byTypeName.count[0];
 
       expect(dsl).to.have.property(histo.id);
       expect(dsl[histo.id]).to.be.an('object');
@@ -293,7 +293,7 @@ describe('AggConfigs', function () {
     });
 
     it('writes multiple metric aggregations at the same level', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'date_histogram', schema: 'segment', params: { field: '@timestamp' } },
@@ -304,10 +304,10 @@ describe('AggConfigs', function () {
         ]
       });
 
-      let dsl = vis.aggs.toDsl();
+      const dsl = vis.aggs.toDsl();
 
-      let histo = vis.aggs.byTypeName.date_histogram[0];
-      let metrics = vis.aggs.bySchemaGroup.metrics;
+      const histo = vis.aggs.byTypeName.date_histogram[0];
+      const metrics = vis.aggs.bySchemaGroup.metrics;
 
       expect(dsl).to.have.property(histo.id);
       expect(dsl[histo.id]).to.be.an('object');
@@ -320,7 +320,7 @@ describe('AggConfigs', function () {
     });
 
     it('writes multiple metric aggregations at every level if the vis is hierarchical', function () {
-      let vis = new Vis(indexPattern, {
+      const vis = new Vis(indexPattern, {
         type: 'histogram',
         aggs: [
           { type: 'terms', schema: 'segment', params: { field: 'ip', orderBy: 1 } },
@@ -333,12 +333,12 @@ describe('AggConfigs', function () {
       });
       vis.isHierarchical = _.constant(true);
 
-      let topLevelDsl = vis.aggs.toDsl();
-      let buckets = vis.aggs.bySchemaGroup.buckets;
-      let metrics = vis.aggs.bySchemaGroup.metrics;
+      const topLevelDsl = vis.aggs.toDsl();
+      const buckets = vis.aggs.bySchemaGroup.buckets;
+      const metrics = vis.aggs.bySchemaGroup.metrics;
 
       (function checkLevel(dsl) {
-        let bucket = buckets.shift();
+        const bucket = buckets.shift();
         expect(dsl).to.have.property(bucket.id);
 
         expect(dsl[bucket.id]).to.be.an('object');
diff --git a/src/ui/public/vis/__tests__/_vis.js b/src/ui/public/vis/__tests__/_vis.js
index ad4aa0ad837e5..51e87b8319d11 100644
--- a/src/ui/public/vis/__tests__/_vis.js
+++ b/src/ui/public/vis/__tests__/_vis.js
@@ -12,12 +12,12 @@ describe('Vis Class', function () {
   let visTypes;
 
   let vis;
-  let stateFixture = {
+  const stateFixture = {
     type: 'pie',
     aggs: [
       { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-      { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-      { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+      { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
+      { type: 'terms', schema: 'segment', params: { field: 'geo.src' } }
     ],
     params: { isDonut: true },
     listeners: { click: _.noop }
@@ -34,7 +34,7 @@ describe('Vis Class', function () {
     vis = new Vis(indexPattern, stateFixture);
   });
 
-  let verifyVis = function (vis) {
+  const verifyVis = function (vis) {
     expect(vis).to.have.property('aggs');
     expect(vis.aggs).to.have.length(3);
 
@@ -58,7 +58,7 @@ describe('Vis Class', function () {
 
   describe('getState()', function () {
     it('should get a state that represents the... er... state', function () {
-      let state = vis.getEnabledState();
+      const state = vis.getEnabledState();
       expect(state).to.have.property('type', 'pie');
 
       expect(state).to.have.property('params');
@@ -75,14 +75,14 @@ describe('Vis Class', function () {
 
   describe('clone()', function () {
     it('should make clone of itself', function () {
-      let clone = vis.clone();
+      const clone = vis.clone();
       verifyVis(clone);
     });
   });
 
   describe('setState()', function () {
     it('should set the state to defualts', function () {
-      let vis = new Vis(indexPattern);
+      const vis = new Vis(indexPattern);
       expect(vis).to.have.property('type');
       expect(vis.type).to.eql(visTypes.byName.histogram);
       expect(vis).to.have.property('aggs');
@@ -102,7 +102,7 @@ describe('Vis Class', function () {
       expect(vis.isHierarchical()).to.be(true);
     });
     it('should return false for non-hierarchical vis (like histogram)', function () {
-      let vis = new Vis(indexPattern);
+      const vis = new Vis(indexPattern);
       expect(vis.isHierarchical()).to.be(false);
     });
   });
diff --git a/src/ui/public/vis/agg_config.js b/src/ui/public/vis/agg_config.js
index 86a8872e3649f..41973c35a39de 100644
--- a/src/ui/public/vis/agg_config.js
+++ b/src/ui/public/vis/agg_config.js
@@ -7,11 +7,11 @@
 
 import _ from 'lodash';
 import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
-export default function AggConfigFactory(Private, fieldTypeFilter) {
-  let fieldFormats = Private(RegistryFieldFormatsProvider);
+export default function AggConfigFactory(Private) {
+  const fieldFormats = Private(RegistryFieldFormatsProvider);
 
   function AggConfig(vis, opts) {
-    let self = this;
+    const self = this;
 
     self.id = String(opts.id || AggConfig.nextId(vis.aggs));
     self.vis = vis;
@@ -34,8 +34,8 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
    * @return {array} - the list that was passed in
    */
   AggConfig.ensureIds = function (list) {
-    let have = [];
-    let haveNot = [];
+    const have = [];
+    const haveNot = [];
     list.forEach(function (obj) {
       (obj.id ? have : haveNot).push(obj);
     });
@@ -105,9 +105,9 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
    * @return {undefined}
    */
   AggConfig.prototype.fillDefaults = function (from) {
-    let self = this;
+    const self = this;
     from = from || self.params || {};
-    let to = self.params = {};
+    const to = self.params = {};
 
     self.getAggParams().forEach(function (aggParam) {
       let val = from[aggParam.name];
@@ -124,11 +124,11 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
       }
 
       if (aggParam.deserialize) {
-        let isTyped = _.isFunction(aggParam.type);
+        const isTyped = _.isFunction(aggParam.type);
 
-        let isType = isTyped && (val instanceof aggParam.type);
-        let isObject = !isTyped && _.isObject(val);
-        let isDeserialized = (isType || isObject);
+        const isType = isTyped && (val instanceof aggParam.type);
+        const isObject = !isTyped && _.isObject(val);
+        const isDeserialized = (isType || isObject);
 
         if (!isDeserialized) {
           val = aggParam.deserialize(val, self);
@@ -167,8 +167,8 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
       throw new TypeError('The "' + this.type.title + '" aggregation does not support filtering.');
     }
 
-    let field = this.getField();
-    let label = this.getFieldDisplayName();
+    const field = this.getField();
+    const label = this.getFieldDisplayName();
     if (field && !field.filterable) {
       let message = 'The "' + label + '" field can not be used for filtering.';
       if (field.scripted) {
@@ -187,7 +187,7 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
    * @return {[type]} [description]
    */
   AggConfig.prototype.requesting = function () {
-    let self = this;
+    const self = this;
     self.type && self.type.params.forEach(function (param) {
       if (param.onRequest) param.onRequest(self);
     });
@@ -204,14 +204,14 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
    */
   AggConfig.prototype.toDsl = function () {
     if (this.type.hasNoDsl) return;
-    let output = this.write();
+    const output = this.write();
 
-    let configDsl = {};
+    const configDsl = {};
     configDsl[this.type.dslName || this.type.name] = output.params;
 
     // if the config requires subAggs, write them to the dsl as well
     if (output.subAggs) {
-      let subDslLvl = configDsl.aggs || (configDsl.aggs = {});
+      const subDslLvl = configDsl.aggs || (configDsl.aggs = {});
       output.subAggs.forEach(function nestAdhocSubAggs(subAggConfig) {
         subDslLvl[subAggConfig.id] = subAggConfig.toDsl();
       });
@@ -221,10 +221,10 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
   };
 
   AggConfig.prototype.toJSON = function () {
-    let self = this;
-    let params = self.params;
+    const self = this;
+    const params = self.params;
 
-    let outParams = _.transform(self.getAggParams(), function (out, aggParam) {
+    const outParams = _.transform(self.getAggParams(), function (out, aggParam) {
       let val = params[aggParam.name];
 
       // don't serialize undefined/null values
@@ -266,7 +266,7 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
   };
 
   AggConfig.prototype.getFieldDisplayName = function () {
-    let field = this.getField();
+    const field = this.getField();
     return field ? (field.displayName || this.fieldName()) : '';
   };
 
@@ -299,13 +299,13 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
   };
 
   AggConfig.prototype.fieldFormatter = function (contentType, defaultFormat) {
-    let format = this.type && this.type.getFormat(this);
+    const format = this.type && this.type.getFormat(this);
     if (format) return format.getConverterFor(contentType);
     return this.fieldOwnFormatter(contentType, defaultFormat);
   };
 
   AggConfig.prototype.fieldOwnFormatter = function (contentType, defaultFormat) {
-    let field = this.getField();
+    const field = this.getField();
     let format = field && field.format;
     if (!format) format = defaultFormat;
     if (!format) format = fieldFormats.getDefaultInstance('string');
@@ -313,14 +313,14 @@ export default function AggConfigFactory(Private, fieldTypeFilter) {
   };
 
   AggConfig.prototype.fieldName = function () {
-    let field = this.getField();
+    const field = this.getField();
     return field ? field.name : '';
   };
 
   AggConfig.prototype.fieldIsTimeField = function () {
-    let timeFieldName = this.vis.indexPattern.timeFieldName;
+    const timeFieldName = this.vis.indexPattern.timeFieldName;
     return timeFieldName && this.fieldName() === timeFieldName;
   };
 
   return AggConfig;
-};
+}
diff --git a/src/ui/public/vis/agg_config_result.js b/src/ui/public/vis/agg_config_result.js
index 4df97b55477c6..2ed3d95becf2a 100644
--- a/src/ui/public/vis/agg_config_result.js
+++ b/src/ui/public/vis/agg_config_result.js
@@ -1,47 +1,45 @@
-define(function () {
-  let i = 0;
+let i = 0;
 
-  function AggConfigResult(aggConfig, parent, value, key) {
-    this.key = key;
-    this.value = value;
-    this.aggConfig = aggConfig;
-    this.$parent = parent;
-    this.$order = ++i;
+function AggConfigResult(aggConfig, parent, value, key) {
+  this.key = key;
+  this.value = value;
+  this.aggConfig = aggConfig;
+  this.$parent = parent;
+  this.$order = ++i;
 
-    if (aggConfig.schema.group === 'buckets') {
-      this.type = 'bucket';
-    } else {
-      this.type = 'metric';
-    }
+  if (aggConfig.schema.group === 'buckets') {
+    this.type = 'bucket';
+  } else {
+    this.type = 'metric';
   }
+}
 
-  /**
-   * Returns an array of the aggConfigResult and parents up the branch
-   * @returns {array} Array of aggConfigResults
-   */
-  AggConfigResult.prototype.getPath = function () {
-    return (function walk(result, path) {
-      path.unshift(result);
-      if (result.$parent) return walk(result.$parent, path);
-      return path;
-    }(this, []));
-  };
+/**
+ * Returns an array of the aggConfigResult and parents up the branch
+ * @returns {array} Array of aggConfigResults
+ */
+AggConfigResult.prototype.getPath = function () {
+  return (function walk(result, path) {
+    path.unshift(result);
+    if (result.$parent) return walk(result.$parent, path);
+    return path;
+  }(this, []));
+};
 
-  /**
-   * Returns an Elasticsearch filter that represents the result.
-   * @returns {object} Elasticsearch filter
-   */
-  AggConfigResult.prototype.createFilter = function () {
-    return this.aggConfig.createFilter(this.key);
-  };
+/**
+ * Returns an Elasticsearch filter that represents the result.
+ * @returns {object} Elasticsearch filter
+ */
+AggConfigResult.prototype.createFilter = function () {
+  return this.aggConfig.createFilter(this.key);
+};
 
-  AggConfigResult.prototype.toString = function (contentType) {
-    return this.aggConfig.fieldFormatter(contentType)(this.value);
-  };
+AggConfigResult.prototype.toString = function (contentType) {
+  return this.aggConfig.fieldFormatter(contentType)(this.value);
+};
 
-  AggConfigResult.prototype.valueOf = function () {
-    return this.value;
-  };
+AggConfigResult.prototype.valueOf = function () {
+  return this.value;
+};
 
-  return AggConfigResult;
-});
+export default AggConfigResult;
diff --git a/src/ui/public/vis/agg_configs.js b/src/ui/public/vis/agg_configs.js
index 293cd2504a7fa..08cbc266a0efc 100644
--- a/src/ui/public/vis/agg_configs.js
+++ b/src/ui/public/vis/agg_configs.js
@@ -12,13 +12,13 @@ import IndexedArray from 'ui/indexed_array';
 import VisAggConfigProvider from 'ui/vis/agg_config';
 import AggTypesIndexProvider from 'ui/agg_types/index';
 export default function AggConfigsFactory(Private) {
-  let AggConfig = Private(VisAggConfigProvider);
+  const AggConfig = Private(VisAggConfigProvider);
 
   AggConfig.aggTypes = Private(AggTypesIndexProvider);
 
   _.class(AggConfigs).inherits(IndexedArray);
   function AggConfigs(vis, configStates) {
-    let self = this;
+    const self = this;
     self.vis = vis;
 
     configStates = AggConfig.ensureIds(configStates || []);
@@ -45,9 +45,9 @@ export default function AggConfigsFactory(Private) {
       })
       .each(function (schema) {
         if (!self.bySchemaName[schema.name]) {
-          let defaults = schema.defaults.slice(0, schema.max);
+          const defaults = schema.defaults.slice(0, schema.max);
           _.each(defaults, function (defaultState) {
-            let state = _.defaults({ id: AggConfig.nextId(self) }, defaultState);
+            const state = _.defaults({ id: AggConfig.nextId(self) }, defaultState);
             self.push(new AggConfig(vis, state));
           });
         }
@@ -74,7 +74,7 @@ export default function AggConfigsFactory(Private) {
   };
 
   AggConfigs.prototype.toDsl = function () {
-    let dslTopLvl = {};
+    const dslTopLvl = {};
     let dslLvlCursor;
     let nestedMetrics;
 
@@ -102,8 +102,8 @@ export default function AggConfigsFactory(Private) {
         // start at the top level
         dslLvlCursor = dslTopLvl;
       } else {
-        let prevConfig = list[i - 1];
-        let prevDsl = dslLvlCursor[prevConfig.id];
+        const prevConfig = list[i - 1];
+        const prevDsl = dslLvlCursor[prevConfig.id];
 
         // advance the cursor and nest under the previous agg, or
         // put it on the same level if the previous agg doesn't accept
@@ -111,7 +111,7 @@ export default function AggConfigsFactory(Private) {
         dslLvlCursor = prevDsl.aggs || dslLvlCursor;
       }
 
-      let dsl = dslLvlCursor[config.id] = config.toDsl();
+      const dsl = dslLvlCursor[config.id] = config.toDsl();
       let subAggs;
 
       if (config.schema.group === 'buckets' && i < list.length - 1) {
@@ -148,7 +148,7 @@ export default function AggConfigsFactory(Private) {
    */
   AggConfigs.prototype.getResponseAggs = function () {
     return this.getRequestAggs().reduce(function (responseValuesAggs, agg) {
-      let aggs = agg.getResponseAggs();
+      const aggs = agg.getResponseAggs();
       return aggs ? responseValuesAggs.concat(aggs) : responseValuesAggs;
     }, []);
   };
@@ -163,7 +163,7 @@ export default function AggConfigsFactory(Private) {
    */
   AggConfigs.prototype.getResponseAggById = function (id) {
     id = String(id);
-    let reqAgg = _.find(this.getRequestAggs(), function (agg) {
+    const reqAgg = _.find(this.getRequestAggs(), function (agg) {
       return id.substr(0, String(agg.id).length) === agg.id;
     });
     if (!reqAgg) return;
@@ -171,4 +171,4 @@ export default function AggConfigsFactory(Private) {
   };
 
   return AggConfigs;
-};
+}
diff --git a/src/ui/public/vis/renderbot.js b/src/ui/public/vis/renderbot.js
index 0cf7707ba8e9b..8af0643cf5a3a 100644
--- a/src/ui/public/vis/renderbot.js
+++ b/src/ui/public/vis/renderbot.js
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 
-export default function RenderbotFactory(Private) {
+export default function RenderbotFactory() {
 
   /**
    * "Abstract" renderbot class which just defines the expected API
@@ -22,7 +22,7 @@ export default function RenderbotFactory(Private) {
    * @param {object} esResp - The raw elasticsearch response
    * @return {undefined}
    */
-  Renderbot.prototype.render = function (esResp) {
+  Renderbot.prototype.render = function () {
     throw new Error('not implemented');
   };
 
@@ -47,4 +47,4 @@ export default function RenderbotFactory(Private) {
   Renderbot.prototype.updateParams = _.noop;
 
   return Renderbot;
-};
+}
diff --git a/src/ui/public/vis/schemas.js b/src/ui/public/vis/schemas.js
index f35c1a6d1324d..58da4ac564219 100644
--- a/src/ui/public/vis/schemas.js
+++ b/src/ui/public/vis/schemas.js
@@ -2,10 +2,10 @@ import _ from 'lodash';
 import IndexedArray from 'ui/indexed_array';
 import AggTypesAggParamsProvider from 'ui/agg_types/agg_params';
 export default function VisTypeSchemasFactory(Private) {
-  let AggParams = Private(AggTypesAggParamsProvider);
+  const AggParams = Private(AggTypesAggParamsProvider);
 
   function Schemas(schemas) {
-    let self = this;
+    const self = this;
 
     _(schemas || [])
     .map(function (schema) {
@@ -59,4 +59,4 @@ export default function VisTypeSchemasFactory(Private) {
   }
 
   return Schemas;
-};
+}
diff --git a/src/ui/public/vis/vis.js b/src/ui/public/vis/vis.js
index 365cc8163c4a3..ad3457b4eea44 100644
--- a/src/ui/public/vis/vis.js
+++ b/src/ui/public/vis/vis.js
@@ -14,12 +14,12 @@ import RegistryVisTypesProvider from 'ui/registry/vis_types';
 import VisAggConfigsProvider from 'ui/vis/agg_configs';
 import PersistedStateProvider from 'ui/persisted_state/persisted_state';
 export default function VisFactory(Notifier, Private) {
-  let aggTypes = Private(AggTypesIndexProvider);
-  let visTypes = Private(RegistryVisTypesProvider);
-  let AggConfigs = Private(VisAggConfigsProvider);
+  const aggTypes = Private(AggTypesIndexProvider);
+  const visTypes = Private(RegistryVisTypesProvider);
+  const AggConfigs = Private(VisAggConfigsProvider);
   const PersistedState = Private(PersistedStateProvider);
 
-  let notify = new Notifier({
+  const notify = new Notifier({
     location: 'Vis'
   });
 
@@ -43,12 +43,12 @@ export default function VisFactory(Notifier, Private) {
       type = visTypes.byName[type || 'histogram'];
     }
 
-    let schemas = type.schemas;
+    const schemas = type.schemas;
 
     // This was put in place to do migrations at runtime. It's used to support people who had saved
     // visualizations during the 4.0 betas.
-    let aggs = _.transform(oldState, function (newConfigs, oldConfigs, oldGroupName) {
-      let schema = schemas.all.byName[oldGroupName];
+    const aggs = _.transform(oldState, function (newConfigs, oldConfigs, oldGroupName) {
+      const schema = schemas.all.byName[oldGroupName];
 
       if (!schema) {
         notify.log('unable to match old schema', oldGroupName, 'to a new schema');
@@ -56,12 +56,12 @@ export default function VisFactory(Notifier, Private) {
       }
 
       oldConfigs.forEach(function (oldConfig) {
-        let agg = {
+        const agg = {
           schema: schema.name,
           type: oldConfig.agg
         };
 
-        let aggType = aggTypes.byName[agg.type];
+        const aggType = aggTypes.byName[agg.type];
         if (!aggType) {
           notify.log('unable to find an agg type for old confg', oldConfig);
           return;
@@ -143,7 +143,7 @@ export default function VisFactory(Notifier, Private) {
   };
 
   Vis.prototype.hasSchemaAgg = function (schemaName, aggTypeName) {
-    let aggs = this.aggs.bySchemaName[schemaName] || [];
+    const aggs = this.aggs.bySchemaName[schemaName] || [];
     return aggs.some(function (agg) {
       if (!agg.type || !agg.type.name) return false;
       return agg.type.name === aggTypeName;
@@ -177,4 +177,4 @@ export default function VisFactory(Notifier, Private) {
   };
 
   return Vis;
-};
+}
diff --git a/src/ui/public/vis/vis_type.js b/src/ui/public/vis/vis_type.js
index 96ed7e1d2a00d..4ebf761b4e0b7 100644
--- a/src/ui/public/vis/vis_type.js
+++ b/src/ui/public/vis/vis_type.js
@@ -1,7 +1,7 @@
 import VisSchemasProvider from 'ui/vis/schemas';
 
 export default function VisTypeFactory(Private) {
-  let VisTypeSchemas = Private(VisSchemasProvider);
+  const VisTypeSchemas = Private(VisSchemasProvider);
 
   function VisType(opts) {
     opts = opts || {};
@@ -18,4 +18,4 @@ export default function VisTypeFactory(Private) {
   }
 
   return VisType;
-};
+}
diff --git a/src/ui/public/vislib/__tests__/components/color.js b/src/ui/public/vislib/__tests__/components/color.js
index b04fbb2cc343d..2dc9368dc975e 100644
--- a/src/ui/public/vislib/__tests__/components/color.js
+++ b/src/ui/public/vislib/__tests__/components/color.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import _ from 'lodash';
@@ -11,7 +10,6 @@ import VislibComponentsColorColorPaletteProvider from 'ui/vislib/components/colo
 describe('Vislib Color Module Test Suite', function () {
   let seedColors;
   let mappedColors;
-  let config;
 
   describe('Color (main)', function () {
     let previousConfig;
@@ -116,7 +114,7 @@ describe('Vislib Color Module Test Suite', function () {
     });
 
     it('should return the value from the specified color mapping overrides', function () {
-      const colorFn = getColors(arr, {good: 'red'});
+      const colorFn = getColors(arr, { good: 'red' });
       expect(colorFn('good')).to.be('red');
     });
   });
@@ -151,7 +149,7 @@ describe('Vislib Color Module Test Suite', function () {
     }));
 
     it('should not include colors used by the config', ngMock.inject((config) => {
-      const newConfig = {bar: seedColors[0]};
+      const newConfig = { bar: seedColors[0] };
       config.set('visualization:colorMapping', newConfig);
 
       const arr = ['foo', 'baz', 'qux'];
@@ -163,7 +161,7 @@ describe('Vislib Color Module Test Suite', function () {
     }));
 
     it('should create a unique array of colors even when config is set', ngMock.inject((config) => {
-      const newConfig = {bar: seedColors[0]};
+      const newConfig = { bar: seedColors[0] };
       config.set('visualization:colorMapping', newConfig);
 
       const arr = ['foo', 'bar', 'baz', 'qux'];
@@ -177,7 +175,7 @@ describe('Vislib Color Module Test Suite', function () {
     it('should treat different formats of colors as equal', ngMock.inject((config) => {
       const color = d3.rgb(seedColors[0]);
       const rgb = `rgb(${color.r}, ${color.g}, ${color.b})`;
-      const newConfig = {bar: rgb};
+      const newConfig = { bar: rgb };
       config.set('visualization:colorMapping', newConfig);
 
       const arr = ['foo', 'bar', 'baz', 'qux'];
diff --git a/src/ui/public/vislib/__tests__/components/labels.js b/src/ui/public/vislib/__tests__/components/labels.js
index dfbaacdbe0625..e10f699792183 100644
--- a/src/ui/public/vislib/__tests__/components/labels.js
+++ b/src/ui/public/vislib/__tests__/components/labels.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
@@ -13,14 +12,13 @@ let rowsLabels;
 let seriesArr;
 let rowsArr;
 let uniqLabels;
-let error;
 
 const seriesData = {
   'label': '',
   'series': [
     {
       'label': '100',
-      'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+      'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
     }
   ]
 };
@@ -32,7 +30,7 @@ const rowsData = {
       'series': [
         {
           'label': '100',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     },
@@ -41,7 +39,7 @@ const rowsData = {
       'series': [
         {
           'label': '300',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     },
@@ -50,7 +48,7 @@ const rowsData = {
       'series': [
         {
           'label': '100',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     },
@@ -59,7 +57,7 @@ const rowsData = {
       'series': [
         {
           'label': '200',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     }
@@ -73,7 +71,7 @@ const columnsData = {
       'series': [
         {
           'label': '100',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     },
@@ -82,7 +80,7 @@ const columnsData = {
       'series': [
         {
           'label': '300',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     },
@@ -91,7 +89,7 @@ const columnsData = {
       'series': [
         {
           'label': '100',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     },
@@ -100,7 +98,7 @@ const columnsData = {
       'series': [
         {
           'label': '200',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     }
@@ -268,13 +266,13 @@ describe('Vislib Labels Module Test Suite', function () {
   describe('Unique labels', function () {
     let uniqLabels;
     const arrObj = [
-      {'label': 'a'},
-      {'label': 'b'},
-      {'label': 'b'},
-      {'label': 'c'},
-      {'label': 'c'},
-      {'label': 'd'},
-      {'label': 'f'}
+      { 'label': 'a' },
+      { 'label': 'b' },
+      { 'label': 'b' },
+      { 'label': 'c' },
+      { 'label': 'c' },
+      { 'label': 'd' },
+      { 'label': 'f' }
     ];
     const string = 'string';
     const number = 24;
diff --git a/src/ui/public/vislib/__tests__/components/zero_injection.js b/src/ui/public/vislib/__tests__/components/zero_injection.js
index 0249c6a6b5a94..4fe3b8e37d096 100644
--- a/src/ui/public/vislib/__tests__/components/zero_injection.js
+++ b/src/ui/public/vislib/__tests__/components/zero_injection.js
@@ -1,5 +1,4 @@
 
-import angular from 'angular';
 import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
@@ -166,11 +165,11 @@ describe('Vislib Zero Injection Module Test Suite', function () {
       {
         label: '200',
         values: [
-          {x: 'v1', y: 234},
-          {x: 'v2', y: 34},
-          {x: 'v3', y: 834},
-          {x: 'v4', y: 1234},
-          {x: 'v5', y: 4}
+          { x: 'v1', y: 234 },
+          { x: 'v2', y: 34 },
+          { x: 'v3', y: 834 },
+          { x: 'v4', y: 1234 },
+          { x: 'v5', y: 4 }
         ]
       }
     ]
@@ -181,25 +180,25 @@ describe('Vislib Zero Injection Module Test Suite', function () {
       {
         label: '200',
         values: [
-          {x: '1', y: 234},
-          {x: '2', y: 34},
-          {x: '3', y: 834},
-          {x: '4', y: 1234},
-          {x: '5', y: 4}
+          { x: '1', y: 234 },
+          { x: '2', y: 34 },
+          { x: '3', y: 834 },
+          { x: '4', y: 1234 },
+          { x: '5', y: 4 }
         ]
       },
       {
         label: '404',
         values: [
-          {x: '1', y: 1234},
-          {x: '3', y: 234},
-          {x: '5', y: 34}
+          { x: '1', y: 1234 },
+          { x: '3', y: 234 },
+          { x: '5', y: 34 }
         ]
       },
       {
         label: '503',
         values: [
-          {x: '3', y: 834}
+          { x: '3', y: 834 }
         ]
       }
     ]
@@ -210,25 +209,25 @@ describe('Vislib Zero Injection Module Test Suite', function () {
       {
         label: '200',
         values: [
-          {x: 1, y: 234},
-          {x: 2, y: 34},
-          {x: 3, y: 834},
-          {x: 4, y: 1234},
-          {x: 5, y: 4}
+          { x: 1, y: 234 },
+          { x: 2, y: 34 },
+          { x: 3, y: 834 },
+          { x: 4, y: 1234 },
+          { x: 5, y: 4 }
         ]
       },
       {
         label: '404',
         values: [
-          {x: 1, y: 1234},
-          {x: 3, y: 234},
-          {x: 5, y: 34}
+          { x: 1, y: 1234 },
+          { x: 3, y: 234 },
+          { x: 5, y: 34 }
         ]
       },
       {
         label: '503',
         values: [
-          {x: 3, y: 834}
+          { x: 3, y: 834 }
         ]
       }
     ]
@@ -581,7 +580,7 @@ describe('Vislib Zero Injection Module Test Suite', function () {
     const xValueArr = [1, 2, 3, 4, 5];
     let createZeroArray;
     let arr1;
-    const arr2 = [ {x: 3, y: 834} ];
+    const arr2 = [ { x: 3, y: 834 } ];
     let results;
 
     beforeEach(ngMock.module('kibana'));
diff --git a/src/ui/public/vislib/__tests__/index.js b/src/ui/public/vislib/__tests__/index.js
index d684baf0f15cc..6c90d1d2ffc3c 100644
--- a/src/ui/public/vislib/__tests__/index.js
+++ b/src/ui/public/vislib/__tests__/index.js
@@ -2,9 +2,6 @@
 import _ from 'lodash';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import d3 from 'd3';
-
-import angular from 'angular';
 import 'ui/vislib/styles/main.less';
 import VislibProvider from 'ui/vislib';
 
diff --git a/src/ui/public/vislib/__tests__/lib/axis_title.js b/src/ui/public/vislib/__tests__/lib/axis_title.js
index e542392cef20a..bc08377f0ee95 100644
--- a/src/ui/public/vislib/__tests__/lib/axis_title.js
+++ b/src/ui/public/vislib/__tests__/lib/axis_title.js
@@ -1,5 +1,4 @@
 import d3 from 'd3';
-import angular from 'angular';
 import _ from 'lodash';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
diff --git a/src/ui/public/vislib/__tests__/lib/chart_title.js b/src/ui/public/vislib/__tests__/lib/chart_title.js
index ef8a34b35641a..12e74c5dc4d45 100644
--- a/src/ui/public/vislib/__tests__/lib/chart_title.js
+++ b/src/ui/public/vislib/__tests__/lib/chart_title.js
@@ -1,20 +1,14 @@
 import d3 from 'd3';
-import angular from 'angular';
 import _ from 'lodash';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
 import $ from 'jquery';
 import VislibLibChartTitleProvider from 'ui/vislib/lib/chart_title';
-import VislibLibDataProvider from 'ui/vislib/lib/data';
-import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state';
 
 describe('Vislib ChartTitle Class Test Suite', function () {
   let ChartTitle;
-  let Data;
-  let persistedState;
   let chartTitle;
   let el;
-  let dataObj;
   const data = {
     hits: 621,
     ordered: {
@@ -77,8 +71,6 @@ describe('Vislib ChartTitle Class Test Suite', function () {
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     ChartTitle = Private(VislibLibChartTitleProvider);
-    Data = Private(VislibLibDataProvider);
-    persistedState = new (Private(PersistedStatePersistedStateProvider))();
 
     el = d3.select('body').append('div')
       .attr('class', 'vis-wrapper')
@@ -88,7 +80,6 @@ describe('Vislib ChartTitle Class Test Suite', function () {
       .attr('class', 'chart-title')
       .style('height', '20px');
 
-    dataObj = new Data(data, {}, persistedState);
     chartTitle = new ChartTitle($('.vis-wrapper')[0], 'rows');
   }));
 
@@ -115,5 +106,4 @@ describe('Vislib ChartTitle Class Test Suite', function () {
       expect(_.isFunction(chartTitle.draw())).to.be(true);
     });
   });
-
 });
diff --git a/src/ui/public/vislib/__tests__/lib/data.js b/src/ui/public/vislib/__tests__/lib/data.js
index 8e108a06080f3..15ef70fc6e4dc 100644
--- a/src/ui/public/vislib/__tests__/lib/data.js
+++ b/src/ui/public/vislib/__tests__/lib/data.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import _ from 'lodash';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
@@ -14,7 +13,7 @@ const seriesData = {
   'series': [
     {
       'label': '100',
-      'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+      'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
     }
   ]
 };
@@ -26,7 +25,7 @@ const rowsData = {
       'series': [
         {
           'label': '100',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     },
@@ -35,7 +34,7 @@ const rowsData = {
       'series': [
         {
           'label': '300',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     },
@@ -44,7 +43,7 @@ const rowsData = {
       'series': [
         {
           'label': '100',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     },
@@ -53,7 +52,7 @@ const rowsData = {
       'series': [
         {
           'label': '200',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     }
@@ -67,7 +66,7 @@ const colsData = {
       'series': [
         {
           'label': '100',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     },
@@ -76,7 +75,7 @@ const colsData = {
       'series': [
         {
           'label': '300',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     },
@@ -85,7 +84,7 @@ const colsData = {
       'series': [
         {
           'label': '100',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     },
@@ -94,7 +93,7 @@ const colsData = {
       'series': [
         {
           'label': '200',
-          'values': [{x: 0, y: 1}, {x: 1, y: 2}, {x: 2, y: 3}]
+          'values': [{ x: 0, y: 1 }, { x: 1, y: 2 }, { x: 2, y: 3 }]
         }
       ]
     }
@@ -128,9 +127,9 @@ describe('Vislib Data Class Test Suite', function () {
     const pieData = {
       slices: {
         children: [
-          {size: 30},
-          {size: 20},
-          {size: 0}
+          { size: 30 },
+          { size: 20 },
+          { size: 0 }
         ]
       }
     };
@@ -147,19 +146,11 @@ describe('Vislib Data Class Test Suite', function () {
 
   describe('Data.flatten', function () {
     let serIn;
-    let rowIn;
-    let colIn;
     let serOut;
-    let rowOut;
-    let colOut;
 
     beforeEach(function () {
       serIn = new Data(seriesData, {}, persistedState);
-      rowIn = new Data(rowsData, {}, persistedState);
-      colIn = new Data(colsData, {}, persistedState);
       serOut = serIn.flatten();
-      rowOut = rowIn.flatten();
-      colOut = colIn.flatten();
     });
 
     it('should return an array of value objects from every series', function () {
@@ -330,7 +321,7 @@ describe('Vislib Data Class Test Suite', function () {
         'series': [
           {
             'label': '200',
-            'values': [{x: 0, y: 1}, {x: 1, y: null}, {x: 2, y: 3}]
+            'values': [{ x: 0, y: 1 }, { x: 1, y: null }, { x: 2, y: 3 }]
           }
         ]
       });
diff --git a/src/ui/public/vislib/__tests__/lib/dispatch.js b/src/ui/public/vislib/__tests__/lib/dispatch.js
index 5cd43aad46aa3..151e2f238c68a 100644
--- a/src/ui/public/vislib/__tests__/lib/dispatch.js
+++ b/src/ui/public/vislib/__tests__/lib/dispatch.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import _ from 'lodash';
 import d3 from 'd3';
 import ngMock from 'ng_mock';
@@ -6,7 +5,6 @@ import expect from 'expect.js';
 
 // Data
 import data from 'fixtures/vislib/mock_data/date_histogram/_series';
-import $ from 'jquery';
 import FixturesVislibVisFixtureProvider from 'fixtures/vislib/_vis_fixture';
 import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state';
 
diff --git a/src/ui/public/vislib/__tests__/lib/error_handler.js b/src/ui/public/vislib/__tests__/lib/error_handler.js
index 8685371682b5f..cebf1f0e9abbf 100644
--- a/src/ui/public/vislib/__tests__/lib/error_handler.js
+++ b/src/ui/public/vislib/__tests__/lib/error_handler.js
@@ -1,6 +1,5 @@
 
 import expect from 'expect.js';
-import angular from 'angular';
 import ngMock from 'ng_mock';
 import VislibLibErrorHandlerProvider from 'ui/vislib/lib/_error_handler';
 
diff --git a/src/ui/public/vislib/__tests__/lib/handler/handler.js b/src/ui/public/vislib/__tests__/lib/handler/handler.js
index b143ead5589e2..81c4bbf92d99f 100644
--- a/src/ui/public/vislib/__tests__/lib/handler/handler.js
+++ b/src/ui/public/vislib/__tests__/lib/handler/handler.js
@@ -7,7 +7,6 @@ import columns from 'fixtures/vislib/mock_data/date_histogram/_columns';
 import rows from 'fixtures/vislib/mock_data/date_histogram/_rows';
 import stackedSeries from 'fixtures/vislib/mock_data/date_histogram/_stacked_series';
 import $ from 'jquery';
-import VislibLibHandlerHandlerProvider from 'ui/vislib/lib/handler/handler';
 import FixturesVislibVisFixtureProvider from 'fixtures/vislib/_vis_fixture';
 import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state';
 const dateHistogramArray = [
@@ -25,7 +24,6 @@ const names = [
 
 dateHistogramArray.forEach(function (data, i) {
   describe('Vislib Handler Test Suite for ' + names[i] + ' Data', function () {
-    let Handler;
     let vis;
     let persistedState;
     const events = [
@@ -35,7 +33,6 @@ dateHistogramArray.forEach(function (data, i) {
 
     beforeEach(ngMock.module('kibana'));
     beforeEach(ngMock.inject(function (Private) {
-      Handler = Private(VislibLibHandlerHandlerProvider);
       vis = Private(FixturesVislibVisFixtureProvider)();
       persistedState = new (Private(PersistedStatePersistedStateProvider))();
       vis.render(data, persistedState);
@@ -152,6 +149,5 @@ dateHistogramArray.forEach(function (data, i) {
       });
 
     });
-
   });
 });
diff --git a/src/ui/public/vislib/__tests__/lib/layout/layout.js b/src/ui/public/vislib/__tests__/lib/layout/layout.js
index fa89a1ff34b1f..c97bfb4aa6d98 100644
--- a/src/ui/public/vislib/__tests__/lib/layout/layout.js
+++ b/src/ui/public/vislib/__tests__/lib/layout/layout.js
@@ -1,5 +1,4 @@
 import d3 from 'd3';
-import angular from 'angular';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
 
diff --git a/src/ui/public/vislib/__tests__/lib/layout/layout_types.js b/src/ui/public/vislib/__tests__/lib/layout/layout_types.js
index 9d0b10c6d0986..445eaf08372ce 100644
--- a/src/ui/public/vislib/__tests__/lib/layout/layout_types.js
+++ b/src/ui/public/vislib/__tests__/lib/layout/layout_types.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import _ from 'lodash';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
diff --git a/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js b/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
index dac0111531d9b..1f602cdb96ea9 100644
--- a/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
+++ b/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
@@ -1,5 +1,4 @@
 import d3 from 'd3';
-import angular from 'angular';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
 import $ from 'jquery';
@@ -173,9 +172,9 @@ describe('Vislib Split Function Test Suite', function () {
     });
 
     describe('chart title split function', function () {
-      var visEl;
-      var newEl;
-      var fixture;
+      let visEl;
+      let newEl;
+      let fixture;
 
       beforeEach(ngMock.inject(function () {
         visEl = el.append('div').attr('class', 'vis-wrapper');
diff --git a/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js b/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js
index 578cd854cdcfc..63509c869adf9 100644
--- a/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js
+++ b/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js
@@ -1,5 +1,4 @@
 import d3 from 'd3';
-import angular from 'angular';
 import _ from 'lodash';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
diff --git a/src/ui/public/vislib/__tests__/lib/resize_checker.js b/src/ui/public/vislib/__tests__/lib/resize_checker.js
index bafaef16eaf2d..b617780dc2f55 100644
--- a/src/ui/public/vislib/__tests__/lib/resize_checker.js
+++ b/src/ui/public/vislib/__tests__/lib/resize_checker.js
@@ -1,6 +1,5 @@
 import $ from 'jquery';
 import _ from 'lodash';
-import Promise from 'bluebird';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
 import sinon from 'auto-release-sinon';
@@ -186,11 +185,11 @@ describe('Vislib Resize Checker', function () {
     });
 
     it('repeats the last value in the schedule', function () {
-      let timerId = checker.startSchedule(schedule);
+      checker.startSchedule(schedule);
 
       // start at 1, and go until there is one left
       for (let i = 1; i < schedule.length - 1; i++) {
-        timerId = checker.continueSchedule();
+        checker.continueSchedule();
       }
 
       const last = _.last(schedule);
diff --git a/src/ui/public/vislib/__tests__/lib/x_axis.js b/src/ui/public/vislib/__tests__/lib/x_axis.js
index 7b76513cf15a9..772279077b822 100644
--- a/src/ui/public/vislib/__tests__/lib/x_axis.js
+++ b/src/ui/public/vislib/__tests__/lib/x_axis.js
@@ -1,5 +1,4 @@
 import d3 from 'd3';
-import angular from 'angular';
 import _ from 'lodash';
 import ngMock from 'ng_mock';
 import expect from 'expect.js';
@@ -127,7 +126,6 @@ describe('Vislib xAxis Class Test Suite', function () {
   });
 
   describe('getScale, getDomain, getTimeDomain, getOrdinalDomain, and getRange Methods', function () {
-    let ordered;
     let timeScale;
     let timeDomain;
     let ordinalScale;
@@ -201,7 +199,6 @@ describe('Vislib xAxis Class Test Suite', function () {
 
   describe('getXAxis Method', function () {
     let width;
-    let axis;
 
     beforeEach(function () {
       width = $('.x-axis-div').width();
diff --git a/src/ui/public/vislib/__tests__/vis.js b/src/ui/public/vislib/__tests__/vis.js
index 46a5d5b9903c9..20b8625433b6c 100644
--- a/src/ui/public/vislib/__tests__/vis.js
+++ b/src/ui/public/vislib/__tests__/vis.js
@@ -127,19 +127,10 @@ dataArray.forEach(function (data, i) {
     });
 
     describe('on Method', function () {
-      const events = [
-        beforeEvent,
-        afterEvent
-      ];
       let listeners;
-      let listener1;
-      let listener2;
 
       beforeEach(function () {
-        listeners = [
-          listener1 = function () {},
-          listener2 = function () {}
-        ];
+        listeners = [];
 
         // Add event and listeners to chart
         listeners.forEach(function (listener) {
@@ -173,7 +164,7 @@ dataArray.forEach(function (data, i) {
       it('should cause a listener for each event to be attached to each chart', function () {
         const charts = vis.handler.charts;
 
-        charts.forEach(function (chart, i) {
+        charts.forEach(function (chart) {
           expect(chart.events.listenerCount(beforeEvent)).to.be.above(0);
           expect(chart.events.listenerCount(afterEvent)).to.be.above(0);
         });
diff --git a/src/ui/public/vislib/__tests__/visualizations/column_chart.js b/src/ui/public/vislib/__tests__/visualizations/column_chart.js
index 6180869ea6f9d..69132d47b6309 100644
--- a/src/ui/public/vislib/__tests__/visualizations/column_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/column_chart.js
@@ -24,7 +24,7 @@ const dataTypesArray = [
   ['stackedSeries', 'stacked', stackedSeries],
 ];
 
-dataTypesArray.forEach(function (dataType, i) {
+dataTypesArray.forEach(function (dataType) {
   const name = dataType[0];
   const mode = dataType[1];
   const data = dataType[2];
@@ -95,7 +95,7 @@ dataTypesArray.forEach(function (dataType, i) {
       });
 
       it('should returned grouped bars', function () {
-        vis.handler.charts.forEach(function (chart) {});
+        vis.handler.charts.forEach(function () {});
       });
     });
 
diff --git a/src/ui/public/vislib/__tests__/visualizations/line_chart.js b/src/ui/public/vislib/__tests__/visualizations/line_chart.js
index 0b4049850e1b6..fe792a634b929 100644
--- a/src/ui/public/vislib/__tests__/visualizations/line_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/line_chart.js
@@ -1,5 +1,4 @@
 import d3 from 'd3';
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import _ from 'lodash';
@@ -25,7 +24,7 @@ const dataTypes = [
 ];
 
 describe('Vislib Line Chart', function () {
-  dataTypes.forEach(function (type, i) {
+  dataTypes.forEach(function (type) {
     const name = type[0];
     const data = type[1];
 
diff --git a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
index ad4ece255a76f..809eb43babfcc 100644
--- a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
@@ -1,5 +1,4 @@
 import d3 from 'd3';
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import _ from 'lodash';
@@ -13,22 +12,22 @@ import AggResponseHierarchicalBuildHierarchicalDataProvider from 'ui/agg_respons
 
 const rowAgg = [
   { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-  { type: 'terms', schema: 'split', params: { field: 'extension', rows: true }},
-  { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-  { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+  { type: 'terms', schema: 'split', params: { field: 'extension', rows: true } },
+  { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
+  { type: 'terms', schema: 'segment', params: { field: 'geo.src' } }
 ];
 
 const colAgg = [
   { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-  { type: 'terms', schema: 'split', params: { field: 'extension', row: false }},
-  { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-  { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+  { type: 'terms', schema: 'split', params: { field: 'extension', row: false } },
+  { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
+  { type: 'terms', schema: 'segment', params: { field: 'geo.src' } }
 ];
 
 const sliceAgg = [
   { type: 'avg', schema: 'metric', params: { field: 'bytes' } },
-  { type: 'terms', schema: 'segment', params: { field: 'machine.os' }},
-  { type: 'terms', schema: 'segment', params: { field: 'geo.src' }}
+  { type: 'terms', schema: 'segment', params: { field: 'machine.os' } },
+  { type: 'terms', schema: 'segment', params: { field: 'geo.src' } }
 ];
 
 const aggArray = [
diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js
index 3366a4a21200e..1e270be10a573 100644
--- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js
+++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import _ from 'lodash';
@@ -44,12 +43,10 @@ describe('TileMap Map Tests', function () {
   }));
 
   describe('instantiation', function () {
-    let map;
     let createStub;
 
     beforeEach(function () {
       createStub = sinon.stub(TileMapMap.prototype, '_createMap', _.noop);
-      map = new TileMapMap($mockMapEl, geoJsonData, {});
     });
 
     it('should create the map', function () {
@@ -102,7 +99,7 @@ describe('TileMap Map Tests', function () {
 
     it('should create a WMS layer if WMS is enabled', function () {
       expect(L.tileLayer.wms.called).to.be(false);
-      map = new TileMapMap($mockMapEl, geoJsonData, {attr: {wms: {enabled: true}}});
+      map = new TileMapMap($mockMapEl, geoJsonData, { attr: { wms: { enabled: true } } });
       map._createMap({});
       expect(L.tileLayer.wms.called).to.be(true);
       L.tileLayer.restore();
@@ -110,15 +107,12 @@ describe('TileMap Map Tests', function () {
   });
 
   describe('attachEvents', function () {
-    let map;
-
     beforeEach(function () {
       sinon.stub(TileMapMap.prototype, '_createMap', function () {
         this._tileLayer = leafletMocks.tileLayer;
         this.map = leafletMocks.map;
         this._attachEvents();
       });
-      map = new TileMapMap($mockMapEl, geoJsonData, {});
     });
 
     it('should attach interaction events', function () {
diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js
index 8d06738695399..6175a07efac12 100644
--- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js
+++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js
@@ -6,7 +6,6 @@ import _ from 'lodash';
 import L from 'leaflet';
 import sinon from 'auto-release-sinon';
 import geoJsonData from 'fixtures/vislib/mock_data/geohash/_geo_json';
-import $ from 'jquery';
 import VislibVisualizationsMarkerTypesBaseMarkerProvider from 'ui/vislib/visualizations/marker_types/base_marker';
 import VislibVisualizationsMarkerTypesShadedCirclesProvider from 'ui/vislib/visualizations/marker_types/shaded_circles';
 import VislibVisualizationsMarkerTypesScaledCirclesProvider from 'ui/vislib/visualizations/marker_types/scaled_circles';
@@ -15,8 +14,6 @@ import VislibVisualizationsMarkerTypesHeatmapProvider from 'ui/vislib/visualizat
 const defaultSWCoords = [13.496, -143.789];
 const defaultNECoords = [55.526, -57.919];
 const bounds = {};
-let MarkerType;
-let map;
 
 angular.module('MarkerFactory', ['kibana']);
 
@@ -115,7 +112,6 @@ describe('Marker Tests', function () {
 
         // should always get the same color back
         _.times(5, function () {
-          const num = _.random(0, 100);
           const randColor = markerLayer._legendQuantizer(0);
           expect(randColor).to.equal(color);
         });
@@ -136,17 +132,16 @@ describe('Marker Tests', function () {
 
       it('should use the legendQuantizer', function () {
         const spy = sinon.spy(markerLayer, '_legendQuantizer');
-        const style = markerLayer.applyShadingStyle(100);
+        markerLayer.applyShadingStyle(100);
         expect(spy.callCount).to.equal(1);
       });
     });
 
     describe('showTooltip', function () {
       it('should use the tooltip formatter', function () {
-        let content;
         const sample = _.sample(mapData.features);
 
-        const stub = sinon.stub(markerLayer, '_tooltipFormatter', function (val) {
+        const stub = sinon.stub(markerLayer, '_tooltipFormatter', function () {
           return;
         });
 
@@ -163,7 +158,7 @@ describe('Marker Tests', function () {
 
       beforeEach(function () {
         addToSpy = sinon.spy();
-        leafletControlStub = sinon.stub(L, 'control', function (options) {
+        leafletControlStub = sinon.stub(L, 'control', function () {
           return {
             addTo: addToSpy
           };
@@ -231,7 +226,6 @@ describe('Marker Tests', function () {
     describe('radiusScale method', function () {
       const valueArray = [10, 20, 30, 40, 50, 60];
       const max = _.max(valueArray);
-      const prev = -1;
 
       it('should return 0 for value of 0', function () {
         expect(markerLayer._radiusScale(0)).to.equal(0);
diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js
index 0803ad328bebd..62b987ba941bf 100644
--- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js
+++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import _ from 'lodash';
diff --git a/src/ui/public/vislib/__tests__/visualizations/time_marker.js b/src/ui/public/vislib/__tests__/visualizations/time_marker.js
index 0f240cada0118..59a16188c62cf 100644
--- a/src/ui/public/vislib/__tests__/visualizations/time_marker.js
+++ b/src/ui/public/vislib/__tests__/visualizations/time_marker.js
@@ -1,9 +1,6 @@
 import d3 from 'd3';
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
-import _ from 'lodash';
-import fixtures from 'fixtures/fake_hierarchical_data';
 import series from 'fixtures/vislib/mock_data/date_histogram/_series';
 import terms from 'fixtures/vislib/mock_data/terms/_columns';
 import $ from 'jquery';
diff --git a/src/ui/public/vislib/__tests__/visualizations/vis_types.js b/src/ui/public/vislib/__tests__/visualizations/vis_types.js
index a025fe13a7285..4475a3949f7b4 100644
--- a/src/ui/public/vislib/__tests__/visualizations/vis_types.js
+++ b/src/ui/public/vislib/__tests__/visualizations/vis_types.js
@@ -1,4 +1,3 @@
-import angular from 'angular';
 import expect from 'expect.js';
 import ngMock from 'ng_mock';
 import _ from 'lodash';
diff --git a/src/ui/public/vislib/components/color/color.js b/src/ui/public/vislib/components/color/color.js
index 3a7d4543fb7f9..9df164067583b 100644
--- a/src/ui/public/vislib/components/color/color.js
+++ b/src/ui/public/vislib/components/color/color.js
@@ -28,4 +28,4 @@ export default function ColorUtilService(Private) {
       return colorMapping[value] || mappedColors.get(value);
     };
   };
-};
+}
diff --git a/src/ui/public/vislib/components/color/color_palette.js b/src/ui/public/vislib/components/color/color_palette.js
index 5b4586a2642d8..cfd08b0ea3acd 100644
--- a/src/ui/public/vislib/components/color/color_palette.js
+++ b/src/ui/public/vislib/components/color/color_palette.js
@@ -57,4 +57,4 @@ export default function ColorPaletteUtilService(Private) {
 
   };
 
-};
+}
diff --git a/src/ui/public/vislib/components/color/mapped_colors.js b/src/ui/public/vislib/components/color/mapped_colors.js
index d665dd5cae5a0..794467a4ebe90 100644
--- a/src/ui/public/vislib/components/color/mapped_colors.js
+++ b/src/ui/public/vislib/components/color/mapped_colors.js
@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import d3 from 'd3';
 import VislibComponentsColorColorPaletteProvider from 'ui/vislib/components/color/color_palette';
-define((require) => (Private, config, $rootScope) => {
+define(() => (Private, config, $rootScope) => {
   const createColorPalette = Private(VislibComponentsColorColorPaletteProvider);
 
   const standardizeColor = (color) => d3.rgb(color).toString();
diff --git a/src/ui/public/vislib/components/color/seed_colors.js b/src/ui/public/vislib/components/color/seed_colors.js
index aae433fece914..98d57e7459668 100644
--- a/src/ui/public/vislib/components/color/seed_colors.js
+++ b/src/ui/public/vislib/components/color/seed_colors.js
@@ -1,20 +1,11 @@
-define(function () {
-  /*
-   * Using a random color generator presented awful colors and unpredictable color schemes.
-   * So we needed to come up with a color scheme of our own that creates consistent, pleasing color patterns.
-   * The order allows us to guarantee that 1st, 2nd, 3rd, etc values always get the same color.
-   * Returns an array of 72 colors.
-   */
-
-  return function SeedColorUtilService() {
-    return [
-      '#6eadc1',
-      '#57c17b',
-      '#6f87d8',
-      '#663db8',
-      '#bc52bc',
-      '#9e3533',
-      '#daa05d'
-    ];
-  };
-});
+export default function SeedColorUtilService() {
+  return [
+    '#6eadc1',
+    '#57c17b',
+    '#6f87d8',
+    '#663db8',
+    '#bc52bc',
+    '#9e3533',
+    '#daa05d'
+  ];
+}
diff --git a/src/ui/public/vislib/components/labels/data_array.js b/src/ui/public/vislib/components/labels/data_array.js
index 1aae7dbe9816a..3a2afc7936cb0 100644
--- a/src/ui/public/vislib/components/labels/data_array.js
+++ b/src/ui/public/vislib/components/labels/data_array.js
@@ -14,4 +14,4 @@ export default function GetArrayUtilService(Private) {
     if (!obj.series) return flattenSeries(obj);
     return obj.series;
   };
-};
+}
diff --git a/src/ui/public/vislib/components/labels/flatten_series.js b/src/ui/public/vislib/components/labels/flatten_series.js
index 9fec72709d1ad..5c700757a5ebe 100644
--- a/src/ui/public/vislib/components/labels/flatten_series.js
+++ b/src/ui/public/vislib/components/labels/flatten_series.js
@@ -17,4 +17,4 @@ export default function GetSeriesUtilService() {
     .flattenDeep()
     .value();
   };
-};
+}
diff --git a/src/ui/public/vislib/components/labels/labels.js b/src/ui/public/vislib/components/labels/labels.js
index dab5a5e1486a0..7b8c14fa283a7 100644
--- a/src/ui/public/vislib/components/labels/labels.js
+++ b/src/ui/public/vislib/components/labels/labels.js
@@ -20,4 +20,4 @@ export default function LabelUtilService(Private) {
     if (chartType === 'pie') { return getPieLabels(obj); }
     return getArrOfUniqLabels(createArr(obj));
   };
-};
+}
diff --git a/src/ui/public/vislib/components/labels/pie/get_pie_names.js b/src/ui/public/vislib/components/labels/pie/get_pie_names.js
index 22ac25a686fcf..c7c57ca150579 100644
--- a/src/ui/public/vislib/components/labels/pie/get_pie_names.js
+++ b/src/ui/public/vislib/components/labels/pie/get_pie_names.js
@@ -17,4 +17,4 @@ export default function GetPieNames(Private) {
       .value();
     }
   };
-};
+}
diff --git a/src/ui/public/vislib/components/labels/pie/pie_labels.js b/src/ui/public/vislib/components/labels/pie/pie_labels.js
index 250563c6586e5..6c69a753b6ee4 100644
--- a/src/ui/public/vislib/components/labels/pie/pie_labels.js
+++ b/src/ui/public/vislib/components/labels/pie/pie_labels.js
@@ -23,4 +23,4 @@ export default function PieLabels(Private) {
 
     return _.uniq(names);
   };
-};
+}
diff --git a/src/ui/public/vislib/components/labels/pie/remove_zero_slices.js b/src/ui/public/vislib/components/labels/pie/remove_zero_slices.js
index 99e25cd9dec4f..7dcfc789f5c28 100644
--- a/src/ui/public/vislib/components/labels/pie/remove_zero_slices.js
+++ b/src/ui/public/vislib/components/labels/pie/remove_zero_slices.js
@@ -12,4 +12,4 @@ export default function RemoveZeroSlices() {
 
     return slices;
   };
-};
+}
diff --git a/src/ui/public/vislib/components/labels/pie/return_pie_names.js b/src/ui/public/vislib/components/labels/pie/return_pie_names.js
index bb69a9542c870..389eb47178285 100644
--- a/src/ui/public/vislib/components/labels/pie/return_pie_names.js
+++ b/src/ui/public/vislib/components/labels/pie/return_pie_names.js
@@ -1,19 +1,17 @@
-define(function () {
-  return function ReturnPieNames() {
-    return function returnNames(array, index, columns) {
-      const names = [];
+export default function ReturnPieNames() {
+  return function returnNames(array, index, columns) {
+    const names = [];
 
-      array.forEach(function (obj) {
-        names.push({ key: obj.name, index: index });
+    array.forEach(function (obj) {
+      names.push({ key: obj.name, index: index });
 
-        if (obj.children) {
-          returnNames(obj.children, (index + 1), columns).forEach(function (namedObj) {
-            names.push(namedObj);
-          });
-        }
-      });
+      if (obj.children) {
+        returnNames(obj.children, (index + 1), columns).forEach(function (namedObj) {
+          names.push(namedObj);
+        });
+      }
+    });
 
-      return names;
-    };
+    return names;
   };
-});
+}
diff --git a/src/ui/public/vislib/components/labels/uniq_labels.js b/src/ui/public/vislib/components/labels/uniq_labels.js
index 087bb5bdabdef..06994346d5500 100644
--- a/src/ui/public/vislib/components/labels/uniq_labels.js
+++ b/src/ui/public/vislib/components/labels/uniq_labels.js
@@ -15,4 +15,4 @@ export default function UniqLabelUtilService() {
     .unique()
     .value();
   };
-};
+}
diff --git a/src/ui/public/vislib/components/zero_injection/flatten_data.js b/src/ui/public/vislib/components/zero_injection/flatten_data.js
index 1992014dfb92d..ad796b65f82a5 100644
--- a/src/ui/public/vislib/components/zero_injection/flatten_data.js
+++ b/src/ui/public/vislib/components/zero_injection/flatten_data.js
@@ -25,4 +25,4 @@ export default function FlattenDataObjectUtilService() {
     .filter(Boolean)
     .value();
   };
-};
+}
diff --git a/src/ui/public/vislib/components/zero_injection/inject_zeros.js b/src/ui/public/vislib/components/zero_injection/inject_zeros.js
index 44479674ac987..a233949a8a1c4 100644
--- a/src/ui/public/vislib/components/zero_injection/inject_zeros.js
+++ b/src/ui/public/vislib/components/zero_injection/inject_zeros.js
@@ -47,4 +47,4 @@ export default function ZeroInjectionUtilService(Private) {
 
     return obj;
   };
-};
+}
diff --git a/src/ui/public/vislib/components/zero_injection/ordered_x_keys.js b/src/ui/public/vislib/components/zero_injection/ordered_x_keys.js
index 13afcb736d59a..b337fc403acd7 100644
--- a/src/ui/public/vislib/components/zero_injection/ordered_x_keys.js
+++ b/src/ui/public/vislib/components/zero_injection/ordered_x_keys.js
@@ -59,4 +59,4 @@ export default function OrderedXKeysUtilService(Private) {
     .flatten()
     .value();
   };
-};
+}
diff --git a/src/ui/public/vislib/components/zero_injection/uniq_keys.js b/src/ui/public/vislib/components/zero_injection/uniq_keys.js
index 144a59f16f737..0c27df843ca31 100644
--- a/src/ui/public/vislib/components/zero_injection/uniq_keys.js
+++ b/src/ui/public/vislib/components/zero_injection/uniq_keys.js
@@ -56,4 +56,4 @@ export default function UniqueXValuesUtilService(Private) {
 
     return uniqueXValues;
   };
-};
+}
diff --git a/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js b/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js
index e997c7d377a90..826530e7e6198 100644
--- a/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js
+++ b/src/ui/public/vislib/components/zero_injection/zero_fill_data_array.js
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-export default function ZeroFillDataArrayUtilService(Private) {
+export default function ZeroFillDataArrayUtilService() {
 
   /*
    * Accepts an array of zero-filled y value objects (arr1)
@@ -29,4 +29,4 @@ export default function ZeroFillDataArrayUtilService(Private) {
 
     return arr1;
   };
-};
+}
diff --git a/src/ui/public/vislib/components/zero_injection/zero_filled_array.js b/src/ui/public/vislib/components/zero_injection/zero_filled_array.js
index ceeb4afc0c2f1..e001353309eca 100644
--- a/src/ui/public/vislib/components/zero_injection/zero_filled_array.js
+++ b/src/ui/public/vislib/components/zero_injection/zero_filled_array.js
@@ -1,28 +1,27 @@
 import _ from 'lodash';
-define(function () {
-  return function ZeroFilledArrayUtilService() {
 
-    /*
-     * Accepts an array of x axis values (strings or numbers).
-     * Returns a zero filled array.
-    */
+export default function ZeroFilledArrayUtilService() {
 
-    return function (arr) {
-      if (!_.isArray(arr)) {
-        throw new Error('ZeroFilledArrayUtilService expects an array of strings or numbers');
-      }
+  /*
+   * Accepts an array of x axis values (strings or numbers).
+   * Returns a zero filled array.
+  */
 
-      const zeroFilledArray = [];
+  return function (arr) {
+    if (!_.isArray(arr)) {
+      throw new Error('ZeroFilledArrayUtilService expects an array of strings or numbers');
+    }
 
-      arr.forEach(function (val) {
-        zeroFilledArray.push({
-          x: val,
-          xi: Infinity,
-          y: 0
-        });
+    const zeroFilledArray = [];
+
+    arr.forEach(function (val) {
+      zeroFilledArray.push({
+        x: val,
+        xi: Infinity,
+        y: 0
       });
+    });
 
-      return zeroFilledArray;
-    };
+    return zeroFilledArray;
   };
-});
+}
diff --git a/src/ui/public/vislib/lib/_error_handler.js b/src/ui/public/vislib/lib/_error_handler.js
index f7e67dbf0d21a..244be894587fc 100644
--- a/src/ui/public/vislib/lib/_error_handler.js
+++ b/src/ui/public/vislib/lib/_error_handler.js
@@ -30,8 +30,8 @@ export default function ErrorHandlerFactory() {
       if (badWidth || badHeight) {
         throw new errors.ContainerTooSmall();
       }
-    };
+    }
   }
 
   return ErrorHandler;
-};
+}
diff --git a/src/ui/public/vislib/lib/alerts.js b/src/ui/public/vislib/lib/alerts.js
index 35b22ef1e5cdd..5c06df5f1f410 100644
--- a/src/ui/public/vislib/lib/alerts.js
+++ b/src/ui/public/vislib/lib/alerts.js
@@ -1,7 +1,7 @@
 import $ from 'jquery';
 import _ from 'lodash';
 import Binder from 'ui/binder';
-export default function AlertsFactory(Private) {
+export default function AlertsFactory() {
 
   /**
    * Adds allerts that float in front of a visualization
@@ -82,7 +82,7 @@ export default function AlertsFactory(Private) {
       $(vis.el).find('.vis-alerts').append(
         $('<div>').addClass('vis-alerts-tray').append(alerts.value())
       );
-    };
+    }
 
     /**
      * Tear down the Alerts
@@ -90,8 +90,8 @@ export default function AlertsFactory(Private) {
      */
     destroy() {
       this.binder.destroy();
-    };
+    }
   }
 
   return Alerts;
-};
+}
diff --git a/src/ui/public/vislib/lib/axis_title.js b/src/ui/public/vislib/lib/axis_title.js
index 7fa2f54230d23..d0dc99520dcc8 100644
--- a/src/ui/public/vislib/lib/axis_title.js
+++ b/src/ui/public/vislib/lib/axis_title.js
@@ -31,7 +31,7 @@ export default function AxisTitleFactory(Private) {
     render() {
       d3.select(this.el).select('.x-axis-title').call(this.draw(this.xTitle));
       d3.select(this.el).select('.y-axis-title').call(this.draw(this.yTitle));
-    };
+    }
 
     /**
      * Appends an SVG with title text
@@ -66,8 +66,8 @@ export default function AxisTitleFactory(Private) {
           .text(title);
         });
       };
-    };
+    }
   }
 
   return AxisTitle;
-};
+}
diff --git a/src/ui/public/vislib/lib/chart_title.js b/src/ui/public/vislib/lib/chart_title.js
index 1159f148eeb29..a0ad58c289ba8 100644
--- a/src/ui/public/vislib/lib/chart_title.js
+++ b/src/ui/public/vislib/lib/chart_title.js
@@ -35,7 +35,7 @@ export default function ChartTitleFactory(Private) {
       const height = el ? el.clientHeight : 0;
 
       return d3.select(this.el).selectAll('.chart-title').call(this.draw(width, height));
-    };
+    }
 
     /**
      * Truncates chart title text
@@ -70,7 +70,7 @@ export default function ChartTitleFactory(Private) {
           return text.text();
         });
       };
-    };
+    }
 
     /**
      * Adds tooltip events on truncated chart titles
@@ -83,7 +83,7 @@ export default function ChartTitleFactory(Private) {
       if (this.tooltip) {
         return target.call(this.tooltip.render());
       }
-    };
+    }
 
     /**
      * Appends chart titles to the visualization
@@ -123,8 +123,8 @@ export default function ChartTitleFactory(Private) {
             .call(self.truncate(size));
         });
       };
-    };
+    }
   }
 
   return ChartTitle;
-};
+}
diff --git a/src/ui/public/vislib/lib/data.js b/src/ui/public/vislib/lib/data.js
index 1e54c45258bb1..3daf70d7c8691 100644
--- a/src/ui/public/vislib/lib/data.js
+++ b/src/ui/public/vislib/lib/data.js
@@ -67,28 +67,28 @@ export default function DataFactory(Private) {
 
     _getLabels(data) {
       return this.type === 'series' ? getLabels(data) : this.pieNames();
-    };
+    }
 
     /**
      * Returns true for positive numbers
      */
     _isPositive(num) {
       return num >= 0;
-    };
+    }
 
     /**
      * Returns true for negative numbers
      */
     _isNegative(num) {
       return num < 0;
-    };
+    }
 
     /**
      * Adds two input values
      */
     _addVals(a, b) {
       return a + b;
-    };
+    }
 
     /**
      * Returns the results of the addition of numbers in a filtered array.
@@ -97,7 +97,7 @@ export default function DataFactory(Private) {
       const filteredArray = arr.filter(callback);
 
       return (filteredArray.length) ? filteredArray.reduce(this._addVals) : 0;
-    };
+    }
 
     /**
      * Calculates the d.y0 value for stacked data in D3.
@@ -105,7 +105,7 @@ export default function DataFactory(Private) {
     _calcYZero(y, arr) {
       if (y >= 0) return this._sumYs(arr, this._isPositive);
       return this._sumYs(arr, this._isNegative);
-    };
+    }
 
     /**
      *
@@ -119,7 +119,7 @@ export default function DataFactory(Private) {
       dataLengths.values = dataLengths.stacks ? data[i].series[j].values.length : 0;
 
       return dataLengths;
-    };
+    }
 
     /**
      *
@@ -137,7 +137,7 @@ export default function DataFactory(Private) {
       cache.count = this._getCounts(cache.index.chart, cache.index.stack);
 
       return cache;
-    };
+    }
 
     /**
      * Stacking function passed to the D3 Stack Layout `.out` API.
@@ -185,7 +185,7 @@ export default function DataFactory(Private) {
         this._cache.count.stacks = chartSeries.length;
         this._cache.count.values = chartSeries.length ? chartSeries[this._cache.index.stack].values.length : 0;
       }
-    };
+    }
 
     getDataType() {
       const data = this.getVisData();
@@ -202,7 +202,7 @@ export default function DataFactory(Private) {
       });
 
       return type;
-    };
+    }
 
     /**
      * Returns an array of the actual x and y data value objects
@@ -217,7 +217,7 @@ export default function DataFactory(Private) {
         return _.toArray(arr);
       }
       return [this.data];
-    };
+    }
 
     /**
      * Returns an array of chart data objects
@@ -237,7 +237,7 @@ export default function DataFactory(Private) {
       }
 
       return visData;
-    };
+    }
 
     /**
      * get min and max for all cols, rows of data
@@ -253,8 +253,8 @@ export default function DataFactory(Private) {
           min: Math.min(props.min, minMax.min),
           max: Math.max(props.max, minMax.max)
         };
-      }, {min: Infinity, max: -Infinity});
-    };
+      }, { min: Infinity, max: -Infinity });
+    }
 
     /**
      * Returns array of chart data objects for pie data objects
@@ -267,7 +267,7 @@ export default function DataFactory(Private) {
         return this.data.rows ? this.data.rows : this.data.columns;
       }
       return [this.data];
-    };
+    }
 
     /**
      * Get attributes off the data, e.g. `tooltipFormatter` or `xAxisFormatter`
@@ -282,7 +282,7 @@ export default function DataFactory(Private) {
     get(thing, def) {
       const source = (this.data.rows || this.data.columns || [this.data])[0];
       return _.get(source, thing, def);
-    };
+    }
 
     /**
      * Returns true if null values are present
@@ -298,7 +298,7 @@ export default function DataFactory(Private) {
           });
         });
       });
-    };
+    }
 
     /**
      * Return an array of all value objects
@@ -315,7 +315,7 @@ export default function DataFactory(Private) {
         .pluck('values')
         .flattenDeep()
         .value();
-    };
+    }
 
     /**
      * Determines whether histogram charts should be stacked
@@ -334,7 +334,7 @@ export default function DataFactory(Private) {
       const stackedArea = isArea && !isOverlapping;
 
       return stackedHisto || stackedArea;
-    };
+    }
 
     /**
      * Validates that the Y axis min value defined by user input
@@ -348,7 +348,7 @@ export default function DataFactory(Private) {
         throw new Error('validateUserDefinedYMin expects a number');
       }
       return val;
-    };
+    }
 
     /**
      * Calculates the lowest Y value across all charts, taking
@@ -387,7 +387,7 @@ export default function DataFactory(Private) {
       });
 
       return min;
-    };
+    }
 
     /**
      * Calculates the highest Y value across all charts, taking
@@ -425,7 +425,7 @@ export default function DataFactory(Private) {
       });
 
       return max;
-    };
+    }
 
     /**
      * Calculates the stacked values for each data object
@@ -438,7 +438,7 @@ export default function DataFactory(Private) {
       // Should not stack values on line chart
       if (this._attr.type === 'line') return series;
       return this._attr.stack(series);
-    };
+    }
 
     /**
      * Returns the max Y axis value for a `series` array based on
@@ -463,21 +463,21 @@ export default function DataFactory(Private) {
       .map(getValue);
 
       return d3[extent](points);
-    };
+    }
 
     /**
      * Calculates the y stack value for each data object
      */
     _getYStack(d) {
       return d.y0 + d.y;
-    };
+    }
 
     /**
      * Calculates the Y max value
      */
     _getY(d) {
       return d.y;
-    };
+    }
 
     /**
      * Helper function for getNames
@@ -494,7 +494,7 @@ export default function DataFactory(Private) {
       const names = [];
       const self = this;
 
-      _.forEach(array, function (obj, i) {
+      _.forEach(array, function (obj) {
         names.push({
           label: obj.name,
           values: obj,
@@ -511,7 +511,7 @@ export default function DataFactory(Private) {
       });
 
       return names;
-    };
+    }
 
     /**
      * Flattens hierarchical data into an array of objects with a name and index value.
@@ -538,7 +538,7 @@ export default function DataFactory(Private) {
         })
         .value();
       }
-    };
+    }
 
     /**
      * Removes zeros from pie chart data
@@ -559,7 +559,7 @@ export default function DataFactory(Private) {
       }, []);
 
       return slices;
-    };
+    }
 
     /**
      * Returns an array of names ordered by appearance in the nested array
@@ -582,7 +582,7 @@ export default function DataFactory(Private) {
       });
 
       return _.uniq(names, 'label');
-    };
+    }
 
     /**
      * Inject zeros into the data
@@ -592,7 +592,7 @@ export default function DataFactory(Private) {
      */
     injectZeros() {
       return injectZeros(this.data);
-    };
+    }
 
     /**
      * Returns an array of all x axis values from the data
@@ -602,7 +602,7 @@ export default function DataFactory(Private) {
      */
     xValues() {
       return orderKeys(this.data);
-    };
+    }
 
     /**
      * Return an array of unique labels
@@ -614,7 +614,7 @@ export default function DataFactory(Private) {
      */
     getLabels() {
       return getLabels(this.data);
-    };
+    }
 
     /**
      * Returns a function that does color lookup on labels
@@ -624,7 +624,7 @@ export default function DataFactory(Private) {
      */
     getColorFunc() {
       return color(this.getLabels(), this.uiState.get('vis.colors'));
-    };
+    }
 
     /**
      * Returns a function that does color lookup on names for pie charts
@@ -636,7 +636,7 @@ export default function DataFactory(Private) {
       return color(this.pieNames(this.getVisData()).map(function (d) {
         return d.label;
       }), this.uiState.get('vis.colors'));
-    };
+    }
 
     /**
      * ensure that the datas ordered property has a min and max
@@ -660,7 +660,7 @@ export default function DataFactory(Private) {
           if (missingMax) d.ordered.max = extent[1];
         }
       });
-    };
+    }
 
     /**
      * Calculates min and max values for all map data
@@ -673,12 +673,11 @@ export default function DataFactory(Private) {
      * @returns {Array} min and max values
      */
     mapDataExtents(series) {
-      let values;
-      values = _.map(series.rows, function (row) {
+      const values = _.map(series.rows, function (row) {
         return row[row.length - 1];
       });
       return [_.min(values), _.max(values)];
-    };
+    }
 
     /**
      * Get the maximum number of series, considering each chart
@@ -690,8 +689,8 @@ export default function DataFactory(Private) {
       return this.chartData().reduce(function (max, chart) {
         return Math.max(max, chart.series.length);
       }, 0);
-    };
+    }
   }
 
   return Data;
-};
+}
diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
index 1a7b1d632df86..fef1b91e9ab09 100644
--- a/src/ui/public/vislib/lib/dispatch.js
+++ b/src/ui/public/vislib/lib/dispatch.js
@@ -59,7 +59,7 @@ export default function DispatchClass(Private, config) {
 
       if (isSeries) {
         // Find object with the actual d value and add it to the point object
-        const object = _.find(series, {'label': d.label});
+        const object = _.find(series, { 'label': d.label });
         eventData.value = +object.values[i].y;
 
         if (isPercentage) {
@@ -69,7 +69,7 @@ export default function DispatchClass(Private, config) {
       }
 
       return eventData;
-    };
+    }
 
     /**
      * Returns a function that adds events and listeners to a D3 selection
@@ -89,7 +89,7 @@ export default function DispatchClass(Private, config) {
           }
         });
       };
-    };
+    }
 
     /**
      *
@@ -116,7 +116,7 @@ export default function DispatchClass(Private, config) {
       }
 
       return addEvent('mouseover', hover);
-    };
+    }
 
     /**
      *
@@ -136,7 +136,7 @@ export default function DispatchClass(Private, config) {
       }
 
       return addEvent('mouseout', mouseout);
-    };
+    }
 
     /**
      *
@@ -152,7 +152,7 @@ export default function DispatchClass(Private, config) {
       }
 
       return addEvent('click', click);
-    };
+    }
 
     /**
      * Determine if we will allow brushing
@@ -166,7 +166,7 @@ export default function DispatchClass(Private, config) {
       const hasTimeField = this.handler.vis._attr.hasTimeField;
 
       return Boolean(hasTimeField && xAxis.ordered && xAxis.xScale && _.isFunction(xAxis.xScale.invert));
-    };
+    }
 
     /**
      * Determine if brushing is currently enabled
@@ -176,7 +176,7 @@ export default function DispatchClass(Private, config) {
      */
     isBrushable() {
       return this.allowBrushing() && this.listenerCount('brush') > 0;
-    };
+    }
 
     /**
      *
@@ -208,7 +208,7 @@ export default function DispatchClass(Private, config) {
       }
 
       return this.addEvent('mousedown', brushEnd);
-    };
+    }
 
 
     /**
@@ -219,7 +219,7 @@ export default function DispatchClass(Private, config) {
      */
     addMousePointer() {
       return d3.select(this).style('cursor', 'pointer');
-    };
+    }
 
     /**
      * Highlight the element that is under the cursor
@@ -246,7 +246,7 @@ export default function DispatchClass(Private, config) {
      */
     unHighlight(element) {
       $('[data-label]', element.parentNode).css('opacity', 1);
-    };
+    }
 
     /**
      * Adds D3 brush to SVG and returns the brush function
@@ -303,7 +303,7 @@ export default function DispatchClass(Private, config) {
 
         return brush;
       }
-    };
+    }
   }
 
   function validBrushClick(event) {
@@ -318,4 +318,4 @@ export default function DispatchClass(Private, config) {
   }
 
   return Dispatch;
-};
+}
diff --git a/src/ui/public/vislib/lib/handler/handler.js b/src/ui/public/vislib/lib/handler/handler.js
index 1114c15f5fa98..07dcc7ffda6ae 100644
--- a/src/ui/public/vislib/lib/handler/handler.js
+++ b/src/ui/public/vislib/lib/handler/handler.js
@@ -27,7 +27,7 @@ export default function HandlerBaseClass(Private) {
       this.charts = [];
 
       this._attr = _.defaults(vis._attr || {}, {
-        'margin': {top: 10, right: 3, bottom: 5, left: 3}
+        'margin': { top: 10, right: 3, bottom: 5, left: 3 }
       });
 
       this.xAxis = opts.xAxis;
@@ -90,7 +90,7 @@ export default function HandlerBaseClass(Private) {
       if (!dataType) {
         throw new errors.NoResults();
       }
-    };
+    }
 
     /**
      * Renders the constructors that create the visualization,
@@ -134,7 +134,7 @@ export default function HandlerBaseClass(Private) {
         charts.push(chart);
         chart.render();
       });
-    };
+    }
 
     chartEventProxyToggle(method) {
       return function (event, chart) {
@@ -157,7 +157,7 @@ export default function HandlerBaseClass(Private) {
      */
     removeAll(el) {
       return d3.select(el).selectAll('*').remove();
-    };
+    }
 
     /**
      * Displays an error message in the DOM
@@ -188,7 +188,7 @@ export default function HandlerBaseClass(Private) {
       }
 
       return div.append('h4').text(message);
-    };
+    }
 
     /**
      * Destroys all the charts in the visualization
@@ -209,8 +209,8 @@ export default function HandlerBaseClass(Private) {
           chart.destroy();
         }
       });
-    };
+    }
   }
 
   return Handler;
-};
+}
diff --git a/src/ui/public/vislib/lib/handler/handler_types.js b/src/ui/public/vislib/lib/handler/handler_types.js
index 5473181a97f68..0f1e640077bcc 100644
--- a/src/ui/public/vislib/lib/handler/handler_types.js
+++ b/src/ui/public/vislib/lib/handler/handler_types.js
@@ -17,4 +17,4 @@ export default function HandlerTypeFactory(Private) {
     area: pointSeries.area,
     tile_map: Private(VislibLibHandlerTypesTileMapProvider)
   };
-};
+}
diff --git a/src/ui/public/vislib/lib/handler/types/pie.js b/src/ui/public/vislib/lib/handler/types/pie.js
index f119f21f60042..0509a0967020c 100644
--- a/src/ui/public/vislib/lib/handler/types/pie.js
+++ b/src/ui/public/vislib/lib/handler/types/pie.js
@@ -14,4 +14,4 @@ export default function PieHandler(Private) {
       chartTitle: new ChartTitle(vis.el)
     });
   };
-};
+}
diff --git a/src/ui/public/vislib/lib/handler/types/point_series.js b/src/ui/public/vislib/lib/handler/types/point_series.js
index 10bd2d651aaeb..87a794c3cea6a 100644
--- a/src/ui/public/vislib/lib/handler/types/point_series.js
+++ b/src/ui/public/vislib/lib/handler/types/point_series.js
@@ -96,4 +96,4 @@ export default function ColumnHandler(Private) {
       ]
     })
   };
-};
+}
diff --git a/src/ui/public/vislib/lib/handler/types/tile_map.js b/src/ui/public/vislib/lib/handler/types/tile_map.js
index c6ac20996a4fe..41cd585bb6d92 100644
--- a/src/ui/public/vislib/lib/handler/types/tile_map.js
+++ b/src/ui/public/vislib/lib/handler/types/tile_map.js
@@ -20,5 +20,5 @@ export default function MapHandlerProvider(Private) {
 
     return MapHandler;
   };
-};
+}
 
diff --git a/src/ui/public/vislib/lib/layout/layout.js b/src/ui/public/vislib/lib/layout/layout.js
index 3e71225a00d92..2a8d0b16b3dc4 100644
--- a/src/ui/public/vislib/lib/layout/layout.js
+++ b/src/ui/public/vislib/lib/layout/layout.js
@@ -39,7 +39,7 @@ export default function LayoutFactory(Private) {
     render() {
       this.removeAll(this.el);
       this.createLayout(this.layoutType);
-    };
+    }
 
     /**
      * Create the layout based on the json array provided
@@ -55,7 +55,7 @@ export default function LayoutFactory(Private) {
       return _.each(arr, function (obj) {
         self.layout(obj);
       });
-    };
+    }
 
     /**
      * Appends a DOM element based on the object keys
@@ -106,7 +106,7 @@ export default function LayoutFactory(Private) {
       }
 
       return childEl;
-    };
+    }
 
     /**
      * Appends a `type` of DOM element to `el` and gives it a class name attribute `className`
@@ -133,7 +133,7 @@ export default function LayoutFactory(Private) {
       return d3.select(el)
       .append(type)
       .attr('class', className);
-    };
+    }
 
     /**
      * Removes all DOM elements from DOM element
@@ -144,8 +144,8 @@ export default function LayoutFactory(Private) {
      */
     removeAll(el) {
       return d3.select(el).selectAll('*').remove();
-    };
+    }
   }
 
   return Layout;
-};
+}
diff --git a/src/ui/public/vislib/lib/layout/layout_types.js b/src/ui/public/vislib/lib/layout/layout_types.js
index b06acdc4c7520..d65be58e8eaae 100644
--- a/src/ui/public/vislib/lib/layout/layout_types.js
+++ b/src/ui/public/vislib/lib/layout/layout_types.js
@@ -19,4 +19,4 @@ export default function LayoutTypeFactory(Private) {
     pie: Private(VislibLibLayoutTypesPieLayoutProvider),
     tile_map: Private(VislibLibLayoutTypesMapLayoutProvider)
   };
-};
+}
diff --git a/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js
index f32fc7a3ce364..4e66dbdfdce70 100644
--- a/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_split.js
@@ -1,50 +1,49 @@
 import d3 from 'd3';
-define(function () {
-  return function ChartSplitFactory() {
 
-    /*
-     * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
-     * For example, if the data has rows, it returns the same number of
-     * `.chart` elements as row objects.
-     */
-    return function split(selection) {
-      selection.each(function (data) {
-        const div = d3.select(this)
-        .attr('class', function () {
-          if (data.rows) {
-            return 'chart-wrapper-row';
-          } else if (data.columns) {
-            return 'chart-wrapper-column';
-          } else {
-            return 'chart-wrapper';
-          }
-        });
-        let divClass;
+export default function ChartSplitFactory() {
 
-        const charts = div.selectAll('charts')
-        .append('div')
-        .data(function (d) {
-          if (d.rows) {
-            divClass = 'chart-row';
-            return d.rows;
-          } else if (d.columns) {
-            divClass = 'chart-column';
-            return d.columns;
-          } else {
-            divClass = 'chart';
-            return [d];
-          }
-        })
-        .enter()
-          .append('div')
-          .attr('class', function () {
-            return divClass;
-          });
-
-        if (!data.series) {
-          charts.call(split);
+  /*
+   * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
+   * For example, if the data has rows, it returns the same number of
+   * `.chart` elements as row objects.
+   */
+  return function split(selection) {
+    selection.each(function (data) {
+      const div = d3.select(this)
+      .attr('class', function () {
+        if (data.rows) {
+          return 'chart-wrapper-row';
+        } else if (data.columns) {
+          return 'chart-wrapper-column';
+        } else {
+          return 'chart-wrapper';
         }
       });
-    };
+      let divClass;
+
+      const charts = div.selectAll('charts')
+      .append('div')
+      .data(function (d) {
+        if (d.rows) {
+          divClass = 'chart-row';
+          return d.rows;
+        } else if (d.columns) {
+          divClass = 'chart-column';
+          return d.columns;
+        } else {
+          divClass = 'chart';
+          return [d];
+        }
+      })
+      .enter()
+        .append('div')
+        .attr('class', function () {
+          return divClass;
+        });
+
+      if (!data.series) {
+        charts.call(split);
+      }
+    });
   };
-});
+}
diff --git a/src/ui/public/vislib/lib/layout/splits/column_chart/chart_title_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_title_split.js
index eaeb1947ef8ef..9a95fd4188993 100644
--- a/src/ui/public/vislib/lib/layout/splits/column_chart/chart_title_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/column_chart/chart_title_split.js
@@ -1,41 +1,39 @@
 import d3 from 'd3';
 import $ from 'jquery';
 
-define(function () {
-  return function ChartTitleSplitFactory() {
+export default function ChartTitleSplitFactory() {
 
-    /*
-     * Adds div DOM elements to either the `.y-axis-chart-title` element or the
-     * `.x-axis-chart-title` element based on the data layout.
-     * For example, if the data has rows, it returns the same number of
-     * `.chart-title` elements as row objects.
-     * if not data.rows or data.columns, return no chart titles
-     */
-    return function (selection) {
-      selection.each(function (data) {
-        const div = d3.select(this);
-        const parent = $(this).parents('.vis-wrapper');
+  /*
+   * Adds div DOM elements to either the `.y-axis-chart-title` element or the
+   * `.x-axis-chart-title` element based on the data layout.
+   * For example, if the data has rows, it returns the same number of
+   * `.chart-title` elements as row objects.
+   * if not data.rows or data.columns, return no chart titles
+   */
+  return function (selection) {
+    selection.each(function (data) {
+      const div = d3.select(this);
+      const parent = $(this).parents('.vis-wrapper');
 
-        if (!data.series) {
-          div.selectAll('.chart-title')
-          .data(function (d) {
-            return d.rows ? d.rows : d.columns;
-          })
-          .enter()
-            .append('div')
-            .attr('class', 'chart-title');
+      if (!data.series) {
+        div.selectAll('.chart-title')
+        .data(function (d) {
+          return d.rows ? d.rows : d.columns;
+        })
+        .enter()
+          .append('div')
+          .attr('class', 'chart-title');
 
-          if (data.rows) {
-            parent.find('.x-axis-chart-title').remove();
-          } else {
-            parent.find('.y-axis-chart-title').remove();
-          }
-
-          return div;
+        if (data.rows) {
+          parent.find('.x-axis-chart-title').remove();
+        } else {
+          parent.find('.y-axis-chart-title').remove();
         }
 
-        return d3.select(this).remove();
-      });
-    };
+        return div;
+      }
+
+      return d3.select(this).remove();
+    });
   };
-});
+}
diff --git a/src/ui/public/vislib/lib/layout/splits/column_chart/x_axis_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/x_axis_split.js
index 2d99d4bbd25bc..c8fde472bb41f 100644
--- a/src/ui/public/vislib/lib/layout/splits/column_chart/x_axis_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/column_chart/x_axis_split.js
@@ -1,26 +1,25 @@
 import d3 from 'd3';
-define(function () {
-  return function XAxisSplitFactory() {
 
-    /*
-     * Adds div DOM elements to the `.x-axis-div-wrapper` element based on the data layout.
-     * For example, if the data has rows, it returns the same number of
-     * `.x-axis-div` elements as row objects.
-     */
+export default function XAxisSplitFactory() {
 
-    return function (selection) {
-      selection.each(function () {
-        const div = d3.select(this);
+  /*
+   * Adds div DOM elements to the `.x-axis-div-wrapper` element based on the data layout.
+   * For example, if the data has rows, it returns the same number of
+   * `.x-axis-div` elements as row objects.
+   */
 
-        div.selectAll('.x-axis-div')
+  return function (selection) {
+    selection.each(function () {
+      const div = d3.select(this);
+
+      div.selectAll('.x-axis-div')
+      .append('div')
+      .data(function (d) {
+        return d.columns ? d.columns : [d];
+      })
+      .enter()
         .append('div')
-        .data(function (d) {
-          return d.columns ? d.columns : [d];
-        })
-        .enter()
-          .append('div')
-          .attr('class', 'x-axis-div');
-      });
-    };
+        .attr('class', 'x-axis-div');
+    });
   };
-});
+}
diff --git a/src/ui/public/vislib/lib/layout/splits/column_chart/y_axis_split.js b/src/ui/public/vislib/lib/layout/splits/column_chart/y_axis_split.js
index 93d8188073a18..14da26ecd8d48 100644
--- a/src/ui/public/vislib/lib/layout/splits/column_chart/y_axis_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/column_chart/y_axis_split.js
@@ -1,48 +1,47 @@
 import d3 from 'd3';
-define(function () {
-  return function YAxisSplitFactory() {
 
-    /*
-     * Adds div DOM elements to the `.y-axis-div-wrapper` element based on the data layout.
-     * For example, if the data has rows, it returns the same number of
-     * `.y-axis-div` elements as row objects.
-     */
+export default function YAxisSplitFactory() {
 
-    // render and get bounding box width
-    return function (selection, parent, opts) {
-      const yAxis = opts && opts.yAxis;
+  /*
+   * Adds div DOM elements to the `.y-axis-div-wrapper` element based on the data layout.
+   * For example, if the data has rows, it returns the same number of
+   * `.y-axis-div` elements as row objects.
+   */
 
-      selection.each(function () {
-        const div = d3.select(this);
+  // render and get bounding box width
+  return function (selection, parent, opts) {
+    const yAxis = opts && opts.yAxis;
 
-        div.call(setWidth, yAxis);
+    selection.each(function () {
+      const div = d3.select(this);
 
-        div.selectAll('.y-axis-div')
+      div.call(setWidth, yAxis);
+
+      div.selectAll('.y-axis-div')
+      .append('div')
+      .data(function (d) {
+        return d.rows ? d.rows : [d];
+      })
+      .enter()
         .append('div')
-        .data(function (d) {
-          return d.rows ? d.rows : [d];
-        })
-        .enter()
-          .append('div')
-          .attr('class', 'y-axis-div');
-      });
-    };
-
-    function setWidth(el, yAxis) {
-      if (!yAxis) return;
-
-      const padding = 5;
-      const height = parseInt(el.node().clientHeight, 10);
-
-      // render svg and get the width of the bounding box
-      const svg = d3.select('body')
-      .append('svg')
-      .attr('style', 'position:absolute; top:-10000; left:-10000');
-      const width = svg.append('g')
-      .call(yAxis.getYAxis(height)).node().getBBox().width + padding;
-      svg.remove();
-
-      el.style('width', (width + padding) + 'px');
-    }
+        .attr('class', 'y-axis-div');
+    });
   };
-});
+
+  function setWidth(el, yAxis) {
+    if (!yAxis) return;
+
+    const padding = 5;
+    const height = parseInt(el.node().clientHeight, 10);
+
+    // render svg and get the width of the bounding box
+    const svg = d3.select('body')
+    .append('svg')
+    .attr('style', 'position:absolute; top:-10000; left:-10000');
+    const width = svg.append('g')
+    .call(yAxis.getYAxis(height)).node().getBBox().width + padding;
+    svg.remove();
+
+    el.style('width', (width + padding) + 'px');
+  }
+}
diff --git a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js
index af58177503590..533bf2c26d81c 100644
--- a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_split.js
@@ -1,51 +1,50 @@
 import d3 from 'd3';
-define(function () {
-  return function ChartSplitFactory() {
 
-    /*
-     * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
-     * For example, if the data has rows, it returns the same number of
-     * `.chart` elements as row objects.
-     */
+export default function ChartSplitFactory() {
 
-    return function split(selection) {
-      selection.each(function (data) {
-        const div = d3.select(this)
-        .attr('class', function () {
-          if (data.rows) {
-            return 'chart-wrapper-row';
-          } else if (data.columns) {
-            return 'chart-wrapper-column';
-          } else {
-            return 'chart-wrapper';
-          }
-        });
-        let divClass;
+  /*
+   * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
+   * For example, if the data has rows, it returns the same number of
+   * `.chart` elements as row objects.
+   */
 
-        const charts = div.selectAll('charts')
-        .append('div')
-        .data(function (d) {
-          if (d.rows) {
-            divClass = 'chart-row';
-            return d.rows;
-          } else if (d.columns) {
-            divClass = 'chart-column';
-            return d.columns;
-          } else {
-            divClass = 'chart';
-            return [d];
-          }
-        })
-        .enter()
-          .append('div')
-          .attr('class', function () {
-            return divClass;
-          });
-
-        if (!data.slices) {
-          charts.call(split);
+  return function split(selection) {
+    selection.each(function (data) {
+      const div = d3.select(this)
+      .attr('class', function () {
+        if (data.rows) {
+          return 'chart-wrapper-row';
+        } else if (data.columns) {
+          return 'chart-wrapper-column';
+        } else {
+          return 'chart-wrapper';
         }
       });
-    };
+      let divClass;
+
+      const charts = div.selectAll('charts')
+      .append('div')
+      .data(function (d) {
+        if (d.rows) {
+          divClass = 'chart-row';
+          return d.rows;
+        } else if (d.columns) {
+          divClass = 'chart-column';
+          return d.columns;
+        } else {
+          divClass = 'chart';
+          return [d];
+        }
+      })
+      .enter()
+        .append('div')
+        .attr('class', function () {
+          return divClass;
+        });
+
+      if (!data.slices) {
+        charts.call(split);
+      }
+    });
   };
-});
+}
diff --git a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js
index d9c70f5ddff44..4ac5f233aa665 100644
--- a/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js
@@ -1,40 +1,39 @@
 import d3 from 'd3';
-define(function () {
-  return function ChartTitleSplitFactory() {
 
-    /*
-     * Adds div DOM elements to either the `.y-axis-chart-title` element or the
-     * `.x-axis-chart-title` element based on the data layout.
-     * For example, if the data has rows, it returns the same number of
-     * `.chart-title` elements as row objects.
-     * if not data.rows or data.columns, return no chart titles
-     */
+export default function ChartTitleSplitFactory() {
 
-    return function (selection, parent) {
-      selection.each(function (data) {
-        const div = d3.select(this);
+  /*
+   * Adds div DOM elements to either the `.y-axis-chart-title` element or the
+   * `.x-axis-chart-title` element based on the data layout.
+   * For example, if the data has rows, it returns the same number of
+   * `.chart-title` elements as row objects.
+   * if not data.rows or data.columns, return no chart titles
+   */
 
-        if (!data.slices) {
-          div.selectAll('.chart-title')
-          .append('div')
-          .data(function (d) {
-            return d.rows ? d.rows : d.columns;
-          })
-          .enter()
-            .append('div')
-            .attr('class', 'chart-title');
+  return function (selection, parent) {
+    selection.each(function (data) {
+      const div = d3.select(this);
 
-          if (data.rows) {
-            d3.select(parent).select('.x-axis-chart-title').remove();
-          } else {
-            d3.select(parent).select('.y-axis-chart-title').remove();
-          }
+      if (!data.slices) {
+        div.selectAll('.chart-title')
+        .append('div')
+        .data(function (d) {
+          return d.rows ? d.rows : d.columns;
+        })
+        .enter()
+          .append('div')
+          .attr('class', 'chart-title');
 
-          return div;
+        if (data.rows) {
+          d3.select(parent).select('.x-axis-chart-title').remove();
+        } else {
+          d3.select(parent).select('.y-axis-chart-title').remove();
         }
 
-        return d3.select(this).remove();
-      });
-    };
+        return div;
+      }
+
+      return d3.select(this).remove();
+    });
   };
-});
+}
diff --git a/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js b/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js
index 710c77083927a..47b4e62a6060c 100644
--- a/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js
+++ b/src/ui/public/vislib/lib/layout/splits/tile_map/map_split.js
@@ -1,52 +1,51 @@
 import d3 from 'd3';
-define(function () {
-  return function ChartSplitFactory() {
 
-    /*
-     * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
-     * For example, if the data has rows, it returns the same number of
-     * `.chart` elements as row objects.
-     */
-    return function split(selection) {
-      selection.each(function (data) {
-        const div = d3.select(this)
-          .attr('class', function () {
-            // Determine the parent class
-            if (data.rows) {
-              return 'chart-wrapper-row';
-            } else if (data.columns) {
-              return 'chart-wrapper-column';
-            } else {
-              return 'chart-wrapper';
-            }
-          });
-        let divClass;
+export default function ChartSplitFactory() {
 
-        const charts = div.selectAll('charts')
-          .append('div')
-          .data(function (d) {
-            // Determine the child class
-            if (d.rows) {
-              divClass = 'chart-row';
-              return d.rows;
-            } else if (d.columns) {
-              divClass = 'chart-column';
-              return d.columns;
-            } else {
-              divClass = 'chart';
-              return [d];
-            }
-          })
-          .enter()
-          .append('div')
-          .attr('class', function () {
-            return divClass;
-          });
+  /*
+   * Adds div DOM elements to the `.chart-wrapper` element based on the data layout.
+   * For example, if the data has rows, it returns the same number of
+   * `.chart` elements as row objects.
+   */
+  return function split(selection) {
+    selection.each(function (data) {
+      const div = d3.select(this)
+        .attr('class', function () {
+          // Determine the parent class
+          if (data.rows) {
+            return 'chart-wrapper-row';
+          } else if (data.columns) {
+            return 'chart-wrapper-column';
+          } else {
+            return 'chart-wrapper';
+          }
+        });
+      let divClass;
 
-        if (!data.geoJson) {
-          charts.call(split);
-        }
-      });
-    };
+      const charts = div.selectAll('charts')
+        .append('div')
+        .data(function (d) {
+          // Determine the child class
+          if (d.rows) {
+            divClass = 'chart-row';
+            return d.rows;
+          } else if (d.columns) {
+            divClass = 'chart-column';
+            return d.columns;
+          } else {
+            divClass = 'chart';
+            return [d];
+          }
+        })
+        .enter()
+        .append('div')
+        .attr('class', function () {
+          return divClass;
+        });
+
+      if (!data.geoJson) {
+        charts.call(split);
+      }
+    });
   };
-});
+}
diff --git a/src/ui/public/vislib/lib/layout/types/column_layout.js b/src/ui/public/vislib/lib/layout/types/column_layout.js
index b4bd968d2ae9c..2159635181f32 100644
--- a/src/ui/public/vislib/lib/layout/types/column_layout.js
+++ b/src/ui/public/vislib/lib/layout/types/column_layout.js
@@ -107,4 +107,4 @@ export default function ColumnLayoutFactory(Private) {
       }
     ];
   };
-};
+}
diff --git a/src/ui/public/vislib/lib/layout/types/map_layout.js b/src/ui/public/vislib/lib/layout/types/map_layout.js
index 64106cdfe1350..8b556950a7313 100644
--- a/src/ui/public/vislib/lib/layout/types/map_layout.js
+++ b/src/ui/public/vislib/lib/layout/types/map_layout.js
@@ -46,4 +46,4 @@ export default function ColumnLayoutFactory(Private) {
       }
     ];
   };
-};
+}
diff --git a/src/ui/public/vislib/lib/layout/types/pie_layout.js b/src/ui/public/vislib/lib/layout/types/pie_layout.js
index ea7bedf61405e..f61ae3c770216 100644
--- a/src/ui/public/vislib/lib/layout/types/pie_layout.js
+++ b/src/ui/public/vislib/lib/layout/types/pie_layout.js
@@ -58,4 +58,4 @@ export default function ColumnLayoutFactory(Private) {
       }
     ];
   };
-};
+}
diff --git a/src/ui/public/vislib/lib/resize_checker.js b/src/ui/public/vislib/lib/resize_checker.js
index 9a86ddc1642ea..69fcf343591a9 100644
--- a/src/ui/public/vislib/lib/resize_checker.js
+++ b/src/ui/public/vislib/lib/resize_checker.js
@@ -200,4 +200,4 @@ export default function ResizeCheckerFactory(Private, Notifier) {
   };
 
   return ResizeChecker;
-};
+}
diff --git a/src/ui/public/vislib/lib/x_axis.js b/src/ui/public/vislib/lib/x_axis.js
index b7bdcbc0dc5bd..d741ec83a1cd4 100644
--- a/src/ui/public/vislib/lib/x_axis.js
+++ b/src/ui/public/vislib/lib/x_axis.js
@@ -34,7 +34,7 @@ export default function XAxisFactory(Private) {
      */
     render() {
       d3.select(this.el).selectAll('.x-axis-div').call(this.draw());
-    };
+    }
 
     /**
      * Returns d3 x axis scale function.
@@ -50,7 +50,7 @@ export default function XAxisFactory(Private) {
         return d3.time.scale.utc();
       }
       return d3.scale.ordinal();
-    };
+    }
 
     /**
      * Add domain to the x axis scale.
@@ -68,7 +68,7 @@ export default function XAxisFactory(Private) {
         return this.getTimeDomain(scale, this.xValues);
       }
       return this.getOrdinalDomain(scale, this.xValues);
-    };
+    }
 
     /**
      * Returns D3 time domain
@@ -80,15 +80,15 @@ export default function XAxisFactory(Private) {
      */
     getTimeDomain(scale, data) {
       return scale.domain([this.minExtent(data), this.maxExtent(data)]);
-    };
+    }
 
     minExtent(data) {
       return this._calculateExtent(data || this.xValues, 'min');
-    };
+    }
 
     maxExtent(data) {
       return this._calculateExtent(data || this.xValues, 'max');
-    };
+    }
 
     /**
      *
@@ -110,7 +110,7 @@ export default function XAxisFactory(Private) {
         if (!isNaN(v)) opts.push(v);
         return opts;
       }, []));
-    };
+    }
 
     /**
      * Add the interval to a point on the x axis,
@@ -121,7 +121,7 @@ export default function XAxisFactory(Private) {
      */
     addInterval(x) {
       return this.modByInterval(x, +1);
-    };
+    }
 
     /**
      * Subtract the interval to a point on the x axis,
@@ -132,7 +132,7 @@ export default function XAxisFactory(Private) {
      */
     subtractInterval(x) {
       return this.modByInterval(x, -1);
-    };
+    }
 
     /**
      * Modify the x value by n intervals, properly
@@ -160,7 +160,7 @@ export default function XAxisFactory(Private) {
       });
 
       return y.valueOf();
-    };
+    }
 
     /**
      * Return a nominal(d3 ordinal) domain
@@ -172,7 +172,7 @@ export default function XAxisFactory(Private) {
      */
     getOrdinalDomain(scale, xValues) {
       return scale.domain(xValues);
-    };
+    }
 
     /**
      * Return the range for the x axis scale
@@ -190,7 +190,7 @@ export default function XAxisFactory(Private) {
         return domain.range([0, width]);
       }
       return domain.rangeBands([0, width], 0.1);
-    };
+    }
 
     /**
      * Return the x axis scale
@@ -203,7 +203,7 @@ export default function XAxisFactory(Private) {
       const domain = this.getDomain(this.getScale());
 
       return this.getRange(domain, width);
-    };
+    }
 
     /**
      * Creates d3 xAxis function
@@ -223,7 +223,7 @@ export default function XAxisFactory(Private) {
       .ticks(10)
       .tickFormat(this.xAxisFormatter)
       .orient('bottom');
-    };
+    }
 
     /**
      * Renders the x axis
@@ -263,7 +263,7 @@ export default function XAxisFactory(Private) {
 
         selection.call(self.filterOrRotate());
       };
-    };
+    }
 
     /**
      * Returns a function that evaluates scale type and
@@ -292,7 +292,7 @@ export default function XAxisFactory(Private) {
         selection.call(self.fitTitles());
 
       };
-    };
+    }
 
     /**
      * Rotate the axis tick labels within selection
@@ -344,7 +344,7 @@ export default function XAxisFactory(Private) {
           .attr('height', self._attr.xAxisLabelHt);
         }
       };
-    };
+    }
 
     /**
      * Returns a string that is truncated to fit size
@@ -371,7 +371,7 @@ export default function XAxisFactory(Private) {
         str = str.substr(0, endChar) + '...';
       }
       return str;
-    };
+    }
 
     /**
      * Filter out text labels by width and position on axis
@@ -410,7 +410,7 @@ export default function XAxisFactory(Private) {
           }
         });
       };
-    };
+    }
 
     /**
      * Returns a function that adjusts axis titles and
@@ -426,7 +426,6 @@ export default function XAxisFactory(Private) {
       const visEls = $('.vis-wrapper');
       let xAxisChartTitle;
       let yAxisChartTitle;
-      let text;
       let titles;
 
       return function () {
@@ -434,55 +433,26 @@ export default function XAxisFactory(Private) {
         visEls.each(function () {
           const visEl = d3.select(this);
           const $visEl = $(this);
-          const xAxisTitle = $visEl.find('.x-axis-title');
-          const yAxisTitle = $visEl.find('.y-axis-title');
-          let titleWidth = xAxisTitle.width();
-          let titleHeight = yAxisTitle.height();
-
-          text = visEl.select('.x-axis-title')
-          .select('svg')
-          .attr('width', titleWidth)
-          .select('text')
-          .attr('transform', 'translate(' + (titleWidth / 2) + ',11)');
-
-          text = visEl.select('.y-axis-title')
-          .select('svg')
-          .attr('height', titleHeight)
-          .select('text')
-          .attr('transform', 'translate(11,' + (titleHeight / 2) + ')rotate(-90)');
 
           if ($visEl.find('.x-axis-chart-title').length) {
             xAxisChartTitle = $visEl.find('.x-axis-chart-title');
-            titleWidth = xAxisChartTitle.find('.chart-title').width();
+            xAxisChartTitle.find('.chart-title').width();
 
             titles = visEl.select('.x-axis-chart-title').selectAll('.chart-title');
-            titles.each(function () {
-              text = d3.select(this)
-              .select('svg')
-              .attr('width', titleWidth)
-              .select('text')
-              .attr('transform', 'translate(' + (titleWidth / 2) + ',11)');
-            });
+            titles.each(function () {});
           }
 
           if ($visEl.find('.y-axis-chart-title').length) {
             yAxisChartTitle = $visEl.find('.y-axis-chart-title');
-            titleHeight = yAxisChartTitle.find('.chart-title').height();
+            yAxisChartTitle.find('.chart-title').height();
 
             titles = visEl.select('.y-axis-chart-title').selectAll('.chart-title');
-            titles.each(function () {
-              text = d3.select(this)
-              .select('svg')
-              .attr('height', titleHeight)
-              .select('text')
-              .attr('transform', 'translate(11,' + (titleHeight / 2) + ')rotate(-90)');
-            });
+            titles.each(function () {});
           }
-
         });
 
       };
-    };
+    }
 
     /**
      * Appends div to make .y-axis-spacer-block
@@ -506,8 +476,8 @@ export default function XAxisFactory(Private) {
         visEl.select('.inner-spacer-block').style('height', xAxisHt);
       });
 
-    };
+    }
   }
 
   return XAxis;
-};
+}
diff --git a/src/ui/public/vislib/lib/y_axis.js b/src/ui/public/vislib/lib/y_axis.js
index f5d7d55ff0e77..200a3c698dde9 100644
--- a/src/ui/public/vislib/lib/y_axis.js
+++ b/src/ui/public/vislib/lib/y_axis.js
@@ -32,19 +32,19 @@ export default function YAxisFactory(Private) {
      */
     render() {
       d3.select(this.el).selectAll('.y-axis-div').call(this.draw());
-    };
+    }
 
     _isPercentage() {
       return (this._attr.mode === 'percentage');
-    };
+    }
 
     _isUserDefined() {
       return (this._attr.setYExtents);
-    };
+    }
 
     _isYExtents() {
       return (this._attr.defaultYExtents);
-    };
+    }
 
     _validateUserExtents(domain) {
       const self = this;
@@ -56,7 +56,7 @@ export default function YAxisFactory(Private) {
         if (self._isPercentage() && self._attr.setYExtents) return val / 100;
         return val;
       });
-    };
+    }
 
     _getExtents(domain) {
       const min = domain[0];
@@ -67,15 +67,15 @@ export default function YAxisFactory(Private) {
       if (this._attr.scale === 'log') return this._logDomain(min, max); // Negative values cannot be displayed with a log scale.
       if (!this._isYExtents() && !this._isUserDefined()) return [Math.min(0, min), Math.max(0, max)];
       return domain;
-    };
+    }
 
     _throwCustomError(message) {
       throw new Error(message);
-    };
+    }
 
     _throwLogScaleValuesError() {
       throw new errors.InvalidLogScaleValues();
-    };
+    }
 
     /**
      * Returns the appropriate D3 scale
@@ -90,7 +90,7 @@ export default function YAxisFactory(Private) {
       if (typeof d3.scale[fnName] !== 'function') return this._throwCustomError('YAxis.getScaleType: ' + fnName + ' is not a function');
 
       return d3.scale[fnName]();
-    };
+    }
 
     /**
      * Return the domain for log scale, i.e. the extent of the log scale.
@@ -103,7 +103,7 @@ export default function YAxisFactory(Private) {
     _logDomain(min, max) {
       if (min < 0 || max < 0) return this._throwLogScaleValuesError();
       return [1, max];
-    };
+    }
 
     /**
      * Creates the d3 y scale function
@@ -124,22 +124,22 @@ export default function YAxisFactory(Private) {
       // Prevents bars from going off the chart when the y extents are within the domain range
       if (this._attr.type === 'histogram') this.yScale.clamp(true);
       return this.yScale;
-    };
+    }
 
     getScaleType() {
       return this._attr.scale;
-    };
+    }
 
     tickFormat() {
       const isPercentage = this._attr.mode === 'percentage';
       if (isPercentage) return d3.format('%');
       if (this.yAxisFormatter) return this.yAxisFormatter;
       return d3.format('n');
-    };
+    }
 
     _validateYScale(yScale) {
       if (!yScale || _.isNaN(yScale)) throw new Error('yScale is ' + yScale);
-    };
+    }
 
     /**
      * Creates the d3 y axis function
@@ -160,7 +160,7 @@ export default function YAxisFactory(Private) {
       .orient('left');
 
       return this.yAxis;
-    };
+    }
 
     /**
      * Create a tick scale for the y axis that modifies the number of ticks
@@ -179,7 +179,7 @@ export default function YAxisFactory(Private) {
       .range([0, 3, 11]);
 
       return Math.ceil(yTickScale(height));
-    };
+    }
 
     /**
      * Renders the y axis to the visualization
@@ -229,8 +229,8 @@ export default function YAxisFactory(Private) {
           }
         });
       };
-    };
+    }
   }
 
   return YAxis;
-};
+}
diff --git a/src/ui/public/vislib/vis.js b/src/ui/public/vislib/vis.js
index 54d02072c7d5a..019e655ea0b1f 100644
--- a/src/ui/public/vislib/vis.js
+++ b/src/ui/public/vislib/vis.js
@@ -66,7 +66,7 @@ export default function VisFactory(Private) {
 
       this.handler = handlerTypes[chartType](this) || handlerTypes.column(this);
       this._runWithoutResizeChecker('render');
-    };
+    }
 
     /**
      * Resizes the visualization
@@ -84,7 +84,7 @@ export default function VisFactory(Private) {
       } else {
         this.render(this.data, this.uiState);
       }
-    };
+    }
 
     _runWithoutResizeChecker(method) {
       this.resizeChecker.stopSchedule();
@@ -106,7 +106,7 @@ export default function VisFactory(Private) {
         }
 
       }
-    };
+    }
 
     /**
      * Destroys the visualization
@@ -125,7 +125,7 @@ export default function VisFactory(Private) {
       if (this.handler) this._runOnHandler('destroy');
 
       selection.remove();
-    };
+    }
 
     /**
      * Sets attributes on the visualization
@@ -137,7 +137,7 @@ export default function VisFactory(Private) {
     set(name, val) {
       this._attr[name] = val;
       this.render(this.data, this.uiState);
-    };
+    }
 
     /**
      * Gets attributes from the visualization
@@ -148,7 +148,7 @@ export default function VisFactory(Private) {
      */
     get(name) {
       return this._attr[name];
-    };
+    }
 
     /**
      * Turns on event listeners.
@@ -167,7 +167,7 @@ export default function VisFactory(Private) {
       if (first && added && this.handler) this.handler.enable(event);
 
       return ret;
-    };
+    }
 
     /**
      * Turns off event listeners.
@@ -184,8 +184,8 @@ export default function VisFactory(Private) {
       // Once all listeners are removed, disable the events in the handler
       if (last && removed && this.handler) this.handler.disable(event);
       return ret;
-    };
+    }
   }
 
   return Vis;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/_chart.js b/src/ui/public/vislib/visualizations/_chart.js
index 7f9248b08c3fd..7793aea9e976d 100644
--- a/src/ui/public/vislib/visualizations/_chart.js
+++ b/src/ui/public/vislib/visualizations/_chart.js
@@ -50,7 +50,7 @@ export default function ChartBaseClass(Private) {
 
       selection.selectAll('*').remove();
       selection.call(this.draw());
-    };
+    }
 
     /**
      * Append the data label to the element
@@ -72,7 +72,7 @@ export default function ChartBaseClass(Private) {
         const label = resolveLabel(datum);
         if (label != null) dataLabel(this, label);
       });
-    };
+    }
 
     /**
      * Removes all DOM elements from the root element
@@ -86,8 +86,8 @@ export default function ChartBaseClass(Private) {
         tooltip.destroy();
       });
       selection.remove();
-    };
+    }
   }
 
   return Chart;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/_map.js b/src/ui/public/vislib/visualizations/_map.js
index a015ff90b4704..a0b5c66fab71f 100644
--- a/src/ui/public/vislib/visualizations/_map.js
+++ b/src/ui/public/vislib/visualizations/_map.js
@@ -72,7 +72,7 @@ export default function MapFactory(Private, tilemap, $sanitize) {
       if (this._boundingControl) return;
 
       const self = this;
-      const drawOptions = {draw: {}};
+      const drawOptions = { draw: {} };
 
       _.each(['polyline', 'polygon', 'circle', 'marker', 'rectangle'], function (drawShape) {
         if (self._events && !self._events.listenerCount(drawShape)) {
@@ -89,7 +89,7 @@ export default function MapFactory(Private, tilemap, $sanitize) {
 
       this._boundingControl = new L.Control.Draw(drawOptions);
       this.map.addControl(this._boundingControl);
-    };
+    }
 
     addFitControl() {
       if (this._fitControl) return;
@@ -118,7 +118,7 @@ export default function MapFactory(Private, tilemap, $sanitize) {
 
       this._fitControl = new FitControl();
       this.map.addControl(this._fitControl);
-    };
+    }
 
     /**
      * Adds label div to each map when data is split
@@ -143,7 +143,7 @@ export default function MapFactory(Private, tilemap, $sanitize) {
 
       // label.addTo(this.map);
       this.map.addControl(label);
-    };
+    }
 
     /**
      * remove css class for desat filters on map tiles
@@ -155,13 +155,13 @@ export default function MapFactory(Private, tilemap, $sanitize) {
       if (!this._attr.isDesaturated) {
         $('img.leaflet-tile-loaded').addClass('filters-off');
       }
-    };
+    }
 
     updateSize() {
       this.map.invalidateSize({
         debounceMoveend: true
       });
-    };
+    }
 
     destroy() {
       if (this._label) this._label.removeFrom(this.map);
@@ -170,7 +170,7 @@ export default function MapFactory(Private, tilemap, $sanitize) {
       if (this._markers) this._markers.destroy();
       this.map.remove();
       this.map = undefined;
-    };
+    }
 
     /**
      * Switch type of data overlay for map:
@@ -191,7 +191,7 @@ export default function MapFactory(Private, tilemap, $sanitize) {
       if (this._geoJson.features.length > 1) {
         this._markers.addLegend();
       }
-    };
+    }
 
     /**
      * Create the marker instance using the given options
@@ -203,7 +203,7 @@ export default function MapFactory(Private, tilemap, $sanitize) {
     _createMarkers(options) {
       const MarkerType = markerTypes[this._markerType];
       return new MarkerType(this.map, this._geoJson, options);
-    };
+    }
 
     _attachEvents() {
       const self = this;
@@ -298,7 +298,7 @@ export default function MapFactory(Private, tilemap, $sanitize) {
           zoom: self._mapZoom,
         });
       });
-    };
+    }
 
     _createMap(mapOptions) {
       if (this.map) this.destroy();
@@ -322,7 +322,7 @@ export default function MapFactory(Private, tilemap, $sanitize) {
       this.map = L.map(this._container, mapOptions);
       this._attachEvents();
       this._addMarkers();
-    };
+    }
 
     /**
      * zoom map to fit all features in featureLayer
@@ -333,7 +333,7 @@ export default function MapFactory(Private, tilemap, $sanitize) {
      */
     _fitBounds() {
       this.map.fitBounds(this._getDataRectangles());
-    };
+    }
 
     /**
      * Get the Rectangles representing the geohash grid
@@ -343,8 +343,8 @@ export default function MapFactory(Private, tilemap, $sanitize) {
     _getDataRectangles() {
       if (!this._geoJson) return [];
       return _.pluck(this._geoJson.features, 'properties.rectangle');
-    };
+    }
   }
 
   return TileMapMap;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/_point_series_chart.js b/src/ui/public/vislib/visualizations/_point_series_chart.js
index 7cad5cda2dadc..f068673cc46fb 100644
--- a/src/ui/public/vislib/visualizations/_point_series_chart.js
+++ b/src/ui/public/vislib/visualizations/_point_series_chart.js
@@ -37,7 +37,7 @@ export default function PointSeriesChartProvider(Private) {
           currentStackOffsets[0] += y;
         }
       };
-    };
+    }
 
     /**
      * Stacks chart data values
@@ -64,7 +64,7 @@ export default function PointSeriesChartProvider(Private) {
           };
         });
       }));
-    };
+    }
 
 
     validateDataCompliesWithScalingMethod(data) {
@@ -76,7 +76,7 @@ export default function PointSeriesChartProvider(Private) {
       if (this._attr.scale === 'log' && invalidLogScale) {
         throw new errors.InvalidLogScaleValues();
       }
-    };
+    }
 
     /**
      * Creates rects to show buckets outside of the ordered.min and max, returns rects
@@ -169,8 +169,8 @@ export default function PointSeriesChartProvider(Private) {
         return callPlay(d3.event).touchdown;
       };
       endzoneTT.render()(svg);
-    };
+    }
   }
 
   return PointSeriesChart;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/area_chart.js b/src/ui/public/vislib/visualizations/area_chart.js
index 04528482c3776..65f484f51b70b 100644
--- a/src/ui/public/vislib/visualizations/area_chart.js
+++ b/src/ui/public/vislib/visualizations/area_chart.js
@@ -130,7 +130,7 @@ export default function AreaChartFactory(Private) {
       });
 
       return path;
-    };
+    }
 
     /**
      * Adds Events to SVG circles
@@ -153,7 +153,7 @@ export default function AreaChartFactory(Private) {
       }
 
       return attachedEvents;
-    };
+    }
 
     /**
      * Adds SVG circles to area chart
@@ -225,7 +225,7 @@ export default function AreaChartFactory(Private) {
       }
 
       return circles;
-    };
+    }
 
     /**
      * Adds SVG clipPath
@@ -252,7 +252,7 @@ export default function AreaChartFactory(Private) {
       .attr('y', startY)
       .attr('width', width)
       .attr('height', height);
-    };
+    }
 
     checkIfEnoughData() {
       const series = this.chartData.series;
@@ -266,14 +266,14 @@ export default function AreaChartFactory(Private) {
       if (notEnoughData) {
         throw new errors.NotEnoughData(message);
       }
-    };
+    }
 
     validateWiggleSelection() {
       const isWiggle = this._attr.mode === 'wiggle';
       const ordered = this.handler.data.get('ordered');
 
       if (isWiggle && !ordered) throw new errors.InvalidWiggleSelection();
-    };
+    }
 
     /**
      * Renders d3 visualization
@@ -372,8 +372,8 @@ export default function AreaChartFactory(Private) {
           return svg;
         });
       };
-    };
+    }
   }
 
   return AreaChart;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/column_chart.js b/src/ui/public/vislib/visualizations/column_chart.js
index c587025f85564..401c6c5d4e9c7 100644
--- a/src/ui/public/vislib/visualizations/column_chart.js
+++ b/src/ui/public/vislib/visualizations/column_chart.js
@@ -81,7 +81,7 @@ export default function ColumnChartFactory(Private) {
       }
 
       return bars;
-    };
+    }
 
     /**
      * Determines whether bars are grouped or stacked and updates the D3
@@ -98,7 +98,7 @@ export default function ColumnChartFactory(Private) {
         return this.addGroupedBars(bars);
       }
       return this.addStackedBars(bars);
-    };
+    }
 
     /**
      * Adds stacked bars to column chart visualization
@@ -111,7 +111,6 @@ export default function ColumnChartFactory(Private) {
       const data = this.chartData;
       const xScale = this.handler.xAxis.xScale;
       const yScale = this.handler.yAxis.yScale;
-      const height = yScale.range()[0];
       const yMin = this.handler.yAxis.yScale.domain()[0];
 
       let barWidth;
@@ -160,7 +159,7 @@ export default function ColumnChartFactory(Private) {
         });
 
       return bars;
-    };
+    }
 
     /**
      * Adds grouped bars to column chart visualization
@@ -174,7 +173,6 @@ export default function ColumnChartFactory(Private) {
       const yScale = this.handler.yAxis.yScale;
       const data = this.chartData;
       const n = data.series.length;
-      const height = yScale.range()[0];
       const groupSpacingPercentage = 0.15;
       const isTimeScale = (data.ordered && data.ordered.date);
       const minWidth = 1;
@@ -216,7 +214,7 @@ export default function ColumnChartFactory(Private) {
         });
 
       return bars;
-    };
+    }
 
     /**
      * Adds Events to SVG rect
@@ -242,7 +240,7 @@ export default function ColumnChartFactory(Private) {
       }
 
       return attachedEvents;
-    };
+    }
 
     /**
      * Renders d3 visualization
@@ -322,8 +320,8 @@ export default function ColumnChartFactory(Private) {
           return svg;
         });
       };
-    };
+    }
   }
 
   return ColumnChart;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/line_chart.js b/src/ui/public/vislib/visualizations/line_chart.js
index d1721c59dc63b..c7ca11212c79c 100644
--- a/src/ui/public/vislib/visualizations/line_chart.js
+++ b/src/ui/public/vislib/visualizations/line_chart.js
@@ -56,7 +56,7 @@ export default function LineChartFactory(Private) {
       }
 
       return attachedEvents;
-    };
+    }
 
     /**
      * Adds circles to SVG
@@ -175,7 +175,7 @@ export default function LineChartFactory(Private) {
       }
 
       return circles;
-    };
+    }
 
     /**
      * Adds path to SVG
@@ -188,7 +188,6 @@ export default function LineChartFactory(Private) {
     addLines(svg, data) {
       const xScale = this.handler.xAxis.xScale;
       const yScale = this.handler.yAxis.yScale;
-      const xAxisFormatter = this.handler.data.get('xAxisFormatter');
       const color = this.handler.data.getColorFunc();
       const ordered = this.handler.data.get('ordered');
       const interpolate = (this._attr.smoothLines) ? 'cardinal' : this._attr.interpolate;
@@ -226,7 +225,7 @@ export default function LineChartFactory(Private) {
         .attr('stroke-width', 2);
 
       return lines;
-    };
+    }
 
     /**
      * Adds SVG clipPath
@@ -254,7 +253,7 @@ export default function LineChartFactory(Private) {
       // Adding clipPathBuffer to height so it doesn't
       // cutoff the lower part of the chart
       .attr('height', height + clipPathBuffer);
-    };
+    }
 
     /**
      * Renders d3 visualization
@@ -346,8 +345,8 @@ export default function LineChartFactory(Private) {
           return svg;
         });
       };
-    };
+    }
   }
 
   return LineChart;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/marker_types/base_marker.js b/src/ui/public/vislib/visualizations/marker_types/base_marker.js
index 53801942d9a1f..67bfceb9f824c 100644
--- a/src/ui/public/vislib/visualizations/marker_types/base_marker.js
+++ b/src/ui/public/vislib/visualizations/marker_types/base_marker.js
@@ -39,14 +39,14 @@ export default function MarkerFactory() {
       const self = this;
 
       // create the legend control, keep a reference
-      self._legend = L.control({position: 'bottomright'});
+      self._legend = L.control({ position: 'bottomright' });
 
       self._legend.onAdd = function () {
         // creates all the neccessary DOM elements for the control, adds listeners
         // on relevant map events, and returns the element containing the control
         const $div = $('<div>').addClass('tilemap-legend');
 
-        _.each(self._legendColors, function (color, i) {
+        _.each(self._legendColors, function (color) {
           const labelText = self._legendQuantizer
           .invertExtent(color)
           .map(self._valueFormatter)
@@ -67,7 +67,7 @@ export default function MarkerFactory() {
       };
 
       self._legend.addTo(self.map);
-    };
+    }
 
     /**
      * Apply style with shading to feature
@@ -86,7 +86,7 @@ export default function MarkerFactory() {
         opacity: 1,
         fillOpacity: 0.75
       };
-    };
+    }
 
     /**
      * Binds popup and events to each feature on map
@@ -114,7 +114,7 @@ export default function MarkerFactory() {
       });
 
       self.popups.push(popup);
-    };
+    }
 
     /**
      * d3 method returns a darker hex color,
@@ -128,7 +128,7 @@ export default function MarkerFactory() {
     darkerColor(color, amount) {
       amount = amount || 1.3;
       return d3.hcl(color).darker(amount).toString();
-    };
+    }
 
     destroy() {
       const self = this;
@@ -148,11 +148,11 @@ export default function MarkerFactory() {
         self.map.removeLayer(self._markerGroup);
         self._markerGroup = undefined;
       }
-    };
+    }
 
     _addToMap() {
       this.map.addLayer(this._markerGroup);
-    };
+    }
 
     /**
      * Creates leaflet marker group, passing options to L.geoJson
@@ -175,7 +175,7 @@ export default function MarkerFactory() {
 
       this._markerGroup = L.geoJson(this.geoJson, _.defaults(defaultOptions, options));
       this._addToMap();
-    };
+    }
 
     /**
      * return whether feature is within map bounds
@@ -191,7 +191,7 @@ export default function MarkerFactory() {
         const bucketRectBounds = _.get(feature, 'properties.rectangle');
         return mapBounds.intersects(bucketRectBounds);
       };
-    };
+    }
 
     /**
      * Checks if event latlng is within bounds of mapData
@@ -212,14 +212,14 @@ export default function MarkerFactory() {
 
       if (!content) return;
       this._createTooltip(content, latLng);
-    };
+    }
 
     _createTooltip(content, latLng) {
-      L.popup({autoPan: false})
+      L.popup({ autoPan: false })
       .setLatLng(latLng)
       .setContent(content)
       .openOn(this.map);
-    };
+    }
 
     /**
      * Closes the tooltip on the map
@@ -231,7 +231,7 @@ export default function MarkerFactory() {
       if (!this.map) return;
 
       this.map.closePopup();
-    };
+    }
 
     /**
      * d3 quantize scale returns a hex color, used for marker fill color
@@ -259,8 +259,8 @@ export default function MarkerFactory() {
       }
 
       this._legendQuantizer = d3.scale.quantize().domain(quantizeDomain).range(this._legendColors);
-    };
+    }
   }
 
   return BaseMarker;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/marker_types/geohash_grid.js b/src/ui/public/vislib/visualizations/marker_types/geohash_grid.js
index 824160fa78471..a36ab0f9df7b4 100644
--- a/src/ui/public/vislib/visualizations/marker_types/geohash_grid.js
+++ b/src/ui/public/vislib/visualizations/marker_types/geohash_grid.js
@@ -16,7 +16,7 @@ export default function GeohashGridMarkerFactory(Private) {
       super(map, geoJson, params);
 
       this._createMarkerGroup({
-        pointToLayer: function (feature, latlng) {
+        pointToLayer: function (feature) {
           const geohashRect = feature.properties.rectangle;
           // get bounds from northEast[3] and southWest[1]
           // corners in geohash rectangle
@@ -31,4 +31,4 @@ export default function GeohashGridMarkerFactory(Private) {
   }
 
   return GeohashGridMarker;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/marker_types/heatmap.js b/src/ui/public/vislib/visualizations/marker_types/heatmap.js
index d5878dec75d7a..9fd557f186ec0 100644
--- a/src/ui/public/vislib/visualizations/marker_types/heatmap.js
+++ b/src/ui/public/vislib/visualizations/marker_types/heatmap.js
@@ -45,7 +45,7 @@ export default function HeatmapMarkerFactory(Private) {
       this._markerGroup = L.heatLayer(points, options);
       this._fixTooltips();
       this._addToMap();
-    };
+    }
 
     _fixTooltips() {
       const self = this;
@@ -88,7 +88,7 @@ export default function HeatmapMarkerFactory(Private) {
           this._showTooltip(feature, latlng);
         }
       }
-    };
+    }
 
     /**
      * Finds nearest feature in mapData to event latlng
@@ -118,7 +118,7 @@ export default function HeatmapMarkerFactory(Private) {
       }, Infinity);
 
       return nearest;
-    };
+    }
 
     /**
      * display tooltip if feature is close enough to event latlng
@@ -159,7 +159,7 @@ export default function HeatmapMarkerFactory(Private) {
       .domain([1, 18])
       .range([1500000, 50]);
       return showTip;
-    };
+    }
 
 
     /**
@@ -189,9 +189,9 @@ export default function HeatmapMarkerFactory(Private) {
 
         return [lat, lng, heatIntensity];
       });
-    };
+    }
   }
 
 
   return HeatmapMarker;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/marker_types/scaled_circles.js b/src/ui/public/vislib/visualizations/marker_types/scaled_circles.js
index 9e6afcbd49ac8..764ec8948f900 100644
--- a/src/ui/public/vislib/visualizations/marker_types/scaled_circles.js
+++ b/src/ui/public/vislib/visualizations/marker_types/scaled_circles.js
@@ -51,9 +51,9 @@ export default function ScaledCircleMarkerFactory(Private) {
 
       // square root value percentage
       return Math.pow(pct, 0.5) * zoomRadius * precisionScale;
-    };
+    }
   }
 
 
   return ScaledCircleMarker;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/marker_types/shaded_circles.js b/src/ui/public/vislib/visualizations/marker_types/shaded_circles.js
index 2d31cdc6585d0..d36bf22b24dc7 100644
--- a/src/ui/public/vislib/visualizations/marker_types/shaded_circles.js
+++ b/src/ui/public/vislib/visualizations/marker_types/shaded_circles.js
@@ -57,9 +57,9 @@ export default function ShadedCircleMarkerFactory(Private) {
       const eastRadius = Math.floor(center.distanceTo(east));
       const northRadius = Math.floor(center.distanceTo(north));
       return _.min([eastRadius, northRadius]);
-    };
+    }
   }
 
 
   return ShadedCircleMarker;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/pie_chart.js b/src/ui/public/vislib/visualizations/pie_chart.js
index fd2ccb8a9c841..7884d97463dac 100644
--- a/src/ui/public/vislib/visualizations/pie_chart.js
+++ b/src/ui/public/vislib/visualizations/pie_chart.js
@@ -41,7 +41,7 @@ export default function PieChartFactory(Private) {
       if (isAllZeros) {
         throw new errors.PieContainsAllZeros();
       }
-    };
+    }
 
     /**
      * Adds Events to SVG paths
@@ -57,7 +57,7 @@ export default function PieChartFactory(Private) {
       .call(events.addHoverEvent())
       .call(events.addMouseoutEvent())
       .call(events.addClickEvent());
-    };
+    }
 
     convertToPercentage(slices) {
       (function assignPercentages(slices) {
@@ -84,7 +84,7 @@ export default function PieChartFactory(Private) {
           }
         });
       }(slices));
-    };
+    }
 
     /**
      * Adds pie paths to SVG
@@ -162,7 +162,7 @@ export default function PieChartFactory(Private) {
       }
 
       return path;
-    };
+    }
 
     _validateContainerSize(width, height) {
       const minWidth = 20;
@@ -171,7 +171,7 @@ export default function PieChartFactory(Private) {
       if (width <= minWidth || height <= minHeight) {
         throw new errors.ContainerTooSmall();
       }
-    };
+    }
 
     /**
      * Renders d3 visualization
@@ -210,8 +210,8 @@ export default function PieChartFactory(Private) {
           return svg;
         });
       };
-    };
+    }
   }
 
   return PieChart;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/tile_map.js b/src/ui/public/vislib/visualizations/tile_map.js
index 3978cfdaa65e0..959104a6fad37 100644
--- a/src/ui/public/vislib/visualizations/tile_map.js
+++ b/src/ui/public/vislib/visualizations/tile_map.js
@@ -1,4 +1,3 @@
-import d3 from 'd3';
 import _ from 'lodash';
 import $ from 'jquery';
 import VislibVisualizationsChartProvider from 'ui/vislib/visualizations/_chart';
@@ -47,7 +46,7 @@ export default function TileMapFactory(Private) {
           self._appendMap(this);
         });
       };
-    };
+    }
 
     /**
      * Invalidate the size of the map, so that leaflet will resize to fit.
@@ -60,7 +59,7 @@ export default function TileMapFactory(Private) {
       this.maps.forEach(function (map) {
         map.updateSize();
       });
-    };
+    }
 
     /**
      * clean up the maps
@@ -72,7 +71,7 @@ export default function TileMapFactory(Private) {
       this.maps = this.maps.filter(function (map) {
         map.destroy();
       });
-    };
+    }
 
     /**
      * Adds allmin and allmax properties to geoJson data
@@ -85,7 +84,7 @@ export default function TileMapFactory(Private) {
       const geoMinMax = this.handler.data.getGeoExtents();
       this.geoJson.properties.allmin = geoMinMax.min;
       this.geoJson.properties.allmax = geoMinMax.max;
-    };
+    }
 
     /**
      * Renders map
@@ -124,8 +123,8 @@ export default function TileMapFactory(Private) {
       }
 
       this.maps.push(map);
-    };
+    }
   }
 
   return TileMap;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/time_marker.js b/src/ui/public/vislib/visualizations/time_marker.js
index 89e1ad9c06dd5..4b06d8c9c277f 100644
--- a/src/ui/public/vislib/visualizations/time_marker.js
+++ b/src/ui/public/vislib/visualizations/time_marker.js
@@ -30,7 +30,7 @@ export default function TimeMarkerFactory() {
       return data.every(function (datum) {
         return (datum.ordered && datum.ordered.date);
       });
-    };
+    }
 
     render(selection) {
       const self = this;
@@ -64,8 +64,8 @@ export default function TimeMarkerFactory() {
         .attr('y1', self.height)
         .attr('y2', self.xScale.range()[0]);
       });
-    };
+    }
   }
 
   return TimeMarker;
-};
+}
diff --git a/src/ui/public/vislib/visualizations/vis_types.js b/src/ui/public/vislib/visualizations/vis_types.js
index 0cb1a8dcf0201..5738d6a82f455 100644
--- a/src/ui/public/vislib/visualizations/vis_types.js
+++ b/src/ui/public/vislib/visualizations/vis_types.js
@@ -21,4 +21,4 @@ export default function VisTypeFactory(Private) {
     area: Private(VislibVisualizationsAreaChartProvider),
     tile_map: Private(VislibVisualizationsTileMapProvider)
   };
-};
+}
diff --git a/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js b/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js
index 44628c2b39de5..3322174ff22f7 100644
--- a/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js
+++ b/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js
@@ -3,34 +3,30 @@ import ngMock from 'ng_mock';
 import expect from 'expect.js';
 import sinon from 'auto-release-sinon';
 import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table';
-import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
 import AggResponseIndexProvider from 'ui/agg_response/index';
 import VislibVisTypeBuildChartDataProvider from 'ui/vislib_vis_type/build_chart_data';
 describe('renderbot#buildChartData', function () {
-
   let buildChartData;
   let aggResponse;
-  let TableGroup;
   let Table;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
     Table = Private(AggResponseTabifyTableProvider);
-    TableGroup = Private(AggResponseTabifyTableGroupProvider);
     aggResponse = Private(AggResponseIndexProvider);
     buildChartData = Private(VislibVisTypeBuildChartDataProvider);
   }));
 
   describe('for hierarchical vis', function () {
     it('defers to hierarchical aggResponse converter', function () {
-      let football = {};
-      let renderbot = {
+      const football = {};
+      const renderbot = {
         vis: {
           isHierarchical: _.constant(true)
         }
       };
 
-      let stub = sinon.stub(aggResponse, 'hierarchical').returns(football);
+      const stub = sinon.stub(aggResponse, 'hierarchical').returns(football);
       expect(buildChartData.call(renderbot, football)).to.be(football);
       expect(stub).to.have.property('callCount', 1);
       expect(stub.firstCall.args[0]).to.be(renderbot.vis);
@@ -40,14 +36,14 @@ describe('renderbot#buildChartData', function () {
 
   describe('for point plot', function () {
     it('calls tabify to simplify the data into a table', function () {
-      let renderbot = {
+      const renderbot = {
         vis: {
           isHierarchical: _.constant(false)
         }
       };
-      let football = { tables: [], hits: { total: 1 } };
+      const football = { tables: [], hits: { total: 1 } };
 
-      let stub = sinon.stub(aggResponse, 'tabify').returns(football);
+      const stub = sinon.stub(aggResponse, 'tabify').returns(football);
       expect(buildChartData.call(renderbot, football)).to.eql({ rows: [], hits: 1 });
       expect(stub).to.have.property('callCount', 1);
       expect(stub.firstCall.args[0]).to.be(renderbot.vis);
@@ -55,8 +51,8 @@ describe('renderbot#buildChartData', function () {
     });
 
     it('returns a single chart if the tabify response contains only a single table', function () {
-      let chart = { hits: 1, rows: [], columns: [] };
-      let renderbot = {
+      const chart = { hits: 1, rows: [], columns: [] };
+      const renderbot = {
         vis: {
           isHierarchical: _.constant(false),
           type: {
@@ -64,20 +60,19 @@ describe('renderbot#buildChartData', function () {
           }
         }
       };
-      let esResp = { hits: { total: 1 } };
-      let tabbed = { tables: [ new Table() ] };
+      const esResp = { hits: { total: 1 } };
+      const tabbed = { tables: [ new Table() ] };
 
       sinon.stub(aggResponse, 'tabify').returns(tabbed);
       expect(buildChartData.call(renderbot, esResp)).to.eql(chart);
     });
 
     it('converts table groups into rows/columns wrappers for charts', function () {
-      let chart = { hits: 1, rows: [], columns: [] };
-      let converter = sinon.stub().returns('chart');
-      let esResp = { hits: { total: 1 } };
-      let tables = [new Table(), new Table(), new Table(), new Table()];
+      const converter = sinon.stub().returns('chart');
+      const esResp = { hits: { total: 1 } };
+      const tables = [new Table(), new Table(), new Table(), new Table()];
 
-      let renderbot = {
+      const renderbot = {
         vis: {
           isHierarchical: _.constant(false),
           type: {
@@ -86,7 +81,7 @@ describe('renderbot#buildChartData', function () {
         }
       };
 
-      let tabify = sinon.stub(aggResponse, 'tabify').returns({
+      sinon.stub(aggResponse, 'tabify').returns({
         tables: [
           {
             aggConfig: { params: { row: true } },
@@ -117,7 +112,7 @@ describe('renderbot#buildChartData', function () {
         ]
       });
 
-      let chartData = buildChartData.call(renderbot, esResp);
+      const chartData = buildChartData.call(renderbot, esResp);
 
       // verify tables were converted
       expect(converter).to.have.property('callCount', 4);
diff --git a/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js b/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js
index 654bb5f01d5f9..b890775703dd0 100644
--- a/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js
+++ b/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js
@@ -8,7 +8,6 @@ import VislibVisProvider from 'ui/vislib/vis';
 import VisRenderbotProvider from 'ui/vis/renderbot';
 import VislibVisTypeVislibRenderbotProvider from 'ui/vislib_vis_type/vislib_renderbot';
 import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state';
-import AggResponseIndexProvider from 'ui/agg_response/index';
 import noDigestPromises from 'test_utils/no_digest_promises';
 
 describe('renderbot', function exportWrapper() {
@@ -17,8 +16,7 @@ describe('renderbot', function exportWrapper() {
   let Renderbot;
   let VislibRenderbot;
   let persistedState;
-  let normalizeChartData;
-  let mockVisType = {
+  const mockVisType = {
     name: 'test'
   };
 
@@ -31,15 +29,14 @@ describe('renderbot', function exportWrapper() {
       Renderbot = Private(VisRenderbotProvider);
       VislibRenderbot = Private(VislibVisTypeVislibRenderbotProvider);
       persistedState = new (Private(PersistedStatePersistedStateProvider))();
-      normalizeChartData = Private(AggResponseIndexProvider);
     });
   }
 
   beforeEach(init);
 
   describe('creation', function () {
-    let vis = { type: mockVisType };
-    let $el = 'element';
+    const vis = { type: mockVisType };
+    const $el = 'element';
     let createVisStub;
     let renderbot;
 
@@ -58,7 +55,7 @@ describe('renderbot', function exportWrapper() {
   });
 
   describe('_createVis', function () {
-    let vis = {
+    const vis = {
       type: mockVisType,
       listeners: {
         'test': _.noop,
@@ -66,7 +63,7 @@ describe('renderbot', function exportWrapper() {
         'test3': _.noop
       }
     };
-    let $el = $('<div>testing</div>');
+    const $el = $('<div>testing</div>');
     let listenerSpy;
     let renderbot;
 
@@ -84,17 +81,16 @@ describe('renderbot', function exportWrapper() {
   });
 
   describe('param update', function () {
-    let params = { one: 'fish', two: 'fish' };
-    let vis = {
+    const params = { one: 'fish', two: 'fish' };
+    const vis = {
       type: _.defaults({
         params: {
           defaults: params
         }
       }, mockVisType)
     };
-    let $el = $('<div>testing</div>');
+    const $el = $('<div>testing</div>');
     let createVisSpy;
-    let getParamsStub;
     let renderbot;
 
     beforeEach(function () {
@@ -123,20 +119,19 @@ describe('renderbot', function exportWrapper() {
   describe('render', function () {
     noDigestPromises.activateForSuite();
 
-    let vis = { type: mockVisType, isHierarchical: _.constant(false) };
-    let $el = $('<div>testing</div>');
-    let stubs = {};
+    const vis = { type: mockVisType, isHierarchical: _.constant(false) };
+    const $el = $('<div>testing</div>');
 
     beforeEach(function () {
       sinon.stub(VislibRenderbot.prototype, '_getVislibParams', _.constant({}));
     });
 
     it('should use #buildChartData', function () {
-      let renderbot = new VislibRenderbot(vis, $el, persistedState);
+      const renderbot = new VislibRenderbot(vis, $el, persistedState);
 
-      let football = {};
-      let buildStub = sinon.stub(renderbot, 'buildChartData', _.constant(football));
-      let renderStub = sinon.stub(renderbot.vislibVis, 'render');
+      const football = {};
+      const buildStub = sinon.stub(renderbot, 'buildChartData', _.constant(football));
+      const renderStub = sinon.stub(renderbot.vislibVis, 'render');
 
       return renderbot.render('flat data', persistedState).then(() => {
         expect(renderStub.callCount).to.be(1);
@@ -147,7 +142,7 @@ describe('renderbot', function exportWrapper() {
   });
 
   describe('destroy', function () {
-    let vis = {
+    const vis = {
       type: mockVisType,
       listeners: {
         'test': _.noop,
@@ -155,7 +150,7 @@ describe('renderbot', function exportWrapper() {
         'test3': _.noop
       }
     };
-    let $el = $('<div>testing</div>');
+    const $el = $('<div>testing</div>');
     let listenerSpy;
     let renderbot;
 
@@ -172,7 +167,7 @@ describe('renderbot', function exportWrapper() {
     });
 
     it('should destroy the vis', function () {
-      let spy = sinon.spy(renderbot.vislibVis, 'destroy');
+      const spy = sinon.spy(renderbot.vislibVis, 'destroy');
       renderbot.destroy();
       expect(spy.callCount).to.be(1);
     });
diff --git a/src/ui/public/vislib_vis_type/build_chart_data.js b/src/ui/public/vislib_vis_type/build_chart_data.js
index 84f2fc5875f42..6bef12eaf16bb 100644
--- a/src/ui/public/vislib_vis_type/build_chart_data.js
+++ b/src/ui/public/vislib_vis_type/build_chart_data.js
@@ -2,18 +2,18 @@ import AggResponseIndexProvider from 'ui/agg_response/index';
 import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table';
 
 export default function VislibVisBuildChartData(Private) {
-  let aggResponse = Private(AggResponseIndexProvider);
-  let Table = Private(AggResponseTabifyTableProvider);
+  const aggResponse = Private(AggResponseIndexProvider);
+  const Table = Private(AggResponseTabifyTableProvider);
 
   return function (esResponse) {
-    let vis = this.vis;
+    const vis = this.vis;
 
     if (vis.isHierarchical()) {
       // the hierarchical converter is very self-contained (woot!)
       return aggResponse.hierarchical(vis, esResponse);
     }
 
-    let tableGroup = aggResponse.tabify(vis, esResponse, {
+    const tableGroup = aggResponse.tabify(vis, esResponse, {
       canSplit: true,
       asAggConfigResults: true
     });
@@ -31,11 +31,11 @@ export default function VislibVisBuildChartData(Private) {
   };
 
   function convertTableGroup(vis, tableGroup) {
-    let tables = tableGroup.tables;
-    let firstChild = tables[0];
+    const tables = tableGroup.tables;
+    const firstChild = tables[0];
     if (firstChild instanceof Table) {
 
-      let chart = convertTable(vis, firstChild);
+      const chart = convertTable(vis, firstChild);
       // if chart is within a split, assign group title to its label
       if (tableGroup.$parent) {
         chart.label = tableGroup.title;
@@ -44,13 +44,13 @@ export default function VislibVisBuildChartData(Private) {
     }
 
     if (!tables.length) return;
-    let out = {};
+    const out = {};
     let outList;
 
     tables.forEach(function (table) {
       if (!outList) {
-        let aggConfig = table.aggConfig;
-        let direction = aggConfig.params.row ? 'rows' : 'columns';
+        const aggConfig = table.aggConfig;
+        const direction = aggConfig.params.row ? 'rows' : 'columns';
         outList = out[direction] = [];
       }
 
@@ -66,4 +66,4 @@ export default function VislibVisBuildChartData(Private) {
   function convertTable(vis, table) {
     return vis.type.responseConverter(vis, table);
   }
-};
+}
diff --git a/src/ui/public/vislib_vis_type/vislib_renderbot.js b/src/ui/public/vislib_vis_type/vislib_renderbot.js
index 435c4a0ee6f38..f4198541d97f6 100644
--- a/src/ui/public/vislib_vis_type/vislib_renderbot.js
+++ b/src/ui/public/vislib_vis_type/vislib_renderbot.js
@@ -4,9 +4,9 @@ import VisRenderbotProvider from 'ui/vis/renderbot';
 import VislibVisTypeBuildChartDataProvider from 'ui/vislib_vis_type/build_chart_data';
 module.exports = function VislibRenderbotFactory(Private, $injector) {
   const AngularPromise = $injector.get('Promise');
-  let vislib = Private(VislibProvider);
-  let Renderbot = Private(VisRenderbotProvider);
-  let buildChartData = Private(VislibVisTypeBuildChartDataProvider);
+  const vislib = Private(VislibProvider);
+  const Renderbot = Private(VisRenderbotProvider);
+  const buildChartData = Private(VislibVisTypeBuildChartDataProvider);
 
   _.class(VislibRenderbot).inherits(Renderbot);
   function VislibRenderbot(vis, $el, uiState) {
@@ -15,7 +15,7 @@ module.exports = function VislibRenderbotFactory(Private, $injector) {
   }
 
   VislibRenderbot.prototype._createVis = function () {
-    let self = this;
+    const self = this;
 
     if (self.vislibVis) self.destroy();
 
@@ -30,7 +30,7 @@ module.exports = function VislibRenderbotFactory(Private, $injector) {
   };
 
   VislibRenderbot.prototype._getVislibParams = function () {
-    let self = this;
+    const self = this;
 
     return _.assign(
       {},
@@ -53,9 +53,9 @@ module.exports = function VislibRenderbotFactory(Private, $injector) {
   };
 
   VislibRenderbot.prototype.destroy = function () {
-    let self = this;
+    const self = this;
 
-    let vislibVis = self.vislibVis;
+    const vislibVis = self.vislibVis;
 
     _.forOwn(self.vis.listeners, function (listener, event) {
       vislibVis.off(event, listener);
@@ -65,10 +65,10 @@ module.exports = function VislibRenderbotFactory(Private, $injector) {
   };
 
   VislibRenderbot.prototype.updateParams = function () {
-    let self = this;
+    const self = this;
 
     // get full vislib params object
-    let newParams = self._getVislibParams();
+    const newParams = self._getVislibParams();
 
     // if there's been a change, replace the vis
     if (!_.isEqual(newParams, self.vislibParams)) self._createVis();
diff --git a/src/ui/public/vislib_vis_type/vislib_vis_type.js b/src/ui/public/vislib_vis_type/vislib_vis_type.js
index a18977bc2ca73..8ad3349f35599 100644
--- a/src/ui/public/vislib_vis_type/vislib_vis_type.js
+++ b/src/ui/public/vislib_vis_type/vislib_vis_type.js
@@ -3,16 +3,13 @@ import 'ui/vislib';
 import 'plugins/kbn_vislib_vis_types/controls/vislib_basic_options';
 import 'plugins/kbn_vislib_vis_types/controls/point_series_options';
 import 'plugins/kbn_vislib_vis_types/controls/line_interpolation_option';
-import VisSchemasProvider from 'ui/vis/schemas';
 import VisVisTypeProvider from 'ui/vis/vis_type';
 import AggResponsePointSeriesPointSeriesProvider from 'ui/agg_response/point_series/point_series';
 import VislibVisTypeVislibRenderbotProvider from 'ui/vislib_vis_type/vislib_renderbot';
 export default function VislibVisTypeFactory(Private) {
-
-  let VisTypeSchemas = Private(VisSchemasProvider);
-  let VisType = Private(VisVisTypeProvider);
-  let pointSeries = Private(AggResponsePointSeriesPointSeriesProvider);
-  let VislibRenderbot = Private(VislibVisTypeVislibRenderbotProvider);
+  const VisType = Private(VisVisTypeProvider);
+  const pointSeries = Private(AggResponsePointSeriesPointSeriesProvider);
+  const VislibRenderbot = Private(VislibVisTypeVislibRenderbotProvider);
 
 
   _.class(VislibVisType).inherits(VisType);
@@ -33,4 +30,4 @@ export default function VislibVisTypeFactory(Private) {
   };
 
   return VislibVisType;
-};
+}
diff --git a/src/ui/public/visualize/spy.js b/src/ui/public/visualize/spy.js
index e8df7aa336b80..b299f700e0ad4 100644
--- a/src/ui/public/visualize/spy.js
+++ b/src/ui/public/visualize/spy.js
@@ -7,15 +7,15 @@ uiModules
   .get('app/visualize')
   .directive('visualizeSpy', function (Private, $compile) {
 
-    let spyModes = Private(RegistrySpyModesProvider);
-    let defaultMode = spyModes.inOrder[0].name;
+    const spyModes = Private(RegistrySpyModesProvider);
+    const defaultMode = spyModes.inOrder[0].name;
 
     return {
       restrict: 'E',
       template: spyTemplate,
       link: function ($scope, $el) {
         let currentSpy;
-        let $container = $el.find('.visualize-spy-container');
+        const $container = $el.find('.visualize-spy-container');
         let fullPageSpy = _.get($scope.spy, 'mode.fill', false);
         $scope.modes = spyModes;
         $scope.spy.params = $scope.spy.params || {};
@@ -30,8 +30,8 @@ uiModules
           };
         }
 
-        let renderSpy = function (spyName) {
-          let newMode = $scope.modes.byName[spyName];
+        const renderSpy = function (spyName) {
+          const newMode = $scope.modes.byName[spyName];
 
           // clear the current value
           if (currentSpy) {
@@ -57,7 +57,7 @@ uiModules
         };
 
         $scope.toggleDisplay = function () {
-          let modeName = _.get($scope.spy, 'mode.name');
+          const modeName = _.get($scope.spy, 'mode.name');
           $scope.setSpyMode(modeName ? null : defaultMode);
         };
 
@@ -74,7 +74,7 @@ uiModules
 
         if ($scope.uiState) {
           // sync external uiState changes
-          let syncUIState = () => $scope.spy.mode = $scope.uiState.get('spy.mode');
+          const syncUIState = () => $scope.spy.mode = $scope.uiState.get('spy.mode');
           $scope.uiState.on('change', syncUIState);
           $scope.$on('$destroy', () => $scope.uiState.off('change', syncUIState));
         }
@@ -85,7 +85,7 @@ uiModules
           'spy.mode.fill'
         ], function (newVals, oldVals) {
           // update the ui state, but only if it really changes
-          let changedVals = newVals.filter((val) => !_.isUndefined(val)).length > 0;
+          const changedVals = newVals.filter((val) => !_.isUndefined(val)).length > 0;
           if (changedVals && !_.isEqual(newVals, oldVals)) {
             if ($scope.uiState) $scope.uiState.set('spy.mode', $scope.spy.mode);
           }
diff --git a/src/ui/public/visualize/visualize.js b/src/ui/public/visualize/visualize.js
index 33772b61e38a7..e05e74b8daf96 100644
--- a/src/ui/public/visualize/visualize.js
+++ b/src/ui/public/visualize/visualize.js
@@ -1,9 +1,7 @@
 import 'ui/visualize/spy';
 import 'ui/visualize/visualize.less';
 import 'ui/visualize/visualize_legend';
-import $ from 'jquery';
 import _ from 'lodash';
-import RegistryVisTypesProvider from 'ui/registry/vis_types';
 import uiModules from 'ui/modules';
 import visualizeTemplate from 'ui/visualize/visualize.html';
 import 'angular-sanitize';
@@ -15,11 +13,7 @@ import {
 uiModules
 .get('kibana/directive', ['ngSanitize'])
 .directive('visualize', function (Notifier, SavedVis, indexPatterns, Private, config, $timeout) {
-
-
-  let visTypes = Private(RegistryVisTypesProvider);
-
-  let notify = new Notifier({
+  const notify = new Notifier({
     location: 'Visualize'
   });
 
@@ -43,20 +37,20 @@ uiModules
 
       function getter(selector) {
         return function () {
-          let $sel = $el.find(selector);
+          const $sel = $el.find(selector);
           if ($sel.size()) return $sel;
         };
       }
 
-      let getVisEl = getter('.visualize-chart');
-      let getVisContainer = getter('.vis-container');
-      let getSpyContainer = getter('.visualize-spy-container');
+      const getVisEl = getter('.visualize-chart');
+      const getVisContainer = getter('.vis-container');
+      const getSpyContainer = getter('.visualize-spy-container');
 
       // Show no results message when isZeroHits is true and it requires search
       $scope.showNoResultsMessage = function () {
-        let requiresSearch = _.get($scope, 'vis.type.requiresSearch');
-        let isZeroHits = _.get($scope,'esResp.hits.total') === 0;
-        let shouldShowMessage = !_.get($scope, 'vis.params.handleNoResults');
+        const requiresSearch = _.get($scope, 'vis.type.requiresSearch');
+        const isZeroHits = _.get($scope,'esResp.hits.total') === 0;
+        const shouldShowMessage = !_.get($scope, 'vis.params.handleNoResults');
 
         return Boolean(requiresSearch && isZeroHits && shouldShowMessage);
       };
@@ -75,10 +69,10 @@ uiModules
       $scope.spy = {};
       $scope.spy.mode = ($scope.uiState) ? $scope.uiState.get('spy.mode', {}) : {};
 
-      let applyClassNames = function () {
-        let $visEl = getVisContainer();
+      const applyClassNames = function () {
+        const $visEl = getVisContainer();
         const $spyEl = getSpyContainer();
-        let fullSpy = ($scope.spy.mode && ($scope.spy.mode.fill || $scope.fullScreenSpy));
+        const fullSpy = ($scope.spy.mode && ($scope.spy.mode.fill || $scope.fullScreenSpy));
 
         $visEl.toggleClass('spy-only', Boolean(fullSpy));
         $spyEl.toggleClass('only', Boolean(fullSpy));
@@ -87,14 +81,14 @@ uiModules
           if (shouldHaveFullSpy()) {
             $visEl.addClass('spy-only');
             $spyEl.addClass('only');
-          };
+          }
         }, 0);
       };
 
       // we need to wait for some watchers to fire at least once
       // before we are "ready", this manages that
-      let prereq = (function () {
-        let fns = [];
+      const prereq = (function () {
+        const fns = [];
 
         return function register(fn) {
           fns.push(fn);
@@ -112,14 +106,14 @@ uiModules
         };
       }());
 
-      let loadingDelay = config.get('visualization:loadingDelay');
+      const loadingDelay = config.get('visualization:loadingDelay');
       $scope.loadingStyle = {
         '-webkit-transition-delay': loadingDelay,
         'transition-delay': loadingDelay
       };
 
       function shouldHaveFullSpy() {
-        let $visEl = getVisEl();
+        const $visEl = getVisEl();
         if (!$visEl) return;
 
         return ($visEl.height() < minVisChartHeight)
@@ -136,7 +130,7 @@ uiModules
       });
 
       $scope.$watch('vis', prereq(function (vis, oldVis) {
-        let $visEl = getVisEl();
+        const $visEl = getVisEl();
         if (!$visEl) return;
 
         if (!attr.editableVis) {
@@ -167,8 +161,8 @@ uiModules
           if (isTermSizeZeroError(e)) {
             return notify.error(
               `Your visualization ('${$scope.vis.title}') has an error: it has a term ` +
-              `aggregation with a size of 0. Please set it to a number greater than 0 to resolve ` +
-              `the error.`
+              'aggregation with a size of 0. Please set it to a number greater than 0 to resolve ' +
+              'the error.'
             );
           }
 
@@ -176,7 +170,7 @@ uiModules
         }).catch(notify.fatal);
       }));
 
-      $scope.$watch('esResp', prereq(function (resp, prevResp) {
+      $scope.$watch('esResp', prereq(function (resp) {
         if (!resp) return;
         $scope.renderbot.render(resp);
       }));
diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js
index b40db43cda5ec..fdafba86dac43 100644
--- a/src/ui/public/visualize/visualize_legend.js
+++ b/src/ui/public/visualize/visualize_legend.js
@@ -8,16 +8,16 @@ import uiModules from 'ui/modules';
 
 uiModules.get('kibana')
 .directive('visualizeLegend', function (Private, getAppState) {
-  let Data = Private(VislibLibDataProvider);
-  let colorPalette = Private(VislibComponentsColorColorProvider);
-  let filterBarClickHandler = Private(FilterBarFilterBarClickHandlerProvider);
+  const Data = Private(VislibLibDataProvider);
+  const colorPalette = Private(VislibComponentsColorColorProvider);
+  const filterBarClickHandler = Private(FilterBarFilterBarClickHandlerProvider);
 
   return {
     restrict: 'E',
     template: html,
     link: function ($scope) {
-      let $state = getAppState();
-      let clickHandler = filterBarClickHandler($state);
+      const $state = getAppState();
+      const clickHandler = filterBarClickHandler($state);
       $scope.open = $scope.uiState.get('vis.legendOpen', true);
 
       $scope.$watch('renderbot.chartData', function (data) {
@@ -27,8 +27,8 @@ uiModules.get('kibana')
       });
 
       $scope.highlight = function (event) {
-        let el = event.currentTarget;
-        let handler = $scope.renderbot.vislibVis.handler;
+        const el = event.currentTarget;
+        const handler = $scope.renderbot.vislibVis.handler;
 
         //there is no guarantee that a Chart will set the highlight-function on its handler
         if (!handler || typeof handler.highlight !== 'function') {
@@ -38,22 +38,22 @@ uiModules.get('kibana')
       };
 
       $scope.unhighlight = function (event) {
-        let el = event.currentTarget;
-        let handler = $scope.renderbot.vislibVis.handler;
+        const el = event.currentTarget;
+        const handler = $scope.renderbot.vislibVis.handler;
         if (!handler) return;
         handler.unHighlight.call(el, handler.el);
       };
 
       $scope.setColor = function (label, color) {
-        let colors = $scope.uiState.get('vis.colors') || {};
+        const colors = $scope.uiState.get('vis.colors') || {};
         colors[label] = color;
         $scope.uiState.set('vis.colors', colors);
         refresh();
       };
 
       $scope.toggleLegend = function () {
-        let bwcAddLegend = $scope.renderbot.vislibVis._attr.addLegend;
-        let bwcLegendStateDefault = bwcAddLegend == null ? true : bwcAddLegend;
+        const bwcAddLegend = $scope.renderbot.vislibVis._attr.addLegend;
+        const bwcLegendStateDefault = bwcAddLegend == null ? true : bwcAddLegend;
         $scope.open = !$scope.uiState.get('vis.legendOpen', bwcLegendStateDefault);
         $scope.uiState.set('vis.legendOpen', $scope.open);
       };
@@ -76,11 +76,11 @@ uiModules.get('kibana')
       };
 
       $scope.filter = function (legendData, negate) {
-        clickHandler({point: legendData, negate: negate});
+        clickHandler({ point: legendData, negate: negate });
       };
 
       $scope.canFilter = function (legendData) {
-        let filters = clickHandler({point: legendData}, true) || [];
+        const filters = clickHandler({ point: legendData }, true) || [];
         return filters.length;
       };
 
@@ -95,7 +95,7 @@ uiModules.get('kibana')
       ];
 
       function refresh() {
-        let vislibVis = $scope.renderbot.vislibVis;
+        const vislibVis = $scope.renderbot.vislibVis;
 
         if ($scope.uiState.get('vis.legendOpen') == null && vislibVis._attr.addLegend != null) {
           $scope.open = vislibVis._attr.addLegend;
@@ -114,7 +114,7 @@ uiModules.get('kibana')
       }
 
       function getSeriesLabels(data) {
-        let values = data.map(function (chart) {
+        const values = data.map(function (chart) {
           return chart.series;
         })
         .reduce(function (a, b) {
diff --git a/src/ui/public/watch_multi/__tests__/watch_multi.js b/src/ui/public/watch_multi/__tests__/watch_multi.js
index e87d124c93a89..5d8b3972c3adc 100644
--- a/src/ui/public/watch_multi/__tests__/watch_multi.js
+++ b/src/ui/public/watch_multi/__tests__/watch_multi.js
@@ -20,7 +20,7 @@ describe('$scope.$watchMulti', function () {
       expect($rootScope.$watchMulti).to.be.a('function');
       expect($scope).to.have.property('$watchMulti', $rootScope.$watchMulti);
 
-      let $isoScope = $scope.$new(true);
+      const $isoScope = $scope.$new(true);
       expect($isoScope).to.have.property('$watchMulti', $rootScope.$watchMulti);
     });
 
@@ -28,7 +28,7 @@ describe('$scope.$watchMulti', function () {
       $scope.a = 0;
       $scope.b = 0;
       let triggers = 0;
-      let unwatch = $scope.$watchMulti(['a', 'b'], function () { triggers++; });
+      const unwatch = $scope.$watchMulti(['a', 'b'], function () { triggers++; });
 
       // initial watch
       $scope.$apply();
@@ -53,7 +53,7 @@ describe('$scope.$watchMulti', function () {
 
   describe('simple scope watchers', function () {
     it('only triggers a single watch on initialization', function () {
-      let stub = sinon.stub();
+      const stub = sinon.stub();
 
       $scope.$watchMulti([
         'one',
@@ -66,7 +66,7 @@ describe('$scope.$watchMulti', function () {
     });
 
     it('only triggers a single watch when multiple values change', function () {
-      let stub = sinon.spy(function (a, b) {});
+      const stub = sinon.spy(function () {});
 
       $scope.$watchMulti([
         'one',
@@ -87,7 +87,7 @@ describe('$scope.$watchMulti', function () {
 
     it('passes an array of the current and previous values, in order',
     function () {
-      let stub = sinon.spy(function (a, b) {});
+      const stub = sinon.spy(function () {});
 
       $scope.one = 'a';
       $scope.two = 'b';
@@ -119,12 +119,12 @@ describe('$scope.$watchMulti', function () {
       let count = 0;
 
       $scope.vals = [1, 0];
-      $scope.$watchMulti([ 'vals[0]', 'vals[1]' ], function (cur, prev) {
+      $scope.$watchMulti([ 'vals[0]', 'vals[1]' ], function (cur) {
         expect(cur).to.eql($scope.vals);
         count++;
       });
 
-      let $child = $scope.$new();
+      const $child = $scope.$new();
       $child.$watch('vals[0]', function (cur) {
         $child.vals[1] = cur;
       });
@@ -140,11 +140,11 @@ describe('$scope.$watchMulti', function () {
     let secondValue;
 
     beforeEach(function () {
-      let firstGetter = function () {
+      const firstGetter = function () {
         return firstValue;
       };
 
-      let secondGetter = function () {
+      const secondGetter = function () {
         return secondValue;
       };
 
@@ -158,7 +158,7 @@ describe('$scope.$watchMulti', function () {
     });
 
     it('should trigger the watcher on initialization', function () {
-      let stub = sinon.stub();
+      const stub = sinon.stub();
       firstValue = 'first';
       secondValue = 'second';
 
@@ -174,7 +174,7 @@ describe('$scope.$watchMulti', function () {
 
   describe('nested watchers', function () {
     it('should trigger the handler at least once', function () {
-      let $scope = $rootScope.$new();
+      const $scope = $rootScope.$new();
       $scope.$$watchers = [{
         get: _.noop,
         fn: _.noop,
@@ -187,8 +187,8 @@ describe('$scope.$watchMulti', function () {
         last: false
       }];
 
-      let first = sinon.stub();
-      let second = sinon.stub();
+      const first = sinon.stub();
+      const second = sinon.stub();
 
       function registerWatchers() {
         $scope.$watchMulti([first, second], function () {
diff --git a/src/ui/public/watch_multi/watch_multi.js b/src/ui/public/watch_multi/watch_multi.js
index 42a3fd30fe978..5c95b86e387ac 100644
--- a/src/ui/public/watch_multi/watch_multi.js
+++ b/src/ui/public/watch_multi/watch_multi.js
@@ -37,15 +37,15 @@ uiModules.get('kibana')
       if (!_.isArray(expressions)) throw new TypeError('expected an array of expressions to watch');
       if (!_.isFunction(fn)) throw new TypeError('expected a function that is triggered on each watch');
 
-      let $scope = this;
-      let vals = new Array(expressions.length);
-      let prev = new Array(expressions.length);
+      const $scope = this;
+      const vals = new Array(expressions.length);
+      const prev = new Array(expressions.length);
       let fire = false;
       let init = 0;
-      let neededInits = expressions.length;
+      const neededInits = expressions.length;
 
       // first, register all of the multi-watchers
-      let unwatchers = expressions.map(function (expr, i) {
+      const unwatchers = expressions.map(function (expr, i) {
         expr = normalizeExpression($scope, expr);
         if (!expr) return;
 
@@ -85,7 +85,7 @@ uiModules.get('kibana')
 
     function normalizeExpression($scope, expr) {
       if (!expr) return;
-      let norm = {
+      const norm = {
         fn: $scope.$watch,
         deep: false
       };
diff --git a/src/ui/settings/__tests__/index.js b/src/ui/settings/__tests__/index.js
index c3393ec5135ae..130acd01f4187 100644
--- a/src/ui/settings/__tests__/index.js
+++ b/src/ui/settings/__tests__/index.js
@@ -29,7 +29,7 @@ describe('ui settings', function () {
 
     it('updates a single value in one operation', function () {
       const { server, uiSettings, configGet } = instantiate();
-      const result = uiSettings.setMany({ one: 'value' });
+      uiSettings.setMany({ one: 'value' });
       expectElasticsearchUpdateQuery(server, configGet, {
         one: 'value'
       });
@@ -37,7 +37,7 @@ describe('ui settings', function () {
 
     it('updates several values in one operation', function () {
       const { server, uiSettings, configGet } = instantiate();
-      const result = uiSettings.setMany({ one: 'value', another: 'val' });
+      uiSettings.setMany({ one: 'value', another: 'val' });
       expectElasticsearchUpdateQuery(server, configGet, {
         one: 'value', another: 'val'
       });
@@ -53,7 +53,7 @@ describe('ui settings', function () {
 
     it('updates single values by (key, value)', function () {
       const { server, uiSettings, configGet } = instantiate();
-      const result = uiSettings.set('one', 'value');
+      uiSettings.set('one', 'value');
       expectElasticsearchUpdateQuery(server, configGet, {
         one: 'value'
       });
@@ -69,7 +69,7 @@ describe('ui settings', function () {
 
     it('removes single values by key', function () {
       const { server, uiSettings, configGet } = instantiate();
-      const result = uiSettings.remove('one');
+      uiSettings.remove('one');
       expectElasticsearchUpdateQuery(server, configGet, {
         one: null
       });
@@ -85,7 +85,7 @@ describe('ui settings', function () {
 
     it('removes a single value', function () {
       const { server, uiSettings, configGet } = instantiate();
-      const result = uiSettings.removeMany(['one']);
+      uiSettings.removeMany(['one']);
       expectElasticsearchUpdateQuery(server, configGet, {
         one: null
       });
@@ -93,7 +93,7 @@ describe('ui settings', function () {
 
     it('updates several values in one operation', function () {
       const { server, uiSettings, configGet } = instantiate();
-      const result = uiSettings.removeMany(['one', 'two', 'three']);
+      uiSettings.removeMany(['one', 'two', 'three']);
       expectElasticsearchUpdateQuery(server, configGet, {
         one: null, two: null, three: null
       });
@@ -102,7 +102,9 @@ describe('ui settings', function () {
 
   describe('#getDefaults()', function () {
     it('is promised the default values', async function () {
-      const {server, uiSettings, configGet} = instantiate();
+      const {
+        uiSettings
+      } = instantiate();
       const defaults = await uiSettings.getDefaults();
       expect(isEqual(defaults, defaultsProvider())).to.equal(true);
     });
@@ -113,12 +115,12 @@ describe('ui settings', function () {
       const defaults = defaultsProvider();
       const mapping = JSON.parse(defaults['format:defaultTypeMap'].value);
       const expected = {
-        ip: {id: 'ip', params: {}},
-        date: {id: 'date', params: {}},
-        number: {id: 'number', params: {}},
-        boolean: {id: 'boolean', params: {}},
-        _source: {id: '_source', params: {}},
-        _default_: {id: 'string', params: {}}
+        ip: { id: 'ip', params: {} },
+        date: { id: 'date', params: {} },
+        number: { id: 'number', params: {} },
+        boolean: { id: 'boolean', params: {} },
+        _source: { id: '_source', params: {} },
+        _default_: { id: 'string', params: {} }
       };
 
       Object.keys(mapping).forEach(function (dataType) {
@@ -135,13 +137,15 @@ describe('ui settings', function () {
     it('pulls user configuration from ES', async function () {
       const getResult = { user: 'customized' };
       const { server, uiSettings, configGet } = instantiate({ getResult });
-      const result = await uiSettings.getUserProvided();
+      await uiSettings.getUserProvided();
       expectElasticsearchGetQuery(server, configGet);
     });
 
     it('returns user configuration', async function () {
       const getResult = { user: 'customized' };
-      const { server, uiSettings, configGet } = instantiate({ getResult });
+      const {
+        uiSettings
+      } = instantiate({ getResult });
       const result = await uiSettings.getUserProvided();
       expect(isEqual(result, {
         user: { userValue: 'customized' }
@@ -150,7 +154,9 @@ describe('ui settings', function () {
 
     it('ignores null user configuration (because default values)', async function () {
       const getResult = { user: 'customized', usingDefault: null, something: 'else' };
-      const { server, uiSettings, configGet } = instantiate({ getResult });
+      const {
+        uiSettings
+      } = instantiate({ getResult });
       const result = await uiSettings.getUserProvided();
       expect(isEqual(result, {
         user: { userValue: 'customized' }, something: { userValue: 'else' }
@@ -162,29 +168,35 @@ describe('ui settings', function () {
     it('pulls user configuration from ES', async function () {
       const getResult = {};
       const { server, uiSettings, configGet } = instantiate({ getResult });
-      const result = await uiSettings.getRaw();
+      await uiSettings.getRaw();
       expectElasticsearchGetQuery(server, configGet);
     });
 
-    it(`without user configuration it's equal to the defaults`, async function () {
+    it('without user configuration it\'s equal to the defaults', async function () {
       const getResult = {};
-      const { server, uiSettings, configGet } = instantiate({ getResult });
+      const {
+        uiSettings
+      } = instantiate({ getResult });
       const result = await uiSettings.getRaw();
       expect(isEqual(result, defaultsProvider())).to.equal(true);
     });
 
-    it(`user configuration gets merged with defaults`, async function () {
+    it('user configuration gets merged with defaults', async function () {
       const getResult = { foo: 'bar' };
-      const { server, uiSettings, configGet } = instantiate({ getResult });
+      const {
+        uiSettings
+      } = instantiate({ getResult });
       const result = await uiSettings.getRaw();
       const merged = defaultsProvider();
       merged.foo = { userValue: 'bar' };
       expect(isEqual(result, merged)).to.equal(true);
     });
 
-    it(`user configuration gets merged into defaults`, async function () {
+    it('user configuration gets merged into defaults', async function () {
       const getResult = { dateFormat: 'YYYY-MM-DD' };
-      const { server, uiSettings, configGet } = instantiate({ getResult });
+      const {
+        uiSettings
+      } = instantiate({ getResult });
       const result = await uiSettings.getRaw();
       const merged = defaultsProvider();
       merged.dateFormat.userValue = 'YYYY-MM-DD';
@@ -196,13 +208,15 @@ describe('ui settings', function () {
     it('pulls user configuration from ES', async function () {
       const getResult = {};
       const { server, uiSettings, configGet } = instantiate({ getResult });
-      const result = await uiSettings.getAll();
+      await uiSettings.getAll();
       expectElasticsearchGetQuery(server, configGet);
     });
 
-    it(`returns key value pairs`, async function () {
+    it('returns key value pairs', async function () {
       const getResult = {};
-      const { server, uiSettings, configGet } = instantiate({ getResult });
+      const {
+        uiSettings
+      } = instantiate({ getResult });
       const result = await uiSettings.getAll();
       const defaults = defaultsProvider();
       const expectation = {};
@@ -212,9 +226,11 @@ describe('ui settings', function () {
       expect(isEqual(result, expectation)).to.equal(true);
     });
 
-    it(`returns key value pairs including user configuration`, async function () {
+    it('returns key value pairs including user configuration', async function () {
       const getResult = { something: 'user-provided' };
-      const { server, uiSettings, configGet } = instantiate({ getResult });
+      const {
+        uiSettings
+      } = instantiate({ getResult });
       const result = await uiSettings.getAll();
       const defaults = defaultsProvider();
       const expectation = {};
@@ -225,9 +241,11 @@ describe('ui settings', function () {
       expect(isEqual(result, expectation)).to.equal(true);
     });
 
-    it(`returns key value pairs including user configuration for existing settings`, async function () {
+    it('returns key value pairs including user configuration for existing settings', async function () {
       const getResult = { dateFormat: 'YYYY-MM-DD' };
-      const { server, uiSettings, configGet } = instantiate({ getResult });
+      const {
+        uiSettings
+      } = instantiate({ getResult });
       const result = await uiSettings.getAll();
       const defaults = defaultsProvider();
       const expectation = {};
@@ -243,28 +261,34 @@ describe('ui settings', function () {
     it('pulls user configuration from ES', async function () {
       const getResult = {};
       const { server, uiSettings, configGet } = instantiate({ getResult });
-      const result = await uiSettings.get();
+      await uiSettings.get();
       expectElasticsearchGetQuery(server, configGet);
     });
 
-    it(`returns the promised value for a key`, async function () {
+    it('returns the promised value for a key', async function () {
       const getResult = {};
-      const { server, uiSettings, configGet } = instantiate({ getResult });
+      const {
+        uiSettings
+      } = instantiate({ getResult });
       const result = await uiSettings.get('dateFormat');
       const defaults = defaultsProvider();
       expect(result).to.equal(defaults.dateFormat.value);
     });
 
-    it(`returns the user-configured value for a custom key`, async function () {
+    it('returns the user-configured value for a custom key', async function () {
       const getResult = { custom: 'value' };
-      const { server, uiSettings, configGet } = instantiate({ getResult });
+      const {
+        uiSettings
+      } = instantiate({ getResult });
       const result = await uiSettings.get('custom');
       expect(result).to.equal('value');
     });
 
-    it(`returns the user-configured value for a modified key`, async function () {
+    it('returns the user-configured value for a modified key', async function () {
       const getResult = { dateFormat: 'YYYY-MM-DD' };
-      const { server, uiSettings, configGet } = instantiate({ getResult });
+      const {
+        uiSettings
+      } = instantiate({ getResult });
       const result = await uiSettings.get('dateFormat');
       expect(result).to.equal('YYYY-MM-DD');
     });
@@ -326,7 +350,7 @@ function instantiate({ getResult } = {}) {
   const config = {
     get: configGet
   };
-  const setupSettings = init(kbnServer, server, config);
+  init(kbnServer, server, config);
   const uiSettings = server.uiSettings();
   return { server, uiSettings, configGet };
 }
diff --git a/src/ui/settings/defaults.js b/src/ui/settings/defaults.js
index 1a6845989281a..606c13ec126d9 100644
--- a/src/ui/settings/defaults.js
+++ b/src/ui/settings/defaults.js
@@ -303,4 +303,4 @@ export default function defaultSettingsProvider() {
         'sessions storage could help. Please let us know how it goes!'
     }
   };
-};
+}
diff --git a/src/ui/ui_app.js b/src/ui/ui_app.js
index 6d7ca0ae5ab63..bacdabdbe40a7 100644
--- a/src/ui/ui_app.js
+++ b/src/ui/ui_app.js
@@ -1,5 +1,4 @@
 import { chain, get, noop, once, pick } from 'lodash';
-import _ from 'lodash';
 
 class UiApp {
   constructor(uiExports, spec) {
diff --git a/src/ui/ui_bundle_collection.js b/src/ui/ui_bundle_collection.js
index 3e652a176974c..344a03034aec3 100644
--- a/src/ui/ui_bundle_collection.js
+++ b/src/ui/ui_bundle_collection.js
@@ -1,16 +1,11 @@
-const rimraf = promisify(require('rimraf'));
-const mkdirp = promisify(require('mkdirp'));
-const unlink = promisify(require('fs').unlink);
-const readdir = promisify(require('fs').readdir);
-
 import UiBundle from './ui_bundle';
 import appEntryTemplate from './app_entry_template';
-import { readFileSync as readSync } from 'fs';
-import { pull, transform, pluck } from 'lodash';
-import { join } from 'path';
-import { resolve, promisify } from 'bluebird';
+import { transform, pluck } from 'lodash';
+import { promisify } from 'bluebird';
 import { makeRe } from 'minimatch';
 
+const mkdirp = promisify(require('mkdirp'));
+
 class UiBundleCollection {
   constructor(bundlerEnv, filter) {
     this.each = [];
@@ -62,7 +57,7 @@ class UiBundleCollection {
   async writeEntryFiles() {
     await this.ensureDir();
 
-    for (let bundle of this.each) {
+    for (const bundle of this.each) {
       const existing = await bundle.readEntryFile();
       const expected = bundle.renderContent();
 
@@ -76,7 +71,7 @@ class UiBundleCollection {
   async getInvalidBundles() {
     const invalids = new UiBundleCollection(this.env);
 
-    for (let bundle of this.each) {
+    for (const bundle of this.each) {
       const exists = await bundle.checkForExistingOutput();
       if (!exists) {
         invalids.add(bundle);
diff --git a/src/ui/ui_bundler_env.js b/src/ui/ui_bundler_env.js
index 7aa49cd54694a..6373cc76ef69a 100644
--- a/src/ui/ui_bundler_env.js
+++ b/src/ui/ui_bundler_env.js
@@ -73,22 +73,22 @@ module.exports = class UiBundlerEnv {
     switch (type) {
       case 'loaders':
         return (plugin, spec) => {
-          for (let loader of arr(spec)) this.addLoader(loader);
+          for (const loader of arr(spec)) this.addLoader(loader);
         };
 
       case 'postLoaders':
         return (plugin, spec) => {
-          for (let loader of arr(spec)) this.addPostLoader(loader);
+          for (const loader of arr(spec)) this.addPostLoader(loader);
         };
 
       case 'noParse':
         return (plugin, spec) => {
-          for (let re of arr(spec)) this.addNoParse(re);
+          for (const re of arr(spec)) this.addNoParse(re);
         };
 
       case 'modules':
         return (plugin, spec) => {
-          for (let id of keys(spec)) this.addModule(id, spec[id], plugin.id);
+          for (const id of keys(spec)) this.addModule(id, spec[id], plugin.id);
         };
     }
   }
diff --git a/src/ui/ui_exports.js b/src/ui/ui_exports.js
index 2bb3ccfac681c..0e12101d4e8fd 100644
--- a/src/ui/ui_exports.js
+++ b/src/ui/ui_exports.js
@@ -27,7 +27,7 @@ class UiExports {
       throw new Error('unknown export types ' + unkown.join(', ') + ' in plugin ' + plugin.id);
     }
 
-    for (let consumer of this.consumers) {
+    for (const consumer of this.consumers) {
       consumer.consumePlugin && consumer.consumePlugin(plugin);
     }
 
@@ -41,7 +41,7 @@ class UiExports {
   }
 
   exportConsumer(type) {
-    for (let consumer of this.consumers) {
+    for (const consumer of this.consumers) {
       if (!consumer.exportConsumer) continue;
       const fn = consumer.exportConsumer(type);
       if (fn) return fn;
@@ -51,8 +51,7 @@ class UiExports {
       case 'app':
       case 'apps':
         return (plugin, specs) => {
-          const id = plugin.id;
-          for (let spec of [].concat(specs || [])) {
+          for (const spec of [].concat(specs || [])) {
 
             const app = this.apps.new(_.defaults({}, spec, {
               id: plugin.id,
@@ -70,7 +69,7 @@ class UiExports {
 
       case 'link':
       case 'links':
-        return (plugin, spec) => {
+        return () => {
           for (const spec of [].concat(spec || [])) {
             this.navLinks.new(spec);
           }
@@ -127,7 +126,7 @@ class UiExports {
   }
 
   getAllApps() {
-    let { apps } = this;
+    const { apps } = this;
     return [...apps].concat(...apps.hidden);
   }
 
diff --git a/src/ui/ui_nav_link.js b/src/ui/ui_nav_link.js
index 63847d97de767..209be61d6a5f8 100644
--- a/src/ui/ui_nav_link.js
+++ b/src/ui/ui_nav_link.js
@@ -1,5 +1,4 @@
 import { pick } from 'lodash';
-import { join } from 'path';
 
 export default class UiNavLink {
   constructor(uiExports, spec) {
diff --git a/src/ui/ui_nav_link_collection.js b/src/ui/ui_nav_link_collection.js
index dbb3a1830975e..8e0b274a439b3 100644
--- a/src/ui/ui_nav_link_collection.js
+++ b/src/ui/ui_nav_link_collection.js
@@ -6,7 +6,7 @@ const inOrderCache = Symbol('inOrder');
 
 export default class UiNavLinkCollection extends Collection {
 
-  constructor(uiExports, parent) {
+  constructor(uiExports) {
     super();
     this.uiExports = uiExports;
   }
@@ -31,4 +31,4 @@ export default class UiNavLinkCollection extends Collection {
     return super.delete(value);
   }
 
-};
+}
diff --git a/src/utils/collection.js b/src/utils/collection.js
index 7a18c2913ee71..89ceae1409f69 100644
--- a/src/utils/collection.js
+++ b/src/utils/collection.js
@@ -1,5 +1,5 @@
 
-let set = Symbol('internal set');
+const set = Symbol('internal set');
 
 module.exports = class Collection {
   constructor() { // Set's have a length of 0, mimic that
diff --git a/src/utils/from_root.js b/src/utils/from_root.js
index bc1c3db9d36b7..c5ecd37546ef5 100644
--- a/src/utils/from_root.js
+++ b/src/utils/from_root.js
@@ -1,5 +1,5 @@
 import _ from 'lodash';
 import { __dirname as root } from './package_json';
-import { join, dirname, normalize } from 'path';
+import { join, normalize } from 'path';
 
 module.exports = _.flow(_.partial(join, root), normalize);
diff --git a/src/utils/package_json.js b/src/utils/package_json.js
index 36a953d4c000b..640db57157b8d 100644
--- a/src/utils/package_json.js
+++ b/src/utils/package_json.js
@@ -5,7 +5,7 @@ let packageDir;
 let packagePath;
 
 while (!packagePath || !existsSync(packagePath)) {
-  let prev = packageDir;
+  const prev = packageDir;
   packageDir = prev ? join(prev, '..') : __dirname;
   packagePath = join(packageDir, 'package.json');
 
diff --git a/src/utils/version.js b/src/utils/version.js
index a2a37d0dd23b4..b2afa572f8798 100644
--- a/src/utils/version.js
+++ b/src/utils/version.js
@@ -1,5 +1,3 @@
-import semver from 'semver';
-
 export function versionSatisfies(cleanActual, cleanExpected) {
   try {
     return (cleanActual === cleanExpected);
diff --git a/tasks/build/archives.js b/tasks/build/archives.js
index 9d6ff8163317f..908d86f3f8c1f 100644
--- a/tasks/build/archives.js
+++ b/tasks/build/archives.js
@@ -10,7 +10,7 @@ export default (grunt) => {
   async function exec(cmd, args) {
     log.writeln(` > ${cmd} ${args.join(' ')}`);
     await fromNode(cb => execFile(cmd, args, { cwd }, cb));
-  };
+  }
 
   async function archives({ name, buildName, zipPath, tarPath }) {
     if (/windows/.test(name)) {
@@ -18,7 +18,7 @@ export default (grunt) => {
     } else {
       await exec('tar', ['-zchf', tarPath, buildName]);
     }
-  };
+  }
 
   grunt.registerTask('_build:archives', function () {
     grunt.file.mkdir(targetDir);
diff --git a/tasks/build/babel_cache.js b/tasks/build/babel_cache.js
index d7ea3d87569cc..272ad049f1830 100644
--- a/tasks/build/babel_cache.js
+++ b/tasks/build/babel_cache.js
@@ -5,4 +5,4 @@ export default function (grunt) {
     //the optimization process can't write to .babelcache.json.
     grunt.file.write('build/kibana/optimize/.babelcache.json', '{}\n');
   });
-};
+}
diff --git a/tasks/build/babel_options.js b/tasks/build/babel_options.js
index 586e3cedd0e3a..4ce128014fb9c 100644
--- a/tasks/build/babel_options.js
+++ b/tasks/build/babel_options.js
@@ -1,9 +1,9 @@
 module.exports = function (grunt) {
 
-  var srcFile = 'build/kibana/src/optimize/babel_options.js';
-  var buildFile = 'build/kibana/src/optimize/babel_options.build.js';
-  var rename = require('fs').renameSync;
-  var unlink = require('fs').unlinkSync;
+  const srcFile = 'build/kibana/src/optimize/babel_options.js';
+  const buildFile = 'build/kibana/src/optimize/babel_options.build.js';
+  const rename = require('fs').renameSync;
+  const unlink = require('fs').unlinkSync;
 
   grunt.registerTask('_build:babelOptions', function () {
     unlink(srcFile);
diff --git a/tasks/build/data.js b/tasks/build/data.js
index b2a4d1a6fb3c0..4077702c2f098 100644
--- a/tasks/build/data.js
+++ b/tasks/build/data.js
@@ -2,4 +2,4 @@ export default function (grunt) {
   grunt.registerTask('_build:data', function () {
     grunt.file.mkdir('build/kibana/data');
   });
-};
+}
diff --git a/tasks/build/download_node_builds.js b/tasks/build/download_node_builds.js
index 8a12601ce4f1a..558acfd75ab7b 100644
--- a/tasks/build/download_node_builds.js
+++ b/tasks/build/download_node_builds.js
@@ -1,6 +1,6 @@
-import { Promise, map, fromNode, promisify } from 'bluebird';
+import { Promise, map, promisify } from 'bluebird';
 import { resolve, basename, dirname, join } from 'path';
-import { createReadStream, createWriteStream, writeFile } from 'fs';
+import { createReadStream, writeFile } from 'fs';
 import { createGunzip } from 'zlib';
 import { Extract } from 'tar';
 import { fromFile } from 'check-hash';
@@ -48,7 +48,7 @@ export default function downloadNodeBuilds(grunt) {
       return false;
     }
 
-    return checkHashFromFileAsync(filePath, expected).then(([passed, actual]) => {
+    return checkHashFromFileAsync(filePath, expected).then(([passed]) => {
       if (!passed) {
         grunt.log.error(`${platform.name} shasum check failed`);
       }
@@ -121,7 +121,7 @@ export default function downloadNodeBuilds(grunt) {
       createReadStream(filePath)
         .pipe(createGunzip())
         .on('error', reject)
-        .pipe(new Extract({path: platform.nodeDir, strip: 1}))
+        .pipe(new Extract({ path: platform.nodeDir, strip: 1 }))
         .on('error', reject)
         .on('end', resolve);
     });
@@ -148,4 +148,4 @@ export default function downloadNodeBuilds(grunt) {
     map(platforms, extract).nodeify(this.async());
   });
 
-};
+}
diff --git a/tasks/build/index.js b/tasks/build/index.js
index 1fa50df44073c..e143863667d14 100644
--- a/tasks/build/index.js
+++ b/tasks/build/index.js
@@ -1,6 +1,5 @@
+import { flatten } from 'lodash';
 module.exports = function (grunt) {
-  let { flatten } = require('lodash');
-
   grunt.registerTask('build', 'Build packages', function () {
     grunt.task.run(flatten([
       'clean:build',
diff --git a/tasks/build/install_npm_deps.js b/tasks/build/install_npm_deps.js
index e7198706f5c58..e7f737d9093b3 100644
--- a/tasks/build/install_npm_deps.js
+++ b/tasks/build/install_npm_deps.js
@@ -1,7 +1,5 @@
+import { exec } from 'child_process';
 module.exports = function (grunt) {
-  var { exec } = require('child_process');
-  var { resolve } = require('path');
-
   grunt.registerTask('_build:installNpmDeps', function () {
     grunt.file.mkdir('build/kibana/node_modules');
 
diff --git a/tasks/build/os_packages.js b/tasks/build/os_packages.js
index c66b4ba38ec86..5b2b7a2a76cb9 100644
--- a/tasks/build/os_packages.js
+++ b/tasks/build/os_packages.js
@@ -4,7 +4,6 @@ import exec from '../utils/exec';
 
 export default (grunt) => {
   const { config } = grunt;
-  const exec = require('../utils/exec');
   const targetDir = config.get('target');
   const packageScriptsDir = grunt.config.get('packageScriptsDir');
   const servicesByName = indexBy(config.get('services'), 'name');
diff --git a/tasks/build/os_shell_scripts.js b/tasks/build/os_shell_scripts.js
index 60817935387df..b86635b2aa6c0 100644
--- a/tasks/build/os_shell_scripts.js
+++ b/tasks/build/os_shell_scripts.js
@@ -1,6 +1,6 @@
-import {join, extname} from 'path';
-import {promisify} from 'bluebird';
-import {ncp} from 'ncp';
+import { join, extname } from 'path';
+import { promisify } from 'bluebird';
+import { ncp } from 'ncp';
 import rimraf from 'rimraf';
 const pncp = promisify(ncp);
 const primraf = promisify(rimraf);
@@ -21,7 +21,7 @@ export default function (grunt) {
       done(err);
     }
   });
-};
+}
 
 function invokeAllAsync(all, fn) {
   return Promise.all(all.map(fn));
diff --git a/tasks/build/package_json.js b/tasks/build/package_json.js
index a9038a2dd6d5b..ba26a107ad11e 100644
--- a/tasks/build/package_json.js
+++ b/tasks/build/package_json.js
@@ -1,8 +1,7 @@
+import { defaults } from 'lodash';
 module.exports = function (grunt) {
-  let { defaults } = require('lodash');
-
-  let pkg = grunt.config.get('pkg');
-  let deepModules = grunt.config.get('deepModules');
+  const pkg = grunt.config.get('pkg');
+  const deepModules = grunt.config.get('deepModules');
 
   grunt.registerTask('_build:packageJson', function () {
     const { sha, number, version } = grunt.config.get('build');
diff --git a/tasks/build/pleaserun.js b/tasks/build/pleaserun.js
index 58c51238d23c4..55c6b302f231a 100644
--- a/tasks/build/pleaserun.js
+++ b/tasks/build/pleaserun.js
@@ -1,10 +1,7 @@
-import { resolve } from 'path';
-import { appendFileSync } from 'fs';
 import exec from '../utils/exec';
 import { capitalize } from 'lodash';
 
 export default (grunt) => {
-  const userScriptsDir = grunt.config.get('userScriptsDir');
   const { path, user, group, name } = grunt.config.get('packages');
 
   grunt.registerTask('_build:pleaseRun', function () {
diff --git a/tasks/build/readme.js b/tasks/build/readme.js
index aa139c1df400f..e9c015eefdf92 100644
--- a/tasks/build/readme.js
+++ b/tasks/build/readme.js
@@ -1,9 +1,3 @@
-let marked = require('marked');
-let Promise = require('bluebird');
-let { join } = require('path');
-let _ = require('lodash');
-let fs = require('fs');
-
 module.exports = function (grunt) {
   grunt.registerTask('_build:readme', function () {
     function transformReadme(readme) {
diff --git a/tasks/build/shasums.js b/tasks/build/shasums.js
index cb0b405c2ad2c..7506e67ffb6a4 100644
--- a/tasks/build/shasums.js
+++ b/tasks/build/shasums.js
@@ -1,12 +1,12 @@
-var { promisify } = require('bluebird');
-var readdir = promisify(require('fs').readdir);
-var exec = promisify(require('child_process').exec);
-var platform = require('os').platform();
-var cmd = /^win/.test(platform) ? 'sha1sum ' : 'shasum ';
+import { promisify } from 'bluebird';
+const readdir = promisify(require('fs').readdir);
+const exec = promisify(require('child_process').exec);
+const platform = require('os').platform();
+const cmd = /^win/.test(platform) ? 'sha1sum ' : 'shasum ';
 
 module.exports = function (grunt) {
   grunt.registerTask('_build:shasums', function () {
-    var targetDir = grunt.config.get('target');
+    const targetDir = grunt.config.get('target');
 
     // for when shasums is run but archives and ospackages was not
     grunt.file.mkdir(targetDir);
diff --git a/tasks/build/versioned_links.js b/tasks/build/versioned_links.js
index 876c977fe2132..c447880afba67 100644
--- a/tasks/build/versioned_links.js
+++ b/tasks/build/versioned_links.js
@@ -1,18 +1,16 @@
+import { basename, resolve } from 'path';
 module.exports = function (grunt) {
-  let { basename, resolve } = require('path');
-  let { forOwn } = require('lodash');
-
-  let exec = require('../utils/exec').silent;
+  const exec = require('../utils/exec').silent;
 
   grunt.registerTask('_build:versionedLinks', function () {
-    let rootPath = grunt.config.get('root');
+    const rootPath = grunt.config.get('root');
 
-    let buildFiles = grunt.file.expand('build/kibana/{*,.*}')
+    const buildFiles = grunt.file.expand('build/kibana/{*,.*}')
     .map(function (file) {
       return resolve(rootPath, file);
     });
 
-    let transferFiles = (source, link) => exec('cp', ['-r', source, link]);
+    const transferFiles = (source, link) => exec('cp', ['-r', source, link]);
 
     grunt.config.get('platforms').forEach(function (platform) {
       grunt.file.mkdir(platform.buildDir);
diff --git a/tasks/collect_files_to_commit.js b/tasks/collect_files_to_commit.js
index d38f29fa04e34..9747253b7fd01 100644
--- a/tasks/collect_files_to_commit.js
+++ b/tasks/collect_files_to_commit.js
@@ -1,5 +1,4 @@
 import filesToCommit from './utils/files_to_commit';
-import { resolve } from 'path';
 
 export default function registerCollectFilesToCommit(grunt) {
   const root = grunt.config.get('root');
@@ -12,4 +11,4 @@ export default function registerCollectFilesToCommit(grunt) {
     })
     .nodeify(this.async());
   });
-};
+}
diff --git a/tasks/config/aws_s3.js b/tasks/config/aws_s3.js
index 975e4a1889099..211e1d06d97da 100644
--- a/tasks/config/aws_s3.js
+++ b/tasks/config/aws_s3.js
@@ -1,5 +1,4 @@
 export default function (grunt) {
-  const { config } = grunt;
   const { sha, version } = grunt.config.get('build');
 
   return {
@@ -18,4 +17,4 @@ export default function (grunt) {
       }]
     }
   };
-};
+}
diff --git a/tasks/config/babel.js b/tasks/config/babel.js
index 5eac966fcf6c3..22ed126b190d0 100644
--- a/tasks/config/babel.js
+++ b/tasks/config/babel.js
@@ -1,5 +1,4 @@
-let { defaults } = require('lodash');
-let babelOptions = require('../../src/optimize/babel_options');
+import babelOptions from '../../src/optimize/babel_options';
 
 module.exports = {
   build: {
diff --git a/tasks/config/clean.js b/tasks/config/clean.js
index 4128505fd189e..9bf1f410d66c5 100644
--- a/tasks/config/clean.js
+++ b/tasks/config/clean.js
@@ -1,5 +1,5 @@
 module.exports = function (grunt) {
-  let modules = Object.keys(grunt.config.get('deepModules'));
+  const modules = Object.keys(grunt.config.get('deepModules'));
   return {
     build: 'build',
     target: 'target',
diff --git a/tasks/config/copy.js b/tasks/config/copy.js
index f087966510f27..9a9e97741a361 100644
--- a/tasks/config/copy.js
+++ b/tasks/config/copy.js
@@ -1,4 +1,4 @@
-module.exports = function (grunt) {
+module.exports = function () {
   return {
     devSource: {
       options: { mode: true },
diff --git a/tasks/config/eslint.js b/tasks/config/eslint.js
index dbc1cea416969..46742b13ab05b 100644
--- a/tasks/config/eslint.js
+++ b/tasks/config/eslint.js
@@ -1,30 +1,33 @@
-var resolve = require('path').resolve;
+import { resolve } from 'path';
+module.exports = grunt => ({
+  options: {
+    paths: [
+      'Gruntfile.js',
+      'bin',
+      'config',
+      'src',
+      'tasks',
+      'test',
+      'utilities',
+    ],
+  },
 
-module.exports = function (grunt) {
-  return {
-    // just lint the source dir
-    source: {
-      options: {
-        cache: resolve(grunt.config.get('root'), '.eslint.fixSource.cache')
-      },
+  source: {
+    options: {
+      cache: resolve(grunt.config.get('root'), '.eslint.fixSource.cache')
+    }
+  },
 
-      files: {
-        src: '<%= lintThese %>'
-      }
-    },
+  fixSource: {
+    options: {
+      cache: resolve(grunt.config.get('root'), '.eslint.fixSource.cache'),
+      fix: true
+    }
+  },
 
-    // lint the source and fix any fixable errors
-    fixSource: {
-      options: {
-        cache: resolve(grunt.config.get('root'), '.eslint.fixSource.cache'),
-        fix: true
-      },
-
-      files: {
-        src: '<%= lintThese %>'
-      }
-    },
-
-    staged: {}
-  };
-};
+  staged: {
+    options: {
+      paths: null // overridden by lintStagedFiles task
+    }
+  }
+});
diff --git a/tasks/config/esvm.js b/tasks/config/esvm.js
index 91ebfb7b40b0e..8f30984bdf97d 100644
--- a/tasks/config/esvm.js
+++ b/tasks/config/esvm.js
@@ -1,8 +1,8 @@
+import serverConfig from '../../test/server_config';
 module.exports = function (grunt) {
-  var resolve = require('path').resolve;
-  var directory = resolve(__dirname, '../../esvm');
-  var dataDir = resolve(directory, 'data_dir');
-  var serverConfig = require('../../test/server_config');
+  const resolve = require('path').resolve;
+  const directory = resolve(__dirname, '../../esvm');
+  const dataDir = resolve(directory, 'data_dir');
 
   return {
     options: {
diff --git a/tasks/config/intern.js b/tasks/config/intern.js
index 75d9567b364c1..a37095f06d23c 100644
--- a/tasks/config/intern.js
+++ b/tasks/config/intern.js
@@ -1,6 +1,3 @@
-var path = require('path');
-
-
 module.exports = function (grunt) {
   return {
     options: {
diff --git a/tasks/config/karma.js b/tasks/config/karma.js
index e19ea7449f789..a949a39ebaf1e 100644
--- a/tasks/config/karma.js
+++ b/tasks/config/karma.js
@@ -1,4 +1,4 @@
-import { times, zipObject } from 'lodash';
+import { times } from 'lodash';
 
 const TOTAL_CI_SHARDS = 4;
 
diff --git a/tasks/config/licenses.js b/tasks/config/licenses.js
index 97731e063da1d..d9b7c378ea324 100644
--- a/tasks/config/licenses.js
+++ b/tasks/config/licenses.js
@@ -1,4 +1,4 @@
-module.exports = function (grunt) {
+module.exports = function () {
   return {
     options: {
       licenses: [
diff --git a/tasks/config/platforms.js b/tasks/config/platforms.js
index 8ff8c808a4a5e..177687ff58557 100644
--- a/tasks/config/platforms.js
+++ b/tasks/config/platforms.js
@@ -1,12 +1,12 @@
 import { endsWith } from 'lodash';
 
-module.exports = function (grunt) {
-  let { resolve } = require('path');
+import { resolve } from 'path';
 
-  let { version } = grunt.config.get('build');
-  let nodeVersion = grunt.config.get('nodeVersion');
-  let rootPath = grunt.config.get('root');
-  let baseUri = `https://nodejs.org/dist/v${nodeVersion}`;
+module.exports = function (grunt) {
+  const { version } = grunt.config.get('build');
+  const nodeVersion = grunt.config.get('nodeVersion');
+  const rootPath = grunt.config.get('root');
+  const baseUri = `https://nodejs.org/dist/v${nodeVersion}`;
 
   return [
     'darwin-x64',
@@ -14,25 +14,25 @@ module.exports = function (grunt) {
     'linux-x86',
     'windows-x86'
   ].map(function (baseName) {
-    let win = baseName === 'windows-x86';
+    const win = baseName === 'windows-x86';
 
-    let nodeUrl = win ? `${baseUri}/win-x86/node.exe` : `${baseUri}/node-v${nodeVersion}-${baseName}.tar.gz`;
-    let nodeDir = resolve(rootPath, `.node_binaries/${nodeVersion}/${baseName}`);
+    const nodeUrl = win ? `${baseUri}/win-x86/node.exe` : `${baseUri}/node-v${nodeVersion}-${baseName}.tar.gz`;
+    const nodeDir = resolve(rootPath, `.node_binaries/${nodeVersion}/${baseName}`);
 
     const name = endsWith(baseName, '-x64')
       ? baseName.replace('-x64', '-x86_64')
       : baseName;
 
-    let nodeShaSums = `${baseUri}/SHASUMS256.txt`;
+    const nodeShaSums = `${baseUri}/SHASUMS256.txt`;
 
-    let buildName = `kibana-${version}-${name}`;
-    let buildDir = resolve(rootPath, `build/${buildName}`);
+    const buildName = `kibana-${version}-${name}`;
+    const buildDir = resolve(rootPath, `build/${buildName}`);
 
-    let tarName = `${buildName}.tar.gz`;
-    let tarPath = resolve(rootPath, `target/${tarName}`);
+    const tarName = `${buildName}.tar.gz`;
+    const tarPath = resolve(rootPath, `target/${tarName}`);
 
-    let zipName = `${buildName}.zip`;
-    let zipPath = resolve(rootPath, `target/${zipName}`);
+    const zipName = `${buildName}.zip`;
+    const zipPath = resolve(rootPath, `target/${zipName}`);
 
     let debName;
     let debPath;
diff --git a/tasks/config/run.js b/tasks/config/run.js
index cd77b19152cd0..5e0566d41dbf8 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -1,12 +1,12 @@
+import { format } from 'url';
+import { resolve } from 'path';
+import chromedriver from 'chromedriver';
 module.exports = function (grunt) {
-  let platform = require('os').platform();
-  let {format} = require('url');
-  let {resolve} = require('path');
-  let root = p => resolve(__dirname, '../../', p);
-  let binScript =  /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana';
-  let buildScript =  /^win/.test(platform) ? '.\\build\\kibana\\bin\\kibana.bat' : './build/kibana/bin/kibana';
-  let uiConfig = require(root('test/server_config'));
-  let chromedriver = require('chromedriver');
+  const platform = require('os').platform();
+  const root = p => resolve(__dirname, '../../', p);
+  const binScript =  /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana';
+  const buildScript =  /^win/.test(platform) ? '.\\build\\kibana\\bin\\kibana.bat' : './build/kibana/bin/kibana';
+  const uiConfig = require(root('test/server_config'));
 
   const stdDevArgs = [
     '--env.name=development',
@@ -181,5 +181,4 @@ module.exports = function (grunt) {
       ]
     }
   };
-
 };
diff --git a/tasks/config/s3.js b/tasks/config/s3.js
index 19a1491412e2c..08cf638319671 100644
--- a/tasks/config/s3.js
+++ b/tasks/config/s3.js
@@ -1,6 +1,4 @@
-module.exports = function (grunt) {
-  var { config } = grunt;
-
+module.exports = function () {
   return {
     release: {
       bucket: 'download.elasticsearch.org',
diff --git a/tasks/config/services.js b/tasks/config/services.js
index 8b74b36c0319e..4e80d0151a1c6 100644
--- a/tasks/config/services.js
+++ b/tasks/config/services.js
@@ -1,6 +1,6 @@
+import { resolve } from 'path';
 module.exports = function (grunt) {
-  let { resolve } = require('path');
-  let rootDir = grunt.config.get('root');
+  const rootDir = grunt.config.get('root');
 
   return [
     ['launchd', '10.9'],
diff --git a/tasks/eslint.js b/tasks/eslint.js
new file mode 100644
index 0000000000000..e5392e949fc7d
--- /dev/null
+++ b/tasks/eslint.js
@@ -0,0 +1,42 @@
+import { CLIEngine } from 'eslint';
+
+const OPTION_DEFAULTS = {
+  paths: null,
+  cache: null,
+  fix: false
+};
+
+module.exports = grunt => {
+  grunt.registerMultiTask('eslint',function () {
+    const options = this.options(OPTION_DEFAULTS);
+
+    if (!options.paths) {
+      grunt.fatal(new Error('No eslint.options.paths specified'));
+      return;
+    }
+
+    const cli = new CLIEngine({
+      cache: options.cache,
+      fix: options.fix,
+      cwd: grunt.config.get('root'),
+    });
+
+    const report = cli.executeOnFiles(options.paths);
+
+    // output fixes to disk
+    if (options.fix) {
+      CLIEngine.outputFixes(report);
+    }
+
+    // log the formatted linting report
+    const formatter = cli.getFormatter();
+
+    const errTypes = [];
+    if (report.errorCount > 0) errTypes.push('errors');
+    if (report.warningCount > 0) errTypes.push('warning');
+    if (!errTypes.length) return;
+
+    grunt.log.write(formatter(report.results));
+    grunt.fatal(`eslint ${errTypes.join(' & ')}`);
+  });
+};
diff --git a/tasks/licenses.js b/tasks/licenses.js
index b105a90839995..8084452ac31d7 100644
--- a/tasks/licenses.js
+++ b/tasks/licenses.js
@@ -1,6 +1,5 @@
 import _ from 'lodash';
 import { fromNode } from 'bluebird';
-import npm from 'npm';
 import npmLicense from 'license-checker';
 
 export default function licenses(grunt) {
@@ -8,7 +7,6 @@ export default function licenses(grunt) {
     const config = this.options();
     const done = this.async();
 
-    const result = [];
     const options = {
       start: process.cwd(),
       production: true,
@@ -16,7 +14,7 @@ export default function licenses(grunt) {
     };
 
     const packages = await fromNode(cb => {
-      npmLicense.init(options, (result, error) => {
+      npmLicense.init(options, result => {
         cb(undefined, result);
       });
     });
@@ -46,7 +44,7 @@ export default function licenses(grunt) {
      */
 
     function isInvalidLicense(name) {
-      let licenses = licensesForPackage(name);
+      const licenses = licensesForPackage(name);
 
       // verify all licenses for the package are in the config
       return _.intersection(licenses, config.licenses).length < licenses.length;
@@ -58,7 +56,6 @@ export default function licenses(grunt) {
     });
 
     if (Object.keys(invalidPackages).length) {
-      const util = require('util');
       const execSync = require('child_process').execSync;
       const names = Object.keys(invalidPackages);
 
@@ -74,4 +71,4 @@ export default function licenses(grunt) {
 
     done();
   });
-};
+}
diff --git a/tasks/lint_staged_files.js b/tasks/lint_staged_files.js
index e7c2f95752d13..d8117b62c2772 100644
--- a/tasks/lint_staged_files.js
+++ b/tasks/lint_staged_files.js
@@ -1,5 +1,7 @@
 import { resolve } from 'path';
 import { isStaged, getFilename } from './utils/files_to_commit';
+import { CLIEngine } from 'eslint';
+import minimatch from 'minimatch';
 
 const root = resolve(__dirname, '..');
 
@@ -7,18 +9,32 @@ export default function (grunt) {
   grunt.registerTask('lintStagedFiles', function () {
     grunt.task.requires('collectFilesToCommit');
 
-    // match these patterns
-    var patterns = grunt.config.get('eslint.source.files.src');
-    if (!patterns) grunt.fail.warn('eslint file pattern is not defined');
+    // convert eslint paths to globs
+    const cli = new CLIEngine();
+    const eslintSourcePaths = grunt.config.get('eslint.options.paths');
+    if (!eslintSourcePaths) grunt.fail.warn('eslint.options.paths is not defined');
+
+    const sourcePathRegexps = cli.resolveFileGlobPatterns(eslintSourcePaths)
+      .map(glob => minimatch.makeRe(glob));
 
     const files = grunt.config
     .get('filesToCommit')
     .filter(isStaged)
     .map(getFilename)
     .map(file => resolve(root, file))
-    .filter(file => grunt.file.isMatch(patterns, file));
+    .filter(file => {
+      if (!sourcePathRegexps.some(re => file.match(re))) {
+        return false;
+      }
+
+      if (cli.isPathIgnored(file)) {
+        return false;
+      }
+
+      return true;
+    });
 
-    grunt.config.set('eslint.staged.files.src', files);
+    grunt.config.set('eslint.staged.options.paths', files);
     grunt.task.run(['eslint:staged']);
   });
 }
diff --git a/tasks/precommit.js b/tasks/precommit.js
index 55004ead1307d..c732164fee14e 100644
--- a/tasks/precommit.js
+++ b/tasks/precommit.js
@@ -4,4 +4,4 @@ export default function (grunt) {
     'checkAddedFilenames',
     'lintStagedFiles'
   ]);
-};
+}
diff --git a/tasks/release.js b/tasks/release.js
index 90601b8993e03..4301b52f7c3d3 100644
--- a/tasks/release.js
+++ b/tasks/release.js
@@ -1,10 +1,8 @@
+import readline from 'readline';
+import url from 'url';
+import fs from 'fs';
+import path from 'path';
 module.exports = function (grunt) {
-  const readline = require('readline');
-  const url = require('url');
-  const fs = require('fs');
-  const path = require('path');
-  const _ = require('lodash');
-
   // build, then zip and upload to s3
   grunt.registerTask('release', [
     '_release:confirmUpload',
@@ -43,14 +41,13 @@ module.exports = function (grunt) {
   });
 
   grunt.registerTask('_release:complete', function () {
-    const { sha, version } = grunt.config.get('build');
     const config = grunt.config.get('aws_s3.staging.files');
 
     grunt.log.ok('Builds uploaded');
 
     fs.readdirSync('./target').forEach((file) => {
       if (path.extname(file) !== '.txt') {
-        let link = url.format({
+        const link = url.format({
           protocol: 'https',
           hostname: 'download.elastic.co',
           pathname: config[0].dest + file
diff --git a/tasks/release_packages.js b/tasks/release_packages.js
index 23701a91589fa..d4fcd107ec417 100644
--- a/tasks/release_packages.js
+++ b/tasks/release_packages.js
@@ -59,7 +59,7 @@ export default (grunt) => {
       grunt.fail.fatal('Aborting publish');
     }
 
-    var rl = readline.createInterface({
+    const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout
     });
diff --git a/tasks/sterilize.js b/tasks/sterilize.js
index 11b827e5bbe62..897987f31794f 100644
--- a/tasks/sterilize.js
+++ b/tasks/sterilize.js
@@ -26,7 +26,7 @@ export default function (grunt) {
 
     rl.on('close', this.async());
     rl.question(`\n${danger} Do you really want to delete all of the above files?, [N/y] `, function (resp) {
-      var yes = resp.toLowerCase().trim()[0] === 'y';
+      const yes = resp.toLowerCase().trim()[0] === 'y';
       rl.close();
 
       if (yes) {
diff --git a/tasks/test.js b/tasks/test.js
index 0489693d701dd..0fdbcc0b9766d 100644
--- a/tasks/test.js
+++ b/tasks/test.js
@@ -1,5 +1,5 @@
 import _, { keys } from 'lodash';
-const visualRegression = require('../utilities/visual_regression');
+import visualRegression from '../utilities/visual_regression';
 
 module.exports = function (grunt) {
   grunt.registerTask('test:visualRegression', [
diff --git a/tasks/utils/exec.js b/tasks/utils/exec.js
index ec63ada6f9afd..8236098f61bae 100644
--- a/tasks/utils/exec.js
+++ b/tasks/utils/exec.js
@@ -1,9 +1,9 @@
-let { execFileSync } = require('child_process');
+import { execFileSync } from 'child_process';
 
 function exec(cmd, args, opts) {
   console.log(' >', cmd, args.join(' '));
   exec.silent(cmd, args, opts);
-};
+}
 
 exec.silent = function (cmd, args, opts) {
   opts = opts || {};
diff --git a/tasks/utils/files_to_commit.js b/tasks/utils/files_to_commit.js
index 61f55fcc02a19..e7af858c66a59 100644
--- a/tasks/utils/files_to_commit.js
+++ b/tasks/utils/files_to_commit.js
@@ -1,6 +1,5 @@
 import SimpleGit from 'simple-git';
 import { promisify } from 'bluebird';
-import { includes } from 'lodash';
 
 export default function filesToCommit(path) {
   const simpleGit = new SimpleGit(path);
@@ -18,7 +17,7 @@ export default function filesToCommit(path) {
       return { status, name };
     });
   });
-};
+}
 
 export function getFilename(file) {
   return file.name;
@@ -26,7 +25,7 @@ export function getFilename(file) {
 
 export function isAdded(file) {
   return file.status === 'A';
-};
+}
 
 export function isDeleted(file) {
   return file.status === 'D';
diff --git a/tasks/utils/install_or_update_repo.js b/tasks/utils/install_or_update_repo.js
index 588d43b63fd8f..bd660ead4fc28 100644
--- a/tasks/utils/install_or_update_repo.js
+++ b/tasks/utils/install_or_update_repo.js
@@ -1,12 +1,12 @@
-var Promise = require('bluebird');
-var spawn = require('./spawn');
-var grunt = require('grunt');
+import Promise from 'bluebird';
+import spawn from './spawn';
+import grunt from 'grunt';
 
 module.exports = function (repo, dir) {
   // store the previous and new hash from the repo
   // to know if there was an update from fetch
-  var prevHash;
-  var newHash;
+  let prevHash;
+  let newHash;
 
   return Promise.resolve()
   .then(function () {
diff --git a/tasks/utils/update_version.js b/tasks/utils/update_version.js
index 5180069ae2b96..5b276e57a949e 100644
--- a/tasks/utils/update_version.js
+++ b/tasks/utils/update_version.js
@@ -1,8 +1,8 @@
-var _ = require('lodash');
+import _ from 'lodash';
 
 module.exports = updateVersion;
 
-var versions = [
+const versions = [
   'major',
   'minor',
   'patch',
@@ -44,7 +44,7 @@ var versions = [
 function updateVersion(version, expr) {
   expr = String(expr).split('=');
 
-  var change = {
+  const change = {
     name: expr[0],
     val: expr[1] || null
   };
@@ -58,7 +58,7 @@ function updateVersion(version, expr) {
   }
 
   // parse the current version
-  var parts = _.chain(version.split('.'))
+  const parts = _.chain(version.split('.'))
 
   // ensure that their are three pieces, either x.x.x or x.x.x-y
   .tap(function (versionNumbers) {
@@ -70,7 +70,7 @@ function updateVersion(version, expr) {
   // describe all of the version parts with a name, parse
   // the numbers, and extract tag from patch
   .transform(function (parts, v, i) {
-    var name = versions[i];
+    const name = versions[i];
 
     if (name !== 'patch') {
       parts[name] = _.parseInt(v);
@@ -86,7 +86,7 @@ function updateVersion(version, expr) {
   // sanity check
   .tap(function (parts) {
 
-    var valid = true;
+    let valid = true;
     valid = valid && _.isNumber(parts.major);
     valid = valid && _.isNumber(parts.minor);
     valid = valid && _.isNumber(parts.patch);
@@ -121,7 +121,7 @@ function updateVersion(version, expr) {
     }
 
     // properties that are zero-d by the previous update
-    var emptyUpdates = versions.slice(versions.indexOf(change.name) + 1);
+    const emptyUpdates = versions.slice(versions.indexOf(change.name) + 1);
     while (emptyUpdates.length) {
       parts[emptyUpdates.shift()] = '';
     }
diff --git a/test/fixtures/__tests__/scenario_manager.js b/test/fixtures/__tests__/scenario_manager.js
index 144f6c1cfaa80..357a521dffa09 100644
--- a/test/fixtures/__tests__/scenario_manager.js
+++ b/test/fixtures/__tests__/scenario_manager.js
@@ -1,18 +1,17 @@
-var expect = require('expect.js');
-var sinon = require('sinon');
-var Promise = require('bluebird');
-
-var ScenarioManager = require('../scenario_manager');
+import expect from 'expect.js';
+import sinon from 'sinon';
+import Promise from 'bluebird';
+import ScenarioManager from '../scenario_manager';
 
 describe('scenario manager', function () {
-  var manager = new ScenarioManager('http://localhost:9200');
+  const manager = new ScenarioManager('http://localhost:9200');
 
   describe('loading and unloading', function () {
     this.timeout(60000);
 
-    var bulk;
-    var create;
-    var indicesDelete;
+    let bulk;
+    let create;
+    let indicesDelete;
     beforeEach(function () {
       bulk = sinon.stub(manager.client, 'bulk', Promise.resolve);
       create = sinon.stub(manager.client.indices, 'create', Promise.resolve);
@@ -43,9 +42,9 @@ describe('scenario manager', function () {
     });
 
     it('should be able to reload a scenario', function () {
-      var load = sinon.stub(manager, 'load', Promise.resolve);
-      var unload = sinon.stub(manager, 'unload', Promise.resolve);
-      var id = 'makelogs';
+      const load = sinon.stub(manager, 'load', Promise.resolve);
+      const unload = sinon.stub(manager, 'unload', Promise.resolve);
+      const id = 'makelogs';
       return manager.reload(id).then(function () {
         expect(load.calledWith(id)).to.be(true);
         expect(unload.calledWith(id)).to.be(true);
@@ -56,9 +55,9 @@ describe('scenario manager', function () {
     });
 
     it('should load if the index does not exist', function () {
-      var load = sinon.stub(manager, 'load', Promise.resolve);
-      var throwError = sinon.stub(manager.client, 'count', Promise.reject);
-      var id = 'makelogs';
+      const load = sinon.stub(manager, 'load', Promise.resolve);
+      const throwError = sinon.stub(manager.client, 'count', Promise.reject);
+      const id = 'makelogs';
       return manager.loadIfEmpty(id).then(function () {
         expect(load.calledWith(id)).to.be(true);
 
@@ -68,13 +67,13 @@ describe('scenario manager', function () {
     });
 
     it('should load if the index is empty', function () {
-      var load = sinon.stub(manager, 'load', Promise.resolve);
-      var returnZero = sinon.stub(manager.client, 'count', function () {
+      const load = sinon.stub(manager, 'load', Promise.resolve);
+      const returnZero = sinon.stub(manager.client, 'count', function () {
         return Promise.resolve({
           'count': 0
         });
       });
-      var id = 'makelogs';
+      const id = 'makelogs';
       return manager.loadIfEmpty(id).then(function () {
         expect(load.calledWith(id)).to.be(true);
 
@@ -85,13 +84,13 @@ describe('scenario manager', function () {
 
 
     it('should not load if the index is not empty', function () {
-      var load = sinon.stub(manager, 'load', Promise.resolve);
-      var returnOne = sinon.stub(manager.client, 'count', function () {
+      const load = sinon.stub(manager, 'load', Promise.resolve);
+      const returnOne = sinon.stub(manager.client, 'count', function () {
         return Promise.resolve({
           'count': 1
         });
       });
-      var id = 'makelogs';
+      const id = 'makelogs';
       return manager.loadIfEmpty(id).then(function () {
         expect(load.called).to.be(false);
 
diff --git a/test/fixtures/config.js b/test/fixtures/config.js
index b9acf71b8e1cc..29d78f73c2003 100644
--- a/test/fixtures/config.js
+++ b/test/fixtures/config.js
@@ -1,5 +1,5 @@
-var path = require('path');
-var rootDir = path.join(__dirname, 'scenarios');
+import path from 'path';
+const rootDir = path.join(__dirname, 'scenarios');
 
 module.exports = {
   scenarios: {
diff --git a/test/fixtures/scenario_manager.js b/test/fixtures/scenario_manager.js
index d4f071358d369..15423bd972e10 100644
--- a/test/fixtures/scenario_manager.js
+++ b/test/fixtures/scenario_manager.js
@@ -1,7 +1,7 @@
-var path = require('path');
-var elasticsearch = require('elasticsearch');
-var Promise = require('bluebird');
-var config = require('./config').scenarios;
+import path from 'path';
+import elasticsearch from 'elasticsearch';
+import Promise from 'bluebird';
+const config = require('./config').scenarios;
 
 function ScenarioManager(server) {
   if (!server) throw new Error('No server defined');
@@ -23,14 +23,14 @@ function ScenarioManager(server) {
 * @return {Promise} A promise that is resolved when elasticsearch has a response
 */
 ScenarioManager.prototype.load = function (id) {
-  var self = this;
-  var scenario = config[id];
+  const self = this;
+  const scenario = config[id];
   if (!scenario) return Promise.reject('No scenario found for ' + id);
 
   return Promise.all(scenario.bulk.map(function mapBulk(bulk) {
-    var loadIndexDefinition;
+    let loadIndexDefinition;
     if (bulk.indexDefinition) {
-      var body = require(path.join(scenario.baseDir, bulk.indexDefinition));
+      const body = require(path.join(scenario.baseDir, bulk.indexDefinition));
       loadIndexDefinition = self.client.indices.create({
         index: bulk.indexName,
         body: body
@@ -41,7 +41,7 @@ ScenarioManager.prototype.load = function (id) {
 
     return loadIndexDefinition
     .then(function bulkRequest() {
-      var body = require(path.join(scenario.baseDir, bulk.source));
+      const body = require(path.join(scenario.baseDir, bulk.source));
       return self.client.bulk({
         body: body
       });
@@ -71,10 +71,10 @@ ScenarioManager.prototype.load = function (id) {
 * @return {Promise} A promise that is resolved when elasticsearch has a response
 */
 ScenarioManager.prototype.unload = function (id) {
-  var scenario = config[id];
+  const scenario = config[id];
   if (!scenario) return Promise.reject('No scenario found for ' + id);
 
-  var indices = scenario.bulk.map(function mapBulk(bulk) {
+  const indices = scenario.bulk.map(function mapBulk(bulk) {
     return bulk.indexName;
   });
 
@@ -96,7 +96,7 @@ ScenarioManager.prototype.unload = function (id) {
 * @return {Promise} A promise that is resolved when elasticsearch has a response
 */
 ScenarioManager.prototype.reload = function (id) {
-  var self = this;
+  const self = this;
 
   return self.unload(id)
   .then(function load() {
@@ -120,13 +120,11 @@ ScenarioManager.prototype.deleteAll = function () {
  * @return {Promise} A promise that is resolved when elasticsearch has a response
  */
 ScenarioManager.prototype.loadIfEmpty = function (id) {
-  var self = this;
-  var scenario = config[id];
+  const self = this;
+  const scenario = config[id];
   if (!scenario) throw new Error('No scenario found for ' + id);
 
   return Promise.all(scenario.bulk.map(function mapBulk(bulk) {
-    var loadIndexDefinition;
-
     return self.client.count({
       index: bulk.indexName
     })
@@ -136,7 +134,7 @@ ScenarioManager.prototype.loadIfEmpty = function (id) {
       }
     });
   }))
-  .catch(function (reason) {
+  .catch(function () {
     return self.load(id);
   });
 };
diff --git a/test/functional/apps/console/_console.js b/test/functional/apps/console/_console.js
index a82e78e7092e5..1f0c18867ea04 100644
--- a/test/functional/apps/console/_console.js
+++ b/test/functional/apps/console/_console.js
@@ -2,10 +2,7 @@
 import expect from 'expect.js';
 
 import PageObjects from '../../../support/page_objects';
-import {
-  bdd,
-  scenarioManager
-} from '../../../support';
+import { bdd } from '../../../support';
 
 const DEFAULT_REQUEST = `
 
diff --git a/test/functional/apps/console/index.js b/test/functional/apps/console/index.js
index 0b1fa61d0ceca..7cf3b689ab2e7 100644
--- a/test/functional/apps/console/index.js
+++ b/test/functional/apps/console/index.js
@@ -1,10 +1,5 @@
 
-import {
-  bdd,
-  remote,
-  scenarioManager,
-  defaultTimeout,
-} from '../../../support';
+import { bdd, remote, defaultTimeout } from '../../../support';
 
 bdd.describe('console app', function () {
   this.timeout = defaultTimeout;
diff --git a/test/functional/apps/dashboard/_dashboard.js b/test/functional/apps/dashboard/_dashboard.js
index 3efe4906ec4d1..2e22bab5af483 100644
--- a/test/functional/apps/dashboard/_dashboard.js
+++ b/test/functional/apps/dashboard/_dashboard.js
@@ -13,9 +13,9 @@ import PageObjects from '../../../support/page_objects';
 bdd.describe('dashboard tab', function describeIndexTests() {
   bdd.before(function () {
     PageObjects.common.debug('Starting dashboard before method');
-    var logstash = scenarioManager.loadIfEmpty('logstashFunctional');
+    const logstash = scenarioManager.loadIfEmpty('logstashFunctional');
     // delete .kibana index and update configDoc
-    return esClient.deleteAndUpdateConfigDoc({'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*'})
+    return esClient.deleteAndUpdateConfigDoc({ 'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*' })
     // and load a set of makelogs data
     .then(function loadkibanaVisualizations() {
       PageObjects.common.debug('load kibana index with visualizations');
@@ -32,7 +32,7 @@ bdd.describe('dashboard tab', function describeIndexTests() {
   });
 
   bdd.describe('add visualizations to dashboard', function dashboardTest() {
-    var visualizations = ['Visualization漢字 AreaChart',
+    const visualizations = ['Visualization漢字 AreaChart',
       'Visualization☺漢字 DataTable',
       'Visualization漢字 LineChart',
       'Visualization PieChart',
@@ -61,8 +61,8 @@ bdd.describe('dashboard tab', function describeIndexTests() {
     });
 
     bdd.it('set the timepicker time to that which contains our test data', function setTimepicker() {
-      var fromTime = '2015-09-19 06:31:44.000';
-      var toTime = '2015-09-23 18:31:44.000';
+      const fromTime = '2015-09-19 06:31:44.000';
+      const toTime = '2015-09-23 18:31:44.000';
 
       // .then(function () {
       PageObjects.common.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
@@ -111,7 +111,7 @@ bdd.describe('dashboard tab', function describeIndexTests() {
     });
 
     bdd.it('should have all the expected initial sizes', function checkVisualizationSizes() {
-      var visObjects = [ { dataCol: '1', dataRow: '1', dataSizeX: '3', dataSizeY: '2', title: 'Visualization漢字 AreaChart' },
+      const visObjects = [ { dataCol: '1', dataRow: '1', dataSizeX: '3', dataSizeY: '2', title: 'Visualization漢字 AreaChart' },
         { dataCol: '4', dataRow: '1', dataSizeX: '3', dataSizeY: '2', title: 'Visualization☺漢字 DataTable' },
         { dataCol: '7', dataRow: '1', dataSizeX: '3', dataSizeY: '2', title: 'Visualization漢字 LineChart' },
         { dataCol: '10', dataRow: '1', dataSizeX: '3', dataSizeY: '2', title: 'Visualization PieChart' },
diff --git a/test/functional/apps/dashboard/index.js b/test/functional/apps/dashboard/index.js
index 2e7ffbb0b522e..69fbc02a867ef 100644
--- a/test/functional/apps/dashboard/index.js
+++ b/test/functional/apps/dashboard/index.js
@@ -1,10 +1,5 @@
 
-import {
-  bdd,
-  remote,
-  scenarioManager,
-  defaultTimeout,
-} from '../../../support';
+import { bdd, remote, defaultTimeout } from '../../../support';
 
 bdd.describe('dashboard app', function () {
   this.timeout = defaultTimeout;
diff --git a/test/functional/apps/discover/_collapse_expand.js b/test/functional/apps/discover/_collapse_expand.js
index 3eaf45e83144b..ab471112932a6 100644
--- a/test/functional/apps/discover/_collapse_expand.js
+++ b/test/functional/apps/discover/_collapse_expand.js
@@ -12,11 +12,11 @@ import PageObjects from '../../../support/page_objects';
 
 bdd.describe('discover tab', function describeIndexTests() {
   bdd.before(function () {
-    var fromTime = '2015-09-19 06:31:44.000';
-    var toTime = '2015-09-23 18:31:44.000';
+    const fromTime = '2015-09-19 06:31:44.000';
+    const toTime = '2015-09-23 18:31:44.000';
 
     // delete .kibana index and update configDoc
-    return esClient.deleteAndUpdateConfigDoc({'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*'})
+    return esClient.deleteAndUpdateConfigDoc({ 'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*' })
     .then(function loadkibanaIndexPattern() {
       PageObjects.common.debug('load kibana index with default index pattern');
       return elasticDump.elasticLoad('visualize','.kibana');
diff --git a/test/functional/apps/discover/_discover.js b/test/functional/apps/discover/_discover.js
index 26af3c9846764..f7198084e24b4 100644
--- a/test/functional/apps/discover/_discover.js
+++ b/test/functional/apps/discover/_discover.js
@@ -18,7 +18,7 @@ bdd.describe('discover app', function describeIndexTests() {
 
   bdd.before(async function () {
     // delete .kibana index and update configDoc
-    await esClient.deleteAndUpdateConfigDoc({'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*'});
+    await esClient.deleteAndUpdateConfigDoc({ 'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*' });
     PageObjects.common.debug('load kibana index with default index pattern');
     await elasticDump.elasticLoad('visualize','.kibana');
 
@@ -201,8 +201,8 @@ bdd.describe('discover app', function describeIndexTests() {
            ', Pass = ' + (Math.abs(expectedBarChartData[y] - paths[y]) < barHeightTolerance) + '\n';
           if ((Math.abs(expectedBarChartData[y] - paths[y]) > barHeightTolerance)) {
             hasFailure = true;
-          };
-        };
+          }
+        }
         if (hasFailure) {
           PageObjects.common.log(stringResults);
           PageObjects.common.log(paths);
diff --git a/test/functional/apps/discover/_field_data.js b/test/functional/apps/discover/_field_data.js
index 5123a54178cc8..62318f75105c5 100644
--- a/test/functional/apps/discover/_field_data.js
+++ b/test/functional/apps/discover/_field_data.js
@@ -12,11 +12,11 @@ import PageObjects from '../../../support/page_objects';
 
 bdd.describe('discover app', function describeIndexTests() {
   bdd.before(function () {
-    var fromTime = '2015-09-19 06:31:44.000';
-    var toTime = '2015-09-23 18:31:44.000';
+    const fromTime = '2015-09-19 06:31:44.000';
+    const toTime = '2015-09-23 18:31:44.000';
 
     // delete .kibana index and update configDoc
-    return esClient.deleteAndUpdateConfigDoc({'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*'})
+    return esClient.deleteAndUpdateConfigDoc({ 'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*' })
     .then(function loadkibanaIndexPattern() {
       PageObjects.common.debug('load kibana index with default index pattern');
       return elasticDump.elasticLoad('visualize','.kibana');
@@ -37,12 +37,8 @@ bdd.describe('discover app', function describeIndexTests() {
 
 
   bdd.describe('field data', function () {
-    var queryName1 = 'Query # 1';
-    var fromTimeString = 'September 19th 2015, 06:31:44.000';
-    var toTimeString = 'September 23rd 2015, 18:31:44.000';
-
     bdd.it('search php should show the correct hit count', function () {
-      var expectedHitCount = '445';
+      const expectedHitCount = '445';
       return PageObjects.discover.query('php')
       .then(function () {
         return PageObjects.common.try(function tryingForTime() {
@@ -65,7 +61,7 @@ bdd.describe('discover app', function describeIndexTests() {
     });
 
     bdd.it('search _type:apache should show the correct hit count', function () {
-      var expectedHitCount = '11,156';
+      const expectedHitCount = '11,156';
       return PageObjects.discover.query('_type:apache')
       .then(function () {
         return PageObjects.common.try(function tryingForTime() {
@@ -78,7 +74,7 @@ bdd.describe('discover app', function describeIndexTests() {
     });
 
     bdd.it('doc view should show Time and _source columns', function () {
-      var expectedHeader = 'Time _source';
+      const expectedHeader = 'Time _source';
       return PageObjects.discover.getDocHeader()
       .then(function (header) {
         expect(header).to.be(expectedHeader);
@@ -87,7 +83,7 @@ bdd.describe('discover app', function describeIndexTests() {
 
     bdd.it('doc view should show oldest time first', function () {
       // Note: Could just check the timestamp, but might as well check that the whole doc is as expected.
-      var ExpectedDoc =
+      const ExpectedDoc =
         'September 22nd 2015, 23:50:13.253 index:logstash-2015.09.22 @timestamp:September 22nd 2015, 23:50:13.253'
         + ' ip:238.171.34.42 extension:jpg response:200 geo.coordinates:{ "lat": 38.66494528, "lon": -88.45299556'
         + ' } geo.src:FR geo.dest:KH geo.srcdest:FR:KH @tags:success, info utc_time:September 22nd 2015,'
@@ -138,7 +134,7 @@ bdd.describe('discover app', function describeIndexTests() {
 
     bdd.it('doc view should sort ascending', function () {
       // Note: Could just check the timestamp, but might as well check that the whole doc is as expected.
-      var ExpectedDoc =
+      const ExpectedDoc =
         'September 20th 2015, 00:00:00.000 index:logstash-2015.09.20 @timestamp:September 20th 2015, 00:00:00.000'
         + ' ip:143.84.142.7 extension:jpg response:200 geo.coordinates:{ "lat": 38.68407028, "lon": -120.9871642 }'
         + ' geo.src:ES geo.dest:US geo.srcdest:ES:US @tags:error, info utc_time:September 20th 2015, 00:00:00.000'
@@ -230,8 +226,7 @@ bdd.describe('discover app', function describeIndexTests() {
 
 
     bdd.it('a bad syntax query should show an error message', function () {
-      var expectedHitCount = '1011,156';
-      var expectedError = 'Discover: Failed to parse query [xxx(yyy]';
+      const expectedError = 'Discover: Failed to parse query [xxx(yyy]';
       return PageObjects.discover.query('xxx(yyy')
       .then(function () {
         return PageObjects.header.getToastMessage();
diff --git a/test/functional/apps/discover/_shared_links.js b/test/functional/apps/discover/_shared_links.js
index 899d050fbd286..cca7965e5455b 100644
--- a/test/functional/apps/discover/_shared_links.js
+++ b/test/functional/apps/discover/_shared_links.js
@@ -11,12 +11,12 @@ import {
 import PageObjects from '../../../support/page_objects';
 
 bdd.describe('shared links', function describeIndexTests() {
-  var baseUrl;
+  let baseUrl;
   // The message changes for Firefox < 41 and Firefox >= 41
   // var expectedToastMessage = 'Share search: URL selected. Press Ctrl+C to copy.';
   // var expectedToastMessage = 'Share search: URL copied to clipboard.';
   // Pass either one.
-  var expectedToastMessage = /Share search: URL (selected\. Press Ctrl\+C to copy\.|copied to clipboard\.)/;
+  const expectedToastMessage = /Share search: URL (selected\. Press Ctrl\+C to copy\.|copied to clipboard\.)/;
 
   bdd.before(function () {
     baseUrl = PageObjects.common.getHostPort();
@@ -26,11 +26,11 @@ bdd.describe('shared links', function describeIndexTests() {
     baseUrl = baseUrl.replace(':80','').replace(':443','');
     PageObjects.common.debug('New baseUrl = ' + baseUrl);
 
-    var fromTime = '2015-09-19 06:31:44.000';
-    var toTime = '2015-09-23 18:31:44.000';
+    const fromTime = '2015-09-19 06:31:44.000';
+    const toTime = '2015-09-23 18:31:44.000';
 
     // delete .kibana index and update configDoc
-    return esClient.deleteAndUpdateConfigDoc({'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*'})
+    return esClient.deleteAndUpdateConfigDoc({ 'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*' })
     .then(function loadkibanaIndexPattern() {
       PageObjects.common.debug('load kibana index with default index pattern');
       return elasticDump.elasticLoad('visualize','.kibana');
@@ -57,7 +57,7 @@ bdd.describe('shared links', function describeIndexTests() {
 
   bdd.describe('shared link', function () {
     bdd.it('should show "Share a link" caption', function () {
-      var expectedCaption = 'Share saved';
+      const expectedCaption = 'Share saved';
       return PageObjects.discover.clickShare()
       .then(function () {
         PageObjects.common.saveScreenshot('Discover-share-link');
@@ -69,7 +69,7 @@ bdd.describe('shared links', function describeIndexTests() {
     });
 
     bdd.it('should show the correct formatted URL', function () {
-      var expectedUrl = baseUrl
+      const expectedUrl = baseUrl
         + '/app/kibana?_t=1453775307251#'
         + '/discover?_g=(refreshInterval:(display:Off,pause:!f,value:0),time'
         + ':(from:\'2015-09-19T06:31:44.000Z\',mode:absolute,to:\'2015-09'
@@ -100,7 +100,7 @@ bdd.describe('shared links', function describeIndexTests() {
 
     // TODO: verify clipboard contents
     bdd.it('shorten URL button should produce a short URL', function () {
-      var re = new RegExp(baseUrl + '/goto/[0-9a-f]{32}$');
+      const re = new RegExp(baseUrl + '/goto/[0-9a-f]{32}$');
       return PageObjects.discover.clickShortenUrl()
       .then(function () {
         return PageObjects.common.try(function tryingForTime() {
diff --git a/test/functional/apps/discover/_source_filters.js b/test/functional/apps/discover/_source_filters.js
index 563d638ceb06f..b678cd62ac080 100644
--- a/test/functional/apps/discover/_source_filters.js
+++ b/test/functional/apps/discover/_source_filters.js
@@ -7,16 +7,16 @@ import {
 
 import PageObjects from '../../../support/page_objects';
 
-var expect = require('expect.js');
+import expect from 'expect.js';
 
 bdd.describe('source filters', function describeIndexTests() {
   bdd.before(function () {
 
-    var fromTime = '2015-09-19 06:31:44.000';
-    var toTime = '2015-09-23 18:31:44.000';
+    const fromTime = '2015-09-19 06:31:44.000';
+    const toTime = '2015-09-23 18:31:44.000';
 
     // delete .kibana index and update configDoc
-    return esClient.deleteAndUpdateConfigDoc({'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*'})
+    return esClient.deleteAndUpdateConfigDoc({ 'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*' })
     .then(function loadkibanaIndexPattern() {
       PageObjects.common.debug('load kibana index with default index pattern');
       return elasticDump.elasticLoad('visualize_source-filters','.kibana');
diff --git a/test/functional/apps/discover/index.js b/test/functional/apps/discover/index.js
index a06ad49f8627a..7a57a17a758b1 100644
--- a/test/functional/apps/discover/index.js
+++ b/test/functional/apps/discover/index.js
@@ -1,10 +1,5 @@
 
-import {
-  bdd,
-  remote,
-  scenarioManager,
-  defaultTimeout
-} from '../../../support';
+import { bdd, scenarioManager, defaultTimeout } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
diff --git a/test/functional/apps/management/_creation_form_changes.js b/test/functional/apps/management/_creation_form_changes.js
index b94473a5018a2..9be7916b07fc5 100644
--- a/test/functional/apps/management/_creation_form_changes.js
+++ b/test/functional/apps/management/_creation_form_changes.js
@@ -1,11 +1,7 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  scenarioManager,
-  esClient
-} from '../../../support';
+import { bdd, esClient } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
@@ -22,7 +18,7 @@ bdd.describe('user input reactions', function () {
   });
 
   bdd.it('should hide time-based index pattern when time-based option is unchecked', function () {
-    var self = this;
+    const self = this;
     return PageObjects.settings.getTimeBasedEventsCheckbox()
     .then(function (selected) {
       // uncheck the 'time-based events' checkbox
@@ -30,14 +26,14 @@ bdd.describe('user input reactions', function () {
     })
     // try to find the checkbox (this shouldn fail)
     .then(function () {
-      var waitTime = 10000;
+      const waitTime = 10000;
       return PageObjects.settings.getTimeBasedIndexPatternCheckbox(waitTime);
     })
     .then(function () {
       PageObjects.common.saveScreenshot('Settings-indices-hide-time-based-index-pattern');
       // we expect the promise above to fail
-      var handler = PageObjects.common.createErrorHandler(self);
-      var msg = 'Found time based index pattern checkbox';
+      const handler = PageObjects.common.createErrorHandler(self);
+      const msg = 'Found time based index pattern checkbox';
       handler(msg);
     })
     .catch(function () {
diff --git a/test/functional/apps/management/_index_pattern_create_delete.js b/test/functional/apps/management/_index_pattern_create_delete.js
index db6c07079d4c3..7dd264197cda1 100644
--- a/test/functional/apps/management/_index_pattern_create_delete.js
+++ b/test/functional/apps/management/_index_pattern_create_delete.js
@@ -1,12 +1,7 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  remote,
-  scenarioManager,
-  esClient
-} from '../../../support';
+import { bdd, remote, esClient } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
@@ -48,7 +43,7 @@ bdd.describe('creating and deleting default index', function describeIndexTests(
       return PageObjects.settings.getTableHeader()
       .then(function (headers) {
         PageObjects.common.debug('header.length = ' + headers.length);
-        var expectedHeaders = [
+        const expectedHeaders = [
           'name',
           'type',
           'format',
@@ -61,7 +56,7 @@ bdd.describe('creating and deleting default index', function describeIndexTests(
 
         expect(headers.length).to.be(expectedHeaders.length);
 
-        var comparedHeaders = headers.map(function compareHead(header, i) {
+        const comparedHeaders = headers.map(function compareHead(header, i) {
           return header.getVisibleText()
           .then(function (text) {
             expect(text).to.be(expectedHeaders[i]);
@@ -75,7 +70,7 @@ bdd.describe('creating and deleting default index', function describeIndexTests(
 
   bdd.describe('index pattern deletion', function indexDelete() {
     bdd.before(function () {
-      var expectedAlertText = 'Are you sure you want to remove this index pattern?';
+      const expectedAlertText = 'Are you sure you want to remove this index pattern?';
       return PageObjects.settings.removeIndexPattern()
       .then(function (alertText) {
         PageObjects.common.saveScreenshot('Settings-indices-confirm-remove-index-pattern');
diff --git a/test/functional/apps/management/_index_pattern_popularity.js b/test/functional/apps/management/_index_pattern_popularity.js
index dda2748db24b6..b06cf3e664f4b 100644
--- a/test/functional/apps/management/_index_pattern_popularity.js
+++ b/test/functional/apps/management/_index_pattern_popularity.js
@@ -1,11 +1,7 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  scenarioManager,
-  esClient
-} from '../../../support';
+import { bdd, esClient } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
@@ -27,7 +23,7 @@ bdd.describe('index result popularity', function describeIndexTests() {
   });
 
   bdd.describe('change popularity', function indexPatternCreation() {
-    var fieldName = 'geo.coordinates';
+    const fieldName = 'geo.coordinates';
 
     // set the page size to All again, https://github.com/elastic/kibana/issues/5030
     // TODO: remove this after issue #5030 is closed
diff --git a/test/functional/apps/management/_index_pattern_results_sort.js b/test/functional/apps/management/_index_pattern_results_sort.js
index 82d37495ef23e..485436de23755 100644
--- a/test/functional/apps/management/_index_pattern_results_sort.js
+++ b/test/functional/apps/management/_index_pattern_results_sort.js
@@ -1,12 +1,7 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  defaultTimeout,
-  scenarioManager,
-  esClient
-} from '../../../support';
+import { bdd, esClient } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
@@ -16,7 +11,7 @@ bdd.describe('index result field sort', function describeIndexTests() {
     return esClient.deleteAndUpdateConfigDoc();
   });
 
-  var columns = [{
+  const columns = [{
     heading: 'name',
     first: '@message',
     last: 'xss.raw',
diff --git a/test/functional/apps/management/_initial_state.js b/test/functional/apps/management/_initial_state.js
index edca2e6eb7bca..e4eac22ef4fe2 100644
--- a/test/functional/apps/management/_initial_state.js
+++ b/test/functional/apps/management/_initial_state.js
@@ -1,11 +1,7 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  scenarioManager,
-  esClient
-} from '../../../support';
+import { bdd, esClient } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
@@ -37,7 +33,7 @@ bdd.describe('initial state', function () {
   });
 
   bdd.it('should contain default index pattern', function () {
-    var defaultPattern = 'logstash-*';
+    const defaultPattern = 'logstash-*';
 
     return PageObjects.settings.getIndexPatternField().getProperty('value')
     .then(function (pattern) {
diff --git a/test/functional/apps/management/_kibana_settings.js b/test/functional/apps/management/_kibana_settings.js
index 17e0bf6fb873b..63475b3b75149 100644
--- a/test/functional/apps/management/_kibana_settings.js
+++ b/test/functional/apps/management/_kibana_settings.js
@@ -1,11 +1,7 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  scenarioManager,
-  esClient
-} from '../../../support';
+import { bdd, esClient } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
diff --git a/test/functional/apps/management/index.js b/test/functional/apps/management/index.js
index 9c04fffedef76..663bc311389bb 100644
--- a/test/functional/apps/management/index.js
+++ b/test/functional/apps/management/index.js
@@ -1,4 +1,4 @@
-import { bdd, defaultTimeout, scenarioManager, esClient, common } from '../../../support';
+import { bdd, defaultTimeout, scenarioManager, esClient } from '../../../support';
 
 bdd.describe('settings app', function () {
   this.timeout = defaultTimeout;
diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
index d431b3e2cfd79..f1132c766fefe 100644
--- a/test/functional/apps/visualize/_area_chart.js
+++ b/test/functional/apps/visualize/_area_chart.js
@@ -1,17 +1,14 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  scenarioManager,
-} from '../../../support';
+import { bdd } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
 bdd.describe('visualize app', function describeIndexTests() {
   bdd.before(function () {
-    var fromTime = '2015-09-19 06:31:44.000';
-    var toTime = '2015-09-23 18:31:44.000';
+    const fromTime = '2015-09-19 06:31:44.000';
+    const toTime = '2015-09-23 18:31:44.000';
 
     PageObjects.common.debug('navigateToApp visualize');
     return PageObjects.common.navigateToApp('visualize')
@@ -60,7 +57,7 @@ bdd.describe('visualize app', function describeIndexTests() {
   });
 
   bdd.describe('area charts', function indexPatternCreation() {
-    var vizName1 = 'Visualization AreaChart';
+    const vizName1 = 'Visualization AreaChart';
 
     bdd.it('should save and load with special characters', function () {
       const vizNamewithSpecialChars = vizName1 + '/?&=%';
@@ -109,12 +106,11 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show correct chart, take screenshot', function () {
-      var chartHeight = 0;
-      var xAxisLabels = [ '2015-09-20 00:00', '2015-09-21 00:00',
+      const xAxisLabels = [ '2015-09-20 00:00', '2015-09-21 00:00',
         '2015-09-22 00:00', '2015-09-23 00:00'
       ];
-      var yAxisLabels = ['0','200','400','600','800','1,000','1,200','1,400','1,600'];
-      var expectedAreaChartData = [37, 202, 740, 1437, 1371, 751, 188, 31, 42, 202,
+      const yAxisLabels = ['0','200','400','600','800','1,000','1,200','1,400','1,600'];
+      const expectedAreaChartData = [37, 202, 740, 1437, 1371, 751, 188, 31, 42, 202,
         683, 1361, 1415, 707, 177, 27, 32, 175, 707, 1408, 1355, 726, 201, 29
       ];
 
@@ -144,7 +140,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show correct data', function () {
-      var expectedTableData = [ 'September 20th 2015, 00:00:00.000 37',
+      const expectedTableData = [ 'September 20th 2015, 00:00:00.000 37',
         'September 20th 2015, 03:00:00.000 202',
         'September 20th 2015, 06:00:00.000 740',
         'September 20th 2015, 09:00:00.000 1,437',
diff --git a/test/functional/apps/visualize/_chart_types.js b/test/functional/apps/visualize/_chart_types.js
index 081f1a3b01e66..ecb4355611e11 100644
--- a/test/functional/apps/visualize/_chart_types.js
+++ b/test/functional/apps/visualize/_chart_types.js
@@ -1,10 +1,7 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  scenarioManager,
-} from '../../../support';
+import { bdd } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
@@ -17,7 +14,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
   bdd.describe('chart types', function indexPatternCreation() {
     bdd.it('should show the correct chart types', function () {
-      var expectedChartTypes = [
+      const expectedChartTypes = [
         'Area chart', 'Data table', 'Line chart', 'Markdown widget',
         'Metric', 'Pie chart', 'Tile map', 'Timeseries', 'Vertical bar chart'
       ];
diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js
index 1ec25f0006b2f..61a33c6ca1eae 100644
--- a/test/functional/apps/visualize/_data_table.js
+++ b/test/functional/apps/visualize/_data_table.js
@@ -1,16 +1,13 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  scenarioManager,
-} from '../../../support';
+import { bdd } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
 bdd.describe('visualize app', function describeIndexTests() {
-  var fromTime = '2015-09-19 06:31:44.000';
-  var toTime = '2015-09-23 18:31:44.000';
+  const fromTime = '2015-09-19 06:31:44.000';
+  const toTime = '2015-09-23 18:31:44.000';
 
   bdd.before(function () {
     PageObjects.common.debug('navigateToApp visualize');
@@ -52,7 +49,7 @@ bdd.describe('visualize app', function describeIndexTests() {
   });
 
   bdd.describe('data table', function indexPatternCreation() {
-    var vizName1 = 'Visualization DataTable';
+    const vizName1 = 'Visualization DataTable';
 
     bdd.it('should be able to save and load', function () {
       return PageObjects.visualize.saveVisualization(vizName1)
@@ -72,8 +69,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show correct data, take screenshot', function () {
-      var chartHeight = 0;
-      var expectedChartData = [ '0 2,088', '2,000 2,748', '4,000 2,707', '6,000 2,876',
+      const expectedChartData = [ '0 2,088', '2,000 2,748', '4,000 2,707', '6,000 2,876',
       '8,000 2,863', '10,000 147', '12,000 148', '14,000 129', '16,000 161', '18,000 137'
       ];
 
diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js
index a17efaa1cd1b9..fb31b7535c7ab 100644
--- a/test/functional/apps/visualize/_line_chart.js
+++ b/test/functional/apps/visualize/_line_chart.js
@@ -1,17 +1,14 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  scenarioManager,
-} from '../../../support';
+import { bdd } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
 bdd.describe('visualize app', function describeIndexTests() {
   bdd.before(function () {
-    var fromTime = '2015-09-19 06:31:44.000';
-    var toTime = '2015-09-23 18:31:44.000';
+    const fromTime = '2015-09-19 06:31:44.000';
+    const toTime = '2015-09-23 18:31:44.000';
 
     PageObjects.common.debug('navigateToApp visualize');
     return PageObjects.common.navigateToApp('visualize')
@@ -51,13 +48,13 @@ bdd.describe('visualize app', function describeIndexTests() {
   });
 
   bdd.describe('line charts', function indexPatternCreation() {
-    var vizName1 = 'Visualization LineChart';
+    const vizName1 = 'Visualization LineChart';
 
     bdd.it('should show correct chart, take screenshot', function () {
 
       // this test only verifies the numerical part of this data
       // it could also check the legend to verify the extensions
-      var expectedChartData = ['jpg 9,109', 'css 2,159', 'png 1,373', 'gif 918', 'php 445'];
+      const expectedChartData = ['jpg 9,109', 'css 2,159', 'png 1,373', 'gif 918', 'php 445'];
 
       // sleep a bit before trying to get the chart data
       return PageObjects.common.sleep(3000)
@@ -66,8 +63,8 @@ bdd.describe('visualize app', function describeIndexTests() {
         .then(function showData(data) {
           PageObjects.common.debug('data=' + data);
           PageObjects.common.saveScreenshot('Visualize-line-chart');
-          var tolerance = 10; // the y-axis scale is 10000 so 10 is 0.1%
-          for (var x = 0; x < data.length; x++) {
+          const tolerance = 10; // the y-axis scale is 10000 so 10 is 0.1%
+          for (let x = 0; x < data.length; x++) {
             PageObjects.common.debug('x=' + x + ' expectedChartData[x].split(\' \')[1] = ' +
               (expectedChartData[x].split(' ')[1]).replace(',', '') + '  data[x]=' + data[x] +
               ' diff=' + Math.abs(expectedChartData[x].split(' ')[1].replace(',', '') - data[x]));
@@ -83,7 +80,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
       // this test only verifies the numerical part of this data
       // https://github.com/elastic/kibana/issues/8141
-      var expectedChartData = ['png 1,373', 'php 445', 'jpg 9,109', 'gif 918', 'css 2,159'];
+      const expectedChartData = ['png 1,373', 'php 445', 'jpg 9,109', 'gif 918', 'css 2,159'];
 
       PageObjects.common.debug('Order By = Term');
       return PageObjects.visualize.selectOrderBy('_term')
@@ -96,8 +93,8 @@ bdd.describe('visualize app', function describeIndexTests() {
           .then(function showData(data) {
             PageObjects.common.debug('data=' + data);
             PageObjects.common.saveScreenshot('Visualize-line-chart');
-            var tolerance = 10; // the y-axis scale is 10000 so 10 is 0.1%
-            for (var x = 0; x < data.length; x++) {
+            const tolerance = 10; // the y-axis scale is 10000 so 10 is 0.1%
+            for (let x = 0; x < data.length; x++) {
               PageObjects.common.debug('x=' + x + ' expectedChartData[x].split(\' \')[1] = ' +
                 (expectedChartData[x].split(' ')[1]).replace(',', '') + '  data[x]=' + data[x] +
                 ' diff=' + Math.abs(expectedChartData[x].split(' ')[1].replace(',', '') - data[x]));
@@ -112,7 +109,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
     bdd.it('should show correct data, ordered by Term', function () {
 
-      var expectedChartData = ['png 1,373', 'php 445', 'jpg 9,109', 'gif 918', 'css 2,159'];
+      const expectedChartData = ['png 1,373', 'php 445', 'jpg 9,109', 'gif 918', 'css 2,159'];
 
       return PageObjects.visualize.collapseChart()
       .then(function getDataTableData() {
diff --git a/test/functional/apps/visualize/_metric_chart.js b/test/functional/apps/visualize/_metric_chart.js
index ff67bfcc6b507..d05459d4accda 100644
--- a/test/functional/apps/visualize/_metric_chart.js
+++ b/test/functional/apps/visualize/_metric_chart.js
@@ -1,16 +1,13 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  scenarioManager,
-} from '../../../support';
+import { bdd } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
 bdd.describe('visualize app', function describeIndexTests() {
-  var fromTime = '2015-09-19 06:31:44.000';
-  var toTime = '2015-09-23 18:31:44.000';
+  const fromTime = '2015-09-19 06:31:44.000';
+  const toTime = '2015-09-23 18:31:44.000';
 
   bdd.before(function () {
     PageObjects.common.debug('navigateToApp visualize');
@@ -31,7 +28,7 @@ bdd.describe('visualize app', function describeIndexTests() {
   bdd.describe('metric chart', function indexPatternCreation() {
 
     bdd.it('should show Count', function () {
-      var expectedCount = ['14,004', 'Count'];
+      const expectedCount = ['14,004', 'Count'];
 
       // initial metric of "Count" is selected by default
       return PageObjects.common.try(function tryingForTime() {
@@ -44,7 +41,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show Average', function () {
-      var avgMachineRam = ['13,104,036,080.615', 'Average machine.ram'];
+      const avgMachineRam = ['13,104,036,080.615', 'Average machine.ram'];
       return PageObjects.visualize.clickMetricEditor()
       .then(function () {
         PageObjects.common.debug('Aggregation = Average');
@@ -68,7 +65,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show Sum', function () {
-      var sumPhpMemory = ['85,865,880', 'Sum of phpmemory'];
+      const sumPhpMemory = ['85,865,880', 'Sum of phpmemory'];
       PageObjects.common.debug('Aggregation = Sum');
       return PageObjects.visualize.selectAggregation('Sum')
       .then(function selectField() {
@@ -89,7 +86,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show Median', function () {
-      var medianBytes = ['5,565.263', '50th percentile of bytes'];
+      const medianBytes = ['5,565.263', '50th percentile of bytes'];
       //  For now, only comparing the text label part of the metric
       PageObjects.common.debug('Aggregation = Median');
       return PageObjects.visualize.selectAggregation('Median')
@@ -112,7 +109,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show Min', function () {
-      var minTimestamp = ['September 20th 2015, 00:00:00.000', 'Min @timestamp'];
+      const minTimestamp = ['September 20th 2015, 00:00:00.000', 'Min @timestamp'];
       PageObjects.common.debug('Aggregation = Min');
       return PageObjects.visualize.selectAggregation('Min')
       .then(function selectField() {
@@ -133,7 +130,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show Max', function () {
-      var maxRelatedContentArticleModifiedTime = ['April 4th 2015, 00:54:41.000', 'Max relatedContent.article:modified_time'];
+      const maxRelatedContentArticleModifiedTime = ['April 4th 2015, 00:54:41.000', 'Max relatedContent.article:modified_time'];
       PageObjects.common.debug('Aggregation = Max');
       return PageObjects.visualize.selectAggregation('Max')
       .then(function selectField() {
@@ -154,7 +151,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show Standard Deviation', function () {
-      var standardDeviationBytes = [
+      const standardDeviationBytes = [
         '-1,435.138', 'Lower Standard Deviation of bytes',
         '12,889.766', 'Upper Standard Deviation of bytes'
       ];
@@ -178,7 +175,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show Unique Count', function () {
-      var uniqueCountClientip = ['1,000', 'Unique count of clientip'];
+      const uniqueCountClientip = ['1,000', 'Unique count of clientip'];
       PageObjects.common.debug('Aggregation = Unique Count');
       return PageObjects.visualize.selectAggregation('Unique Count')
       .then(function selectField() {
@@ -206,7 +203,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show Percentiles', function () {
-      var percentileMachineRam = [
+      const percentileMachineRam = [
         '2,147,483,648', '1st percentile of machine.ram',
         '3,221,225,472', '5th percentile of machine.ram',
         '7,516,192,768', '25th percentile of machine.ram',
@@ -236,7 +233,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show Percentile Ranks', function () {
-      var percentileRankBytes = [ '2.036%', 'Percentile rank 99 of "memory"'];
+      const percentileRankBytes = [ '2.036%', 'Percentile rank 99 of "memory"'];
       PageObjects.common.debug('Aggregation = Percentile Ranks');
       return PageObjects.visualize.selectAggregation('Percentile Ranks')
       .then(function selectField() {
diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js
index 0c71c47c0892d..9d17ee3f58ede 100644
--- a/test/functional/apps/visualize/_pie_chart.js
+++ b/test/functional/apps/visualize/_pie_chart.js
@@ -1,17 +1,14 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  scenarioManager,
-} from '../../../support';
+import { bdd } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
 bdd.describe('visualize app', function describeIndexTests() {
   bdd.before(function () {
-    var fromTime = '2015-09-19 06:31:44.000';
-    var toTime = '2015-09-23 18:31:44.000';
+    const fromTime = '2015-09-19 06:31:44.000';
+    const toTime = '2015-09-23 18:31:44.000';
 
     PageObjects.common.debug('navigateToApp visualize');
     return PageObjects.common.navigateToApp('visualize')
@@ -59,7 +56,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
 
   bdd.describe('pie chart', function indexPatternCreation() {
-    var vizName1 = 'Visualization PieChart';
+    const vizName1 = 'Visualization PieChart';
 
     bdd.it('should save and load', function () {
       return PageObjects.visualize.saveVisualization(vizName1)
@@ -83,11 +80,10 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show 10 slices in pie chart, take screenshot', function () {
-      var expectedPieChartSliceCount = 10;
+      const expectedPieChartSliceCount = 10;
 
       return PageObjects.visualize.getPieChartData()
       .then(function (pieData) {
-        var barHeightTolerance = 1;
         PageObjects.common.debug('pieData.length = ' + pieData.length);
         PageObjects.common.saveScreenshot('Visualize-pie-chart');
         expect(pieData.length).to.be(expectedPieChartSliceCount);
@@ -95,7 +91,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show correct data', function () {
-      var expectedTableData =  [ '0 55', '40,000 50', '80,000 41', '120,000 43',
+      const expectedTableData =  [ '0 55', '40,000 50', '80,000 41', '120,000 43',
         '160,000 44', '200,000 40', '240,000 46', '280,000 39', '320,000 40', '360,000 47'
       ];
 
diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js
index 6d055f377009a..1770d124afa0e 100644
--- a/test/functional/apps/visualize/_tile_map.js
+++ b/test/functional/apps/visualize/_tile_map.js
@@ -1,16 +1,13 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  scenarioManager,
-} from '../../../support';
+import { bdd } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
 bdd.describe('visualize app', function describeIndexTests() {
-  var fromTime = '2015-09-19 06:31:44.000';
-  var toTime = '2015-09-23 18:31:44.000';
+  const fromTime = '2015-09-19 06:31:44.000';
+  const toTime = '2015-09-23 18:31:44.000';
 
   bdd.before(function () {
 
@@ -52,7 +49,7 @@ bdd.describe('visualize app', function describeIndexTests() {
   bdd.describe('tile map chart', function indexPatternCreation() {
 
     bdd.it('should show correct tile map data on default zoom level', function () {
-      var expectedTableData = [ 'dn 1,429', 'dp 1,418', '9y 1,215', '9z 1,099', 'dr 1,076',
+      const expectedTableData = [ 'dn 1,429', 'dp 1,418', '9y 1,215', '9z 1,099', 'dr 1,076',
         'dj 982', '9v 938', '9q 722', '9w 475', 'cb 457', 'c2 453', '9x 420', 'dq 399',
         '9r 396', '9t 274', 'c8 271', 'dh 214', 'b6 207', 'bd 206', 'b7 167', 'f0 141',
         'be 128', '9m 126', 'bf 85', 'de 73', 'bg 71', '9p 71', 'c1 57', 'c4 50', '9u 48',
@@ -75,7 +72,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
 
     bdd.it('should zoom out to level 1 from default level 2', function () {
-      var expectedPrecision2Circles =  [ { color: '#750000', radius: 48 },
+      const expectedPrecision2Circles =  [ { color: '#750000', radius: 48 },
         { color: '#750000', radius: 48 },
         { color: '#750000', radius: 44 },
         { color: '#a40000', radius: 42 },
@@ -143,7 +140,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('Fit data bounds should zoom to level 3', function () {
-      var expectedPrecision2ZoomCircles =   [ { color: '#750000', radius: 192 },
+      const expectedPrecision2ZoomCircles =   [ { color: '#750000', radius: 192 },
         { color: '#750000', radius: 191 },
         { color: '#750000', radius: 177 },
         { color: '#a40000', radius: 168 },
@@ -206,12 +203,12 @@ bdd.describe('visualize app', function describeIndexTests() {
     ** changed, then open the saved viz and check that it's back to the original data.
     */
     bdd.it('should save with zoom level and load, take screenshot', function () {
-      var vizName1 = 'Visualization TileMap';
-      var expectedTableData =  [ 'dr4 127', 'dr7 92', '9q5 91', '9qc 89', 'drk 87',
+      const vizName1 = 'Visualization TileMap';
+      const expectedTableData =  [ 'dr4 127', 'dr7 92', '9q5 91', '9qc 89', 'drk 87',
         'dps 82', 'dph 82', 'dp3 79', 'dpe 78', 'dp8 77'
       ];
 
-      var expectedTableDataZoomed = [ 'dr5r 21', 'dps8 20', '9q5b 19', 'b6uc 17',
+      const expectedTableDataZoomed = [ 'dr5r 21', 'dps8 20', '9q5b 19', 'b6uc 17',
         '9y63 17', 'c20g 16', 'dqfz 15', 'dr8h 14', 'dp8p 14', 'dp3k 14'
       ];
 
@@ -219,7 +216,7 @@ bdd.describe('visualize app', function describeIndexTests() {
       .then(function () {
         return PageObjects.visualize.clickMapZoomIn();
       })
-      .then(function (message) {
+      .then(function () {
         return PageObjects.visualize.saveVisualization(vizName1);
       })
       .then(function (message) {
diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js
index 1fdaf23603ee6..00f4795f54347 100644
--- a/test/functional/apps/visualize/_vertical_bar_chart.js
+++ b/test/functional/apps/visualize/_vertical_bar_chart.js
@@ -1,16 +1,13 @@
 
 import expect from 'expect.js';
 
-import {
-  bdd,
-  scenarioManager,
-} from '../../../support';
+import { bdd } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
 bdd.describe('visualize app', function describeIndexTests() {
-  var fromTime = '2015-09-19 06:31:44.000';
-  var toTime = '2015-09-23 18:31:44.000';
+  const fromTime = '2015-09-19 06:31:44.000';
+  const toTime = '2015-09-23 18:31:44.000';
 
   bdd.before(function () {
     PageObjects.common.debug('navigateToApp visualize');
@@ -51,7 +48,7 @@ bdd.describe('visualize app', function describeIndexTests() {
   });
 
   bdd.describe('vertical bar chart', function indexPatternCreation() {
-    var vizName1 = 'Visualization VerticalBarChart';
+    const vizName1 = 'Visualization VerticalBarChart';
 
     bdd.it('should save and load', function () {
       return PageObjects.visualize.saveVisualization(vizName1)
@@ -74,7 +71,7 @@ bdd.describe('visualize app', function describeIndexTests() {
     });
 
     bdd.it('should show correct chart, take screenshot', function () {
-      var expectedChartValues = [37, 202, 740, 1437, 1371, 751, 188, 31, 42, 202, 683,
+      const expectedChartValues = [37, 202, 740, 1437, 1371, 751, 188, 31, 42, 202, 683,
         1361, 1415, 707, 177, 27, 32, 175, 707, 1408, 1355, 726, 201, 29
       ];
 
@@ -96,7 +93,7 @@ bdd.describe('visualize app', function describeIndexTests() {
 
     bdd.it('should show correct data', function () {
       // this is only the first page of the tabular data.
-      var expectedChartData =  [ 'September 20th 2015, 00:00:00.000 37',
+      const expectedChartData =  [ 'September 20th 2015, 00:00:00.000 37',
         'September 20th 2015, 03:00:00.000 202',
         'September 20th 2015, 06:00:00.000 740',
         'September 20th 2015, 09:00:00.000 1,437',
@@ -109,7 +106,7 @@ bdd.describe('visualize app', function describeIndexTests() {
       ];
 
       return PageObjects.visualize.collapseChart()
-      .then(function showData(data) {
+      .then(function showData() {
         return PageObjects.visualize.getDataTableData();
       })
       .then(function showData(data) {
diff --git a/test/functional/apps/visualize/index.js b/test/functional/apps/visualize/index.js
index bc13a824148a6..37ef26de18d84 100644
--- a/test/functional/apps/visualize/index.js
+++ b/test/functional/apps/visualize/index.js
@@ -1,6 +1,4 @@
 
-import expect from 'expect.js';
-
 import {
   bdd,
   remote,
@@ -19,9 +17,9 @@ bdd.describe('visualize app', function () {
     remote.setWindowSize(1280,800);
 
     PageObjects.common.debug('Starting visualize before method');
-    var logstash = scenarioManager.loadIfEmpty('logstashFunctional');
+    const logstash = scenarioManager.loadIfEmpty('logstashFunctional');
     // delete .kibana index and update configDoc
-    return esClient.deleteAndUpdateConfigDoc({'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*'})
+    return esClient.deleteAndUpdateConfigDoc({ 'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*' })
     .then(function loadkibanaIndexPattern() {
       PageObjects.common.debug('load kibana index with default index pattern');
       return elasticDump.elasticLoad('visualize','.kibana');
diff --git a/test/functional/apps/xpack/index.js b/test/functional/apps/xpack/index.js
index 1865577e34c54..6a496b82472ba 100644
--- a/test/functional/apps/xpack/index.js
+++ b/test/functional/apps/xpack/index.js
@@ -1,8 +1,4 @@
-import {
-  bdd,
-  remote,
-  defaultTimeout
- } from '../../../support';
+import { bdd, defaultTimeout } from '../../../support';
 
 import PageObjects from '../../../support/page_objects';
 
diff --git a/test/functional/index.js b/test/functional/index.js
index 65bf202538814..52817e12de057 100644
--- a/test/functional/index.js
+++ b/test/functional/index.js
@@ -1,51 +1,49 @@
 'use strict'; // eslint-disable-line
 
-define(function (require) {
-  require('intern/dojo/node!../support/env_setup');
-
-  const bdd = require('intern!bdd');
-  const intern = require('intern');
-
-  global.__kibana__intern__ = { intern, bdd };
-
-  bdd.describe('kibana', function () {
-    let PageObjects;
-    let support;
-
-    bdd.before(function () {
-      PageObjects.init(this.remote);
-      support.init(this.remote);
-    });
-    const supportPages = [
-      'intern/dojo/node!../support/page_objects',
-      'intern/dojo/node!../support'
-    ];
-
-    const requestedApps = process.argv.reduce((previous, arg) => {
-      const option = arg.split('=');
-      const key = option[0];
-      const value = option[1];
-      if (key === 'appSuites' && value) return value.split(',');
-    });
-
-    const apps = [
-      'intern/dojo/node!./apps/xpack',
-      'intern/dojo/node!./apps/discover',
-      'intern/dojo/node!./apps/management',
-      'intern/dojo/node!./apps/visualize',
-      'intern/dojo/node!./apps/console',
-      'intern/dojo/node!./apps/dashboard',
-      'intern/dojo/node!./status_page'
-    ].filter((suite) => {
-      if (!requestedApps) return true;
-      return requestedApps.reduce((previous, app) => {
-        return previous || ~suite.indexOf(app);
-      }, false);
-    });
-
-    require(supportPages.concat(apps), (loadedPageObjects, loadedSupport) => {
-      PageObjects = loadedPageObjects;
-      support = loadedSupport;
-    });
+require('intern/dojo/node!../support/env_setup');
+
+import bdd from 'intern!bdd';
+import intern from 'intern';
+
+global.__kibana__intern__ = { intern, bdd };
+
+bdd.describe('kibana', function () {
+  let PageObjects;
+  let support;
+
+  bdd.before(function () {
+    PageObjects.init(this.remote);
+    support.init(this.remote);
+  });
+  const supportPages = [
+    'intern/dojo/node!../support/page_objects',
+    'intern/dojo/node!../support'
+  ];
+
+  const requestedApps = process.argv.reduce((previous, arg) => {
+    const option = arg.split('=');
+    const key = option[0];
+    const value = option[1];
+    if (key === 'appSuites' && value) return value.split(',');
+  });
+
+  const apps = [
+    'intern/dojo/node!./apps/xpack',
+    'intern/dojo/node!./apps/discover',
+    'intern/dojo/node!./apps/management',
+    'intern/dojo/node!./apps/visualize',
+    'intern/dojo/node!./apps/console',
+    'intern/dojo/node!./apps/dashboard',
+    'intern/dojo/node!./status_page'
+  ].filter((suite) => {
+    if (!requestedApps) return true;
+    return requestedApps.reduce((previous, app) => {
+      return previous || ~suite.indexOf(app);
+    }, false);
+  });
+
+  require(supportPages.concat(apps), (loadedPageObjects, loadedSupport) => {
+    PageObjects = loadedPageObjects;
+    support = loadedSupport;
   });
 });
diff --git a/test/functional/status_page/index.js b/test/functional/status_page/index.js
index afe34c9a947b2..8e1ec812a96bb 100644
--- a/test/functional/status_page/index.js
+++ b/test/functional/status_page/index.js
@@ -4,7 +4,7 @@ import {
 
 import PageObjects from '../../support/page_objects';
 
-var expect = require('expect.js');
+import expect from 'expect.js';
 
 bdd.describe('status page', function () {
   bdd.before(function () {
@@ -12,7 +12,7 @@ bdd.describe('status page', function () {
   });
 
   bdd.it('should show the kibana plugin as ready', function () {
-    var self = this;
+    const self = this;
 
     return PageObjects.common.tryForTime(6000, function () {
       return PageObjects.common.findTestSubject('statusBreakdown')
diff --git a/test/intern.js b/test/intern.js
index 095ae1cb8000f..b58d238a3e165 100644
--- a/test/intern.js
+++ b/test/intern.js
@@ -1,22 +1,21 @@
-define(function (require) {
-  const serverConfig = require('intern/dojo/node!./server_config');
-  return Object.assign({
-    debug: true,
-    capabilities: {
-      'idle-timeout': 99
-    },
-    environments: [{
-      browserName: 'chrome'
-    }],
-    tunnelOptions: serverConfig.servers.webdriver,
-    functionalSuites: [
-      'test/functional/index'
-    ],
+const serverConfig = require('intern/dojo/node!./server_config');
 
-    excludeInstrumentation: /.*/,
+module.exports = Object.assign({
+  debug: true,
+  capabilities: {
+    'idle-timeout': 99
+  },
+  environments: [{
+    browserName: 'chrome'
+  }],
+  tunnelOptions: serverConfig.servers.webdriver,
+  functionalSuites: [
+    'test/functional/index'
+  ],
 
-    defaultTimeout: 90000,
-    defaultTryTimeout: 40000, // tryForTime could include multiple 'find timeouts'
-    defaultFindTimeout: 10000  // this is how long we try to find elements on page
-  }, serverConfig);
-});
+  excludeInstrumentation: /.*/,
+
+  defaultTimeout: 90000,
+  defaultTryTimeout: 40000, // tryForTime could include multiple 'find timeouts'
+  defaultFindTimeout: 10000  // this is how long we try to find elements on page
+}, serverConfig);
diff --git a/test/intern_visual_regression.js b/test/intern_visual_regression.js
index 778e17f0cbf8b..ebb2528c75e0b 100644
--- a/test/intern_visual_regression.js
+++ b/test/intern_visual_regression.js
@@ -1,24 +1,23 @@
-define(function (require) {
-  const serverConfig = require('intern/dojo/node!./server_config');
-  return Object.assign({
-    debug: true,
-    capabilities: {
-      'selenium-version': '2.53.0',
-      // must match URL in tasks/config/downloadSelenium.js
-      'idle-timeout': 99
-    },
-    environments: [{
-      browserName: 'chrome'
-    }],
-    tunnelOptions: serverConfig.servers.webdriver,
-    functionalSuites: [
-      'test/visual_regression/index'
-    ],
+import serverConfig from 'intern/dojo/node!./server_config';
 
-    excludeInstrumentation: /.*/,
+export default Object.assign({
+  debug: true,
+  capabilities: {
+    'selenium-version': '2.53.0',
+    // must match URL in tasks/config/downloadSelenium.js
+    'idle-timeout': 99
+  },
+  environments: [{
+    browserName: 'chrome'
+  }],
+  tunnelOptions: serverConfig.servers.webdriver,
+  functionalSuites: [
+    'test/visual_regression/index'
+  ],
 
-    defaultTimeout: 90000,
-    defaultTryTimeout: 40000, // tryForTime could include multiple 'find timeouts'
-    defaultFindTimeout: 10000  // this is how long we try to find elements on page
-  }, serverConfig);
-});
+  excludeInstrumentation: /.*/,
+
+  defaultTimeout: 90000,
+  defaultTryTimeout: 40000, // tryForTime could include multiple 'find timeouts'
+  defaultFindTimeout: 10000  // this is how long we try to find elements on page
+}, serverConfig);
diff --git a/test/mocha_setup.js b/test/mocha_setup.js
index ea24360a11832..170f9f702e5cc 100644
--- a/test/mocha_setup.js
+++ b/test/mocha_setup.js
@@ -1,5 +1,5 @@
-var sinon = require('sinon');
-var autoRelease = require('auto-release-sinon');
+import sinon from 'sinon';
+import autoRelease from 'auto-release-sinon';
 
 require('babel/register')(require('../src/optimize/babel_options').node);
 
@@ -13,7 +13,7 @@ require('babel/register')(require('../src/optimize/babel_options').node);
 // The global "afterEach" variable is also tracked, and once it is assigned by mocha
 // the variable global is reconfigured to point directly to the new value (from mocha)
 // and all of the queued invocations are executed.
-var queuedAfterEachArgs = [];
+const queuedAfterEachArgs = [];
 Object.defineProperty(global, 'afterEach', {
   configurable: true,
   get() { return undefined; },
diff --git a/test/server_config.js b/test/server_config.js
index 97ecf228f0914..39f7955836adc 100644
--- a/test/server_config.js
+++ b/test/server_config.js
@@ -1,6 +1,6 @@
-var shield = require('./shield');
+import shield from './shield';
 
-var kibanaURL = '/app/kibana';
+const kibanaURL = '/app/kibana';
 
 module.exports = {
   servers: {
diff --git a/test/support/env_setup.js b/test/support/env_setup.js
index 0ced6024f85bb..f773696a3b3fe 100644
--- a/test/support/env_setup.js
+++ b/test/support/env_setup.js
@@ -1,5 +1,5 @@
-var defaults = require('lodash').defaults;
-const babelOptions = require('../../src/optimize/babel_options');
+const defaults = require('lodash').defaults;
+import babelOptions from '../../src/optimize/babel_options';
 
 require('source-map-support').install();
 require('babel/register')(defaults({
diff --git a/test/support/index.js b/test/support/index.js
index 49a0553091ee4..fe7565e39bc61 100644
--- a/test/support/index.js
+++ b/test/support/index.js
@@ -7,7 +7,6 @@ import {
   EsClient,
 } from './utils';
 import ScenarioManager from '../fixtures/scenario_manager';
-import PageObjects from './page_objects';
 
 // Intern values provided via the root index file of the test suite.
 const kbnInternVars = global.__kibana__intern__;
diff --git a/test/support/page_objects/common.js b/test/support/page_objects/common.js
index a2c11ab47859e..c3ca2884e0579 100644
--- a/test/support/page_objects/common.js
+++ b/test/support/page_objects/common.js
@@ -6,25 +6,16 @@ import bluebird, {
 import fs from 'fs';
 import _ from 'lodash';
 import mkdirp from 'mkdirp';
-import moment from 'moment';
 import path from 'path';
 import testSubjSelector from '@spalger/test-subj-selector';
 import {
   format,
   parse
 } from 'url';
-import util from 'util';
 
 import getUrl from '../../utils/get_url';
 
-import {
-  config,
-  defaultTryTimeout,
-  defaultFindTimeout,
-  remote,
-  shieldPage,
-  esClient
-} from '../index';
+import { config, defaultFindTimeout, esClient } from '../index';
 
 import PageObjects from './index';
 
@@ -40,7 +31,7 @@ export default class Common {
 
   init(remote) {
     function injectTimestampQuery(func, url) {
-      var formatted = modifyQueryString(url, function (parsed) {
+      const formatted = modifyQueryString(url, function (parsed) {
         parsed.query._t = Date.now();
       });
       return func.call(this, formatted);
@@ -56,7 +47,7 @@ export default class Common {
     }
 
     function modifyQueryString(url, func) {
-      var parsed = parse(url, true);
+      const parsed = parse(url, true);
       if (parsed.query === null) {
         parsed.query = {};
       }
@@ -80,9 +71,9 @@ export default class Common {
     return getUrl.baseUrl(config.servers.elasticsearch);
   }
 
-  navigateToApp(appName, testStatusPage) {
-    var self = this;
-    var appUrl = getUrl.noAuth(config.servers.kibana, config.apps[appName]);
+  navigateToApp(appName) {
+    const self = this;
+    const appUrl = getUrl.noAuth(config.servers.kibana, config.apps[appName]);
     self.debug('navigating to ' + appName + ' url: ' + appUrl);
 
     function navigateTo(url) {
@@ -97,7 +88,7 @@ export default class Common {
               // that change.  If we got here, fix it.
               self.debug(' >>>>>>>> WARNING Navigating to [' + appName + '] with defaultIndex=' + defaultIndex);
               self.debug(' >>>>>>>> Setting defaultIndex to "logstash-*""');
-              return esClient.updateConfigDoc({'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*'});
+              return esClient.updateConfigDoc({ 'dateFormat:tz':'UTC', 'defaultIndex':'logstash-*' });
             }
           }
         })
@@ -116,7 +107,7 @@ export default class Common {
           return self.remote.getCurrentUrl();
         })
         .then(function (currentUrl) {
-          var loginPage = new RegExp('login').test(currentUrl);
+          const loginPage = new RegExp('login').test(currentUrl);
           if (loginPage) {
             self.debug('Found loginPage username = '
               + config.servers.kibana.username);
@@ -131,7 +122,7 @@ export default class Common {
         })
         .then(function (currentUrl) {
           currentUrl = currentUrl.replace(/\/\/\w+:\w+@/, '//');
-          var maxAdditionalLengthOnNavUrl = 230;
+          const maxAdditionalLengthOnNavUrl = 230;
           // On several test failures at the end of the TileMap test we try to navigate back to
           // Visualize so we can create the next Vertical Bar Chart, but we can see from the
           // logging and the screenshot that it's still on the TileMap page. Why didn't the "get"
@@ -145,12 +136,12 @@ export default class Common {
 
           // Browsers don't show the ':port' if it's 80 or 443 so we have to
           // remove that part so we can get a match in the tests.
-          var navSuccessful = new RegExp(appUrl.replace(':80','').replace(':443','')
+          const navSuccessful = new RegExp(appUrl.replace(':80','').replace(':443','')
            + '.{0,' + maxAdditionalLengthOnNavUrl + '}$')
           .test(currentUrl);
 
           if (!navSuccessful) {
-            var msg = 'App failed to load: ' + appName +
+            const msg = 'App failed to load: ' + appName +
             ' in ' + defaultFindTimeout + 'ms' +
             ' appUrl = ' + appUrl +
             ' currentUrl = ' + currentUrl;
@@ -161,11 +152,11 @@ export default class Common {
           return currentUrl;
         });
       });
-    };
+    }
 
     return navigateTo(appUrl)
     .then(function (currentUrl) {
-      var lastUrl = currentUrl;
+      let lastUrl = currentUrl;
       return self.try(function () {
         // give the app time to update the URL
         return self.sleep(501)
@@ -184,7 +175,7 @@ export default class Common {
   }
 
   runScript(fn, timeout) {
-    var self = this;
+    const self = this;
     // by default, give the app 10 seconds to load
     timeout = timeout || 10000;
 
@@ -192,9 +183,9 @@ export default class Common {
     return self.remote
     .setExecuteAsyncTimeout(timeout)
     .executeAsync(function (done) {
-      var interval = setInterval(function () {
-        var ready = (document.readyState === 'complete');
-        var hasJQuery = !!window.$;
+      const interval = setInterval(function () {
+        const ready = (document.readyState === 'complete');
+        const hasJQuery = !!window.$;
 
         if (ready && hasJQuery) {
           console.log('doc ready, jquery loaded');
@@ -228,7 +219,7 @@ export default class Common {
   }
 
   sleep(sleepMilliseconds) {
-    var self = this;
+    const self = this;
     self.debug('... sleep(' + sleepMilliseconds + ') start');
 
     return bluebird.resolve().delay(sleepMilliseconds)
diff --git a/test/support/page_objects/console_page.js b/test/support/page_objects/console_page.js
index 4bea0fff6b633..da72be22a4518 100644
--- a/test/support/page_objects/console_page.js
+++ b/test/support/page_objects/console_page.js
@@ -1,9 +1,6 @@
 import Bluebird from 'bluebird';
 
 import PageObjects from './';
-import {
-  defaultFindTimeout,
-} from '../';
 
 async function getVisibleTextFromAceEditor(editor) {
   const lines = await editor.findAllByClassName('ace_line_group');
diff --git a/test/support/page_objects/dashboard_page.js b/test/support/page_objects/dashboard_page.js
index 426efebee0147..d4ebf272fd5d6 100644
--- a/test/support/page_objects/dashboard_page.js
+++ b/test/support/page_objects/dashboard_page.js
@@ -124,7 +124,7 @@ export default class DashboardPage {
   // use the search filter box to narrow the results down to a single
   // entry, or at least to a single page of results
   loadSavedDashboard(dashName) {
-    var self = this;
+    const self = this;
     return this.findTimeout
     .findByCssSelector('[aria-label="Open Saved Dashboard"]')
     .click()
@@ -160,7 +160,7 @@ export default class DashboardPage {
         return chart.getAttribute('title');
       }
 
-      var getTitlePromises = titleObjects.map(getTitles);
+      const getTitlePromises = titleObjects.map(getTitles);
       return Promise.all(getTitlePromises);
     });
   }
@@ -172,10 +172,10 @@ export default class DashboardPage {
     .then(function (titleObjects) {
 
       function getTitles(chart) {
-        var obj = {};
+        let obj = {};
         return chart.getAttribute('data-col')
         .then(theData => {
-          obj = {dataCol:theData};
+          obj = { dataCol:theData };
           return chart;
         })
         .then(chart => {
@@ -211,7 +211,7 @@ export default class DashboardPage {
         });
       }
 
-      var getTitlePromises = titleObjects.map(getTitles);
+      const getTitlePromises = titleObjects.map(getTitles);
       return Promise.all(getTitlePromises);
     });
   }
diff --git a/test/support/page_objects/discover_page.js b/test/support/page_objects/discover_page.js
index aed34e59c168b..f49448a34dbd6 100644
--- a/test/support/page_objects/discover_page.js
+++ b/test/support/page_objects/discover_page.js
@@ -92,7 +92,7 @@ export default class DiscoverPage {
         .getAttribute('height');
       }
 
-      var getChartDataPromises = chartData.map(getChartData);
+      const getChartDataPromises = chartData.map(getChartData);
       return Promise.all(getChartDataPromises);
     })
     .then(function (bars) {
diff --git a/test/support/page_objects/header_page.js b/test/support/page_objects/header_page.js
index 3065f7b1c13f2..9edf8fd042eda 100644
--- a/test/support/page_objects/header_page.js
+++ b/test/support/page_objects/header_page.js
@@ -73,7 +73,7 @@ export default class HeaderPage {
   }
 
   clickGoButton() {
-    var self = this;
+    const self = this;
     return this.remote.setFindTimeout(defaultFindTimeout)
     .findByClassName('kbn-timepicker-go')
     .click()
diff --git a/test/support/page_objects/settings_page.js b/test/support/page_objects/settings_page.js
index eb3ed431ae7a9..20ce137447b36 100644
--- a/test/support/page_objects/settings_page.js
+++ b/test/support/page_objects/settings_page.js
@@ -37,7 +37,7 @@ export default class SettingsPage {
   }
 
   setAdvancedSettings(propertyName, propertyValue) {
-    var self = this;
+    const self = this;
 
     return PageObjects.common.findTestSubject('advancedSetting-' + propertyName + '-editButton')
     .click()
@@ -47,7 +47,7 @@ export default class SettingsPage {
     .then(() => {
       return PageObjects.common.sleep(1000);
     })
-    .then(function setAdvancedSettingsClickPropertyValue(selectList) {
+    .then(function setAdvancedSettingsClickPropertyValue() {
       return self.remote.setFindTimeout(defaultFindTimeout)
       .findByCssSelector('option[label="' + propertyValue + '"]')
       .click();
@@ -65,7 +65,6 @@ export default class SettingsPage {
   }
 
   getAdvancedSettings(propertyName) {
-    var self = this;
     PageObjects.common.debug('in setAdvancedSettings');
     return PageObjects.common.findTestSubject('advancedSetting-' + propertyName + '-currentValue')
     .getVisibleText();
@@ -173,7 +172,7 @@ export default class SettingsPage {
         });
       }
 
-      var getChartTypesPromises = chartTypes.map(getChartType);
+      const getChartTypesPromises = chartTypes.map(getChartType);
       return Bluebird.all(getChartTypesPromises);
     });
   }
@@ -188,8 +187,8 @@ export default class SettingsPage {
   }
 
   getFieldsTabCount() {
-    var self = this;
-    var selector = 'li.kbn-management-tab.active a small';
+    const self = this;
+    const selector = 'li.kbn-management-tab.active a small';
 
     return PageObjects.common.try(function () {
       return self.remote.setFindTimeout(defaultFindTimeout / 10)
@@ -202,12 +201,12 @@ export default class SettingsPage {
   }
 
   getPageSize() {
-    var selectedItemLabel = '';
+    let selectedItemLabel = '';
     return this.remote.setFindTimeout(defaultFindTimeout)
     .findAllByCssSelector('select.ng-pristine.ng-valid.ng-untouched option')
     .then(function (chartTypes) {
       function getChartType(chart) {
-        var thisChart = chart;
+        const thisChart = chart;
         return chart.isSelected()
         .then(function (isSelected) {
           if (isSelected === true) {
@@ -219,7 +218,7 @@ export default class SettingsPage {
         });
       }
 
-      var getChartTypesPromises = chartTypes.map(getChartType);
+      const getChartTypesPromises = chartTypes.map(getChartType);
       return Bluebird.all(getChartTypesPromises);
     })
     .then(() => {
@@ -334,7 +333,7 @@ export default class SettingsPage {
   }
 
   removeIndexPattern() {
-    var alertText;
+    let alertText;
 
     return PageObjects.common.try(() => {
       PageObjects.common.debug('click delete index pattern button');
diff --git a/test/support/page_objects/shield_page.js b/test/support/page_objects/shield_page.js
index 5840169cdba02..a6d2ae956e8cb 100644
--- a/test/support/page_objects/shield_page.js
+++ b/test/support/page_objects/shield_page.js
@@ -10,7 +10,7 @@ export default class ShieldPage {
   }
 
   login(user, pwd) {
-    var remote = this.remote;
+    const remote = this.remote;
     return remote.setFindTimeout(defaultFindTimeout)
     .findById('username')
     .type(user)
diff --git a/test/support/page_objects/visualize_page.js b/test/support/page_objects/visualize_page.js
index e92288c0232e4..8cb35bc0cc076 100644
--- a/test/support/page_objects/visualize_page.js
+++ b/test/support/page_objects/visualize_page.js
@@ -83,7 +83,7 @@ export default class VisualizePage {
       function getChartType(chart) {
         return chart.getVisibleText();
       }
-      var getChartTypesPromises = chartTypes.map(getChartType);
+      const getChartTypesPromises = chartTypes.map(getChartType);
       return Promise.all(getChartTypesPromises);
     })
     .then(function (texts) {
@@ -208,7 +208,7 @@ export default class VisualizePage {
           }
         });
       }
-      var getChartTypesPromises = chartTypes.map(getChartType);
+      const getChartTypesPromises = chartTypes.map(getChartType);
       return Promise.all(getChartTypesPromises);
     });
   }
@@ -228,7 +228,7 @@ export default class VisualizePage {
   }
 
   selectField(fieldValue) {
-    var self = this;
+    const self = this;
     return PageObjects.common.try(function tryingForTime() {
       return self.remote
       .setFindTimeout(defaultFindTimeout)
@@ -356,7 +356,7 @@ export default class VisualizePage {
   }
 
   clickVisualizationByLinkText(vizName) {
-    var self = this;
+    const self = this;
     PageObjects.common.debug('clickVisualizationByLinkText(' + vizName + ')');
 
     return PageObjects.common.try(function tryingForTime() {
@@ -370,7 +370,7 @@ export default class VisualizePage {
   // this starts by clicking the Load Saved Viz button, not from the
   // bottom half of the "Create a new visualization      Step 1" page
   loadSavedVisualization(vizName) {
-    var self = this;
+    const self = this;
     return this.clickLoadSavedVisButton()
     .then(function filterVisualization() {
       return self.openSavedVisualization(vizName);
@@ -380,7 +380,7 @@ export default class VisualizePage {
   // this is for starting on the
   // bottom half of the "Create a new visualization      Step 1" page
   openSavedVisualization(vizName) {
-    var self = this;
+    const self = this;
     return self.filterVisByName(vizName)
     .then(() => {
       return PageObjects.common.sleep(1000);
@@ -399,7 +399,7 @@ export default class VisualizePage {
         return chart
         .getVisibleText();
       }
-      var getChartTypesPromises = chartTypes.map(getChartType);
+      const getChartTypesPromises = chartTypes.map(getChartType);
       return Promise.all(getChartTypesPromises);
     })
     .then(texts => {
@@ -418,7 +418,7 @@ export default class VisualizePage {
         return chart
         .getVisibleText();
       }
-      var getChartTypesPromises = chartTypes.map(getChartType);
+      const getChartTypesPromises = chartTypes.map(getChartType);
       return Promise.all(getChartTypesPromises);
     })
     .then(texts => {
@@ -433,14 +433,12 @@ export default class VisualizePage {
    ** Returns an array of height values
    */
   getAreaChartData(aggregateName) {
-
-    var self = this.remote;
-    var chartData = [];
-    var tempArray = [];
-    var chartSections = 0;
-    var height = 0;
-    var yAxisLabel = 0;
-    var yAxisHeight = 0;
+    const self = this.remote;
+    const chartData = [];
+    let tempArray = [];
+    let chartSections = 0;
+    let yAxisLabel = 0;
+    let yAxisHeight = 0;
 
     // 1). get the maximim chart Y-Axis marker value
     return this.remote
@@ -479,7 +477,7 @@ export default class VisualizePage {
       tempArray = data.replace('M','').split('L');
       chartSections = tempArray.length / 2;
       PageObjects.common.debug('chartSections = ' + chartSections + ' height = ' + yAxisHeight + ' yAxisLabel = ' + yAxisLabel);
-      for (var i = 0; i < chartSections; i++) {
+      for (let i = 0; i < chartSections; i++) {
         chartData[i] = Math.round((yAxisHeight - tempArray[i].split(',')[1]) / yAxisHeight * yAxisLabel);
         PageObjects.common.debug('chartData[i] =' + chartData[i]);
       }
@@ -490,9 +488,9 @@ export default class VisualizePage {
 
   // The current test shows dots, not a line.  This function gets the dots and normalizes their height.
   getLineChartData(cssPart) {
-    var self = this.remote;
-    var yAxisLabel = 0;
-    var yAxisHeight;
+    const self = this.remote;
+    let yAxisLabel = 0;
+    let yAxisHeight;
 
     // 1). get the maximim chart Y-Axis marker value
     return this.remote
@@ -540,7 +538,7 @@ export default class VisualizePage {
           }
 
           // 4). pass the chartTypes to the getChartType function
-          var getChartTypesPromises = chartTypes.map(getChartType);
+          const getChartTypesPromises = chartTypes.map(getChartType);
           return Promise.all(getChartTypesPromises);
         });
       })
@@ -553,9 +551,9 @@ export default class VisualizePage {
 
   // this is ALMOST identical to DiscoverPage.getBarChartData
   getBarChartData() {
-    var self = this.remote;
-    var yAxisLabel = 0;
-    var yAxisHeight;
+    const self = this.remote;
+    let yAxisLabel = 0;
+    let yAxisHeight;
 
     // 1). get the maximim chart Y-Axis marker value
     return this.remote
@@ -606,7 +604,7 @@ export default class VisualizePage {
             }
           });
         }
-        var getChartTypesPromises = chartTypes.map(getChartType);
+        const getChartTypesPromises = chartTypes.map(getChartType);
         return Promise.all(getChartTypesPromises);
       })
       .then(function (bars) {
@@ -629,7 +627,7 @@ export default class VisualizePage {
           return slice;
         });
       }
-      var getChartTypesPromises = chartTypes.map(getChartType);
+      const getChartTypesPromises = chartTypes.map(getChartType);
       return Promise.all(getChartTypesPromises);
     })
     .then(function (slices) {
@@ -673,7 +671,7 @@ export default class VisualizePage {
   }
 
   waitForToastMessageGone() {
-    var self = this;
+    const self = this;
     return PageObjects.common.try(function tryingForTime() {
       return self.remote
       .setFindTimeout(100)
@@ -745,8 +743,8 @@ export default class VisualizePage {
     .then((chartTypes) => {
 
       function getChartType(chart) {
-        var color;
-        var radius;
+        let color;
+        let radius;
         return chart.getAttribute('stroke')
         .then((stroke) => {
           color = stroke;
@@ -760,10 +758,10 @@ export default class VisualizePage {
           radius = Math.round(radius);
         })
         .then(() => {
-          return {color: color, radius: radius};
+          return { color: color, radius: radius };
         });
       }
-      var getChartTypesPromises = chartTypes.map(getChartType);
+      const getChartTypesPromises = chartTypes.map(getChartType);
       return Promise.all(getChartTypesPromises);
     })
     .then((circles) => {
diff --git a/test/support/utils/elastic_dump.js b/test/support/utils/elastic_dump.js
index e019a4497e717..ce788536c50f9 100644
--- a/test/support/utils/elastic_dump.js
+++ b/test/support/utils/elastic_dump.js
@@ -3,12 +3,10 @@ import {
   Log,
 } from './';
 
+import url from 'url';
+
 export default (function () {
-  var util = require('util');
-  var path = require('path');
-  var url = require('url');
-  var resolve = require('path').resolve;
-  var Elasticdump = require('elasticdump').elasticdump;
+  const Elasticdump = require('elasticdump').elasticdump;
 
   function ElasticDump() {
   }
@@ -22,7 +20,7 @@ export default (function () {
     */
     elasticdumpModule: function elasticdumpModule(myinput, myoutput, index, mytype) {
 
-      var options = {
+      const options = {
         limit:           100,
         offset:          0,
         debug:           false,
@@ -46,13 +44,13 @@ export default (function () {
         skip:            null,
         toLog:           null,
       };
-      var dumper = new Elasticdump(options.input, options.output, options);
+      const dumper = new Elasticdump(options.input, options.output, options);
 
       dumper.on('log',   function (message) { Log.debug(message); });
       dumper.on('error', function (error)   { Log.debug('error', 'Error Emitted => ' + (error.message || JSON.stringify(error))); });
 
-      var promise = new Promise(function (resolve, reject) {
-        dumper.dump(function (error, totalWrites) {
+      const promise = new Promise(function (resolve, reject) {
+        dumper.dump(function (error) {
           if (error) {
             Log.debug('THERE WAS AN ERROR :-(');
             reject(Error(error));
@@ -72,7 +70,7 @@ export default (function () {
     ** Fails if the files already exist, so consider appending a timestamp to filename.
     */
     elasticDump: function elasticDump(index, file) {
-      var self = this;
+      const self = this;
       Log.debug('Dumping mapping from ' + url.format(config.servers.elasticsearch) + '/' + index
         + ' to (' + file + '.mapping.json)');
       return this.elasticdumpModule(url.format(config.servers.elasticsearch),
@@ -94,7 +92,7 @@ export default (function () {
     elasticLoad: function elasticLoad(file, index) {
       // TODO: should we have a flag to delete the index first?
       // or use scenarioManager.unload(index) ? <<- currently this
-      var self = this;
+      const self = this;
       Log.debug('Loading mapping (test/fixtures/dump_data/' + file + '.mapping.json) into '
         + url.format(config.servers.elasticsearch) + '/' + index);
       return this.elasticdumpModule('test/fixtures/dump_data/' + file + '.mapping.json',
diff --git a/test/support/utils/es_client.js b/test/support/utils/es_client.js
index 1edbaefe0a27d..9902f088ee836 100644
--- a/test/support/utils/es_client.js
+++ b/test/support/utils/es_client.js
@@ -4,11 +4,10 @@ import {
   Try,
 } from './';
 
-export default (function () {
-
-  var elasticsearch = require('elasticsearch');
-  var Promise = require('bluebird');
+import elasticsearch from 'elasticsearch';
+import Promise from 'bluebird';
 
+export default (function () {
   function EsClient(server) {
     if (!server) throw new Error('No server defined');
 
@@ -50,7 +49,7 @@ export default (function () {
     ** Also used after deleting .kibana index to know Kibana has recreated it.
     */
     getConfigId: function () {
-      var configId;
+      let configId;
 
       return this.client.search({
         index: '.kibana',
@@ -78,7 +77,7 @@ export default (function () {
     ** Gets defaultIndex from the config doc.
     */
     getDefaultIndex: function () {
-      var defaultIndex;
+      let defaultIndex;
 
       return this.client.search({
         index: '.kibana',
@@ -108,9 +107,8 @@ export default (function () {
     */
     updateConfigDoc: function (docMap) {
       // first we need to get the config doc's id so we can use it in our _update call
-      var self = this;
-      var configId;
-      var docMapString = JSON.stringify(docMap);
+      const self = this;
+      const docMapString = JSON.stringify(docMap);
 
       return this.getConfigId()
       // now that we have the id, we can update
@@ -137,8 +135,7 @@ export default (function () {
     * @return {Promise} A promise that is resolved when elasticsearch has a response
     */
     deleteAndUpdateConfigDoc: function (docMap) {
-      var self = this;
-      var configId;
+      const self = this;
 
       return this.delete('.kibana')
       .then(function () {
@@ -147,7 +144,6 @@ export default (function () {
             return self.getConfigId();
           });
         } else {
-          var docMapString = JSON.stringify(docMap);
           return Try.try(function () {
             return self.updateConfigDoc(docMap);
           });
diff --git a/test/support/utils/try.js b/test/support/utils/try.js
index 6eb0b58912abb..25fb6a52b06f8 100644
--- a/test/support/utils/try.js
+++ b/test/support/utils/try.js
@@ -10,12 +10,11 @@ import Log from './log.js';
 class Try {
 
   tryForTime(timeout, block) {
-    var self = this;
-    var start = Date.now();
-    var retryDelay = 502;
-    var lastTry = 0;
-    var finalMessage;
-    var prevMessage;
+    const start = Date.now();
+    const retryDelay = 502;
+    let lastTry = 0;
+    let finalMessage;
+    let prevMessage;
 
     function attempt() {
       lastTry = Date.now();
diff --git a/test/unit/api/ingest/_field_capabilities.js b/test/unit/api/ingest/_field_capabilities.js
index e4be4a24b4930..247c32f278696 100644
--- a/test/unit/api/ingest/_field_capabilities.js
+++ b/test/unit/api/ingest/_field_capabilities.js
@@ -1,87 +1,83 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import expect from 'intern/dojo/node!expect.js';
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('field_capabilities API', function postIngest() {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('field_capabilities API', function postIngest() {
 
-      bdd.before(function () {
+    bdd.before(function () {
+      return scenarioManager.client.create({
+        index: 'foo-1',
+        type: 'bar',
+        id: '1',
+        body: {
+          foo: 'bar'
+        }
+      })
+      .then(function () {
         return scenarioManager.client.create({
-          index: 'foo-1',
+          index: 'foo-2',
           type: 'bar',
-          id: '1',
+          id: '2',
           body: {
-            foo: 'bar'
+            baz: 'bar'
           }
-        })
-        .then(function () {
-          return scenarioManager.client.create({
-            index: 'foo-2',
-            type: 'bar',
-            id: '2',
-            body: {
-              baz: 'bar'
-            }
-          });
-        })
-        .then(function () {
-          return scenarioManager.client.indices.refresh({
-            index: ['foo-1', 'foo-2']
-          });
         });
-      });
-
-      bdd.after(function () {
-        return scenarioManager.reload('emptyKibana')
-        .then(function () {
-          scenarioManager.client.indices.delete({
-            index: 'foo*'
-          });
+      })
+      .then(function () {
+        return scenarioManager.client.indices.refresh({
+          index: ['foo-1', 'foo-2']
         });
       });
+    });
 
-      bdd.it('should return searchable/aggregatable flags for fields in the indices specified', function () {
-        return request.get('/kibana/foo-1/field_capabilities')
-        .expect(200)
-        .then(function (response) {
-          var fields = response.body.fields;
-          expect(fields.foo).to.eql({searchable: true, aggregatable: false});
-          expect(fields['foo.keyword']).to.eql({searchable: true, aggregatable: true});
-          expect(fields).to.not.have.property('baz');
+    bdd.after(function () {
+      return scenarioManager.reload('emptyKibana')
+      .then(function () {
+        scenarioManager.client.indices.delete({
+          index: 'foo*'
         });
       });
+    });
 
-      bdd.it('should accept wildcards in the index name', function () {
-        return request.get('/kibana/foo-*/field_capabilities')
-        .expect(200)
-        .then(function (response) {
-          var fields = response.body.fields;
-          expect(fields.foo).to.eql({searchable: true, aggregatable: false});
-          expect(fields.baz).to.eql({searchable: true, aggregatable: false});
-        });
+    bdd.it('should return searchable/aggregatable flags for fields in the indices specified', function () {
+      return request.get('/kibana/foo-1/field_capabilities')
+      .expect(200)
+      .then(function (response) {
+        const fields = response.body.fields;
+        expect(fields.foo).to.eql({ searchable: true, aggregatable: false });
+        expect(fields['foo.keyword']).to.eql({ searchable: true, aggregatable: true });
+        expect(fields).to.not.have.property('baz');
       });
+    });
 
-      bdd.it('should accept comma delimited lists of indices', function () {
-        return request.get('/kibana/foo-1,foo-2/field_capabilities')
-        .expect(200)
-        .then(function (response) {
-          var fields = response.body.fields;
-          expect(fields.foo).to.eql({searchable: true, aggregatable: false});
-          expect(fields.baz).to.eql({searchable: true, aggregatable: false});
-        });
+    bdd.it('should accept wildcards in the index name', function () {
+      return request.get('/kibana/foo-*/field_capabilities')
+      .expect(200)
+      .then(function (response) {
+        const fields = response.body.fields;
+        expect(fields.foo).to.eql({ searchable: true, aggregatable: false });
+        expect(fields.baz).to.eql({ searchable: true, aggregatable: false });
       });
+    });
 
-      bdd.it('should return 404 if a pattern matches no indices', function () {
-        return request.post('/kibana/doesnotexist-*/field_capabilities')
-        .expect(404);
+    bdd.it('should accept comma delimited lists of indices', function () {
+      return request.get('/kibana/foo-1,foo-2/field_capabilities')
+      .expect(200)
+      .then(function (response) {
+        const fields = response.body.fields;
+        expect(fields.foo).to.eql({ searchable: true, aggregatable: false });
+        expect(fields.baz).to.eql({ searchable: true, aggregatable: false });
       });
+    });
 
-      bdd.it('should return 404 if a concrete index does not exist', function () {
-        return request.post('/kibana/concrete/field_capabilities')
-        .expect(404);
-      });
+    bdd.it('should return 404 if a pattern matches no indices', function () {
+      return request.post('/kibana/doesnotexist-*/field_capabilities')
+      .expect(404);
+    });
 
+    bdd.it('should return 404 if a concrete index does not exist', function () {
+      return request.post('/kibana/concrete/field_capabilities')
+      .expect(404);
     });
-  };
-});
+
+  });
+}
diff --git a/test/unit/api/ingest/_processors.js b/test/unit/api/ingest/_processors.js
index ecb0c43d7b688..592ca4871b187 100644
--- a/test/unit/api/ingest/_processors.js
+++ b/test/unit/api/ingest/_processors.js
@@ -1,19 +1,16 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import _ from 'intern/dojo/node!lodash';
+import expect from 'intern/dojo/node!expect.js';
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('processors', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('processors', () => {
 
-      bdd.it('should return 200 for a successful run', function () {
-        return request.get('/kibana/ingest/processors')
-        .expect(200)
-        .then((response) => {
-          expect(_.isArray(response.body)).to.be(true);
-        });
+    bdd.it('should return 200 for a successful run', function () {
+      return request.get('/kibana/ingest/processors')
+      .expect(200)
+      .then((response) => {
+        expect(_.isArray(response.body)).to.be(true);
       });
-
     });
-  };
-});
+
+  });
+}
diff --git a/test/unit/api/ingest/_simulate.js b/test/unit/api/ingest/_simulate.js
index 7b8daf3c0fe7c..2e0f5d03b57cb 100644
--- a/test/unit/api/ingest/_simulate.js
+++ b/test/unit/api/ingest/_simulate.js
@@ -1,157 +1,153 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var createTestData = require('intern/dojo/node!../../../unit/api/ingest/data');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
-
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'set',
-      target_field: 'foo',
-      value: 'bar'
-    }],
-    input: {}
-  };
-
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate', function simulatePipeline() {
-
-      bdd.it('should return 400 for an invalid payload', function invalidPayload() {
-
-        return Promise.all([
-          request.post('/kibana/ingest/simulate').expect(400),
-
-          request.post('/kibana/ingest/simulate')
-          .send({})
-          .expect(400),
-
-          // requires at least one processor
-          request.post('/kibana/ingest/simulate')
-          .send({input: {}, processors: []})
-          .expect(400),
-
-          // All processors must have a processorId property and a typeId property
-          request.post('/kibana/ingest/simulate')
-          .send({input: {}, processors: [{}]})
-          .expect(400),
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
+
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'set',
+    target_field: 'foo',
+    value: 'bar'
+  }],
+  input: {}
+};
+
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate', function simulatePipeline() {
+
+    bdd.it('should return 400 for an invalid payload', function invalidPayload() {
+
+      return Promise.all([
+        request.post('/kibana/ingest/simulate').expect(400),
+
+        request.post('/kibana/ingest/simulate')
+        .send({})
+        .expect(400),
+
+        // requires at least one processor
+        request.post('/kibana/ingest/simulate')
+        .send({ input: {}, processors: [] })
+        .expect(400),
+
+        // All processors must have a processorId property and a typeId property
+        request.post('/kibana/ingest/simulate')
+        .send({ input: {}, processors: [{}] })
+        .expect(400),
+
+        request.post('/kibana/ingest/simulate')
+        .send({ input: {}, processors: ['foo'] })
+        .expect(400),
+
+        request.post('/kibana/ingest/simulate')
+        .send({ input: {}, processors: 'foo' })
+        .expect(400)
+      ]);
+    });
 
-          request.post('/kibana/ingest/simulate')
-          .send({input: {}, processors: ['foo']})
-          .expect(400),
+    bdd.it('should return 200 for a successful run', function () {
+      return request.post('/kibana/ingest/simulate')
+      .send(testPipeline)
+      .expect(200);
+    });
 
-          request.post('/kibana/ingest/simulate')
-          .send({input: {}, processors: 'foo'})
-          .expect(400)
-        ]);
+    bdd.describe('compilation errors', function simulatePipeline() {
+      const pipeline = {
+        input: { foo: '[message]' },
+        processors: [
+          {
+            processor_id: 'processor1',
+            type_id: 'set',
+            target_field: 'foo',
+            value: 'bar'
+          },
+          {
+            processor_id: 'processor2',
+            type_id: 'gsub',
+            source_field: 'foo',
+            pattern: '[',
+            replacement: '<'
+          },
+          {
+            processor_id: 'processor3',
+            type_id: 'set',
+            target_field: 'bar',
+            value: 'baz'
+          }
+        ]
+      };
+
+      bdd.it('should return a 200 for a compile error caused by a processor', function () {
+        request.post('/kibana/ingest/simulate')
+        .send(pipeline)
+        .expect(200)
+        .then((response) => {
+          expect(response.body[0].processor_id).to.be('processor2');
+          expect(response.body[0].error.compile).to.be(true);
+        });
       });
 
-      bdd.it('should return 200 for a successful run', function () {
-        return request.post('/kibana/ingest/simulate')
-        .send(testPipeline)
-        .expect(200);
+      bdd.it('should only return a result for the processor that threw the error', function () {
+        request.post('/kibana/ingest/simulate')
+        .send(pipeline)
+        .expect(200)
+        .then((response) => {
+          expect(response.body[0].processor_id).to.be('processor2');
+          expect(response.body[0].error.compile).to.be(true);
+          expect(response.body.length).to.be(1);
+        });
       });
+    });
 
-      bdd.describe('compilation errors', function simulatePipeline() {
-        const pipeline = {
-          input: { foo: '[message]' },
-          processors: [
-            {
-              processor_id: 'processor1',
-              type_id: 'set',
-              target_field: 'foo',
-              value: 'bar'
-            },
-            {
-              processor_id: 'processor2',
-              type_id: 'gsub',
-              source_field: 'foo',
-              pattern: '[',
-              replacement: '<'
-            },
-            {
-              processor_id: 'processor3',
-              type_id: 'set',
-              target_field: 'bar',
-              value: 'baz'
-            }
-          ]
-        };
-
-        bdd.it('should return a 200 for a compile error caused by a processor', function () {
+    bdd.describe('data errors', function simulatePipeline() {
+      const pipeline = {
+        input: { foo: '[message]' },
+        processors: [
+          {
+            processor_id: 'processor1',
+            type_id: 'set',
+            target_field: 'foo',
+            value: 'bar'
+          },
+          {
+            processor_id: 'processor2',
+            type_id: 'gsub',
+            source_field: '', //invalid source field
+            pattern: '\\[',
+            replacement: '<'
+          },
+          {
+            processor_id: 'processor3',
+            type_id: 'set',
+            target_field: 'bar',
+            value: 'baz'
+          }
+        ]
+      };
+
+      bdd.it('should return 200 with non-compile error object for a processor with an invalid source_field', () => {
+        return Promise.all([
           request.post('/kibana/ingest/simulate')
           .send(pipeline)
           .expect(200)
           .then((response) => {
-            expect(response.body[0].processor_id).to.be('processor2');
-            expect(response.body[0].error.compile).to.be(true);
-          });
-        });
+            expect(response.body[0].error).to.be(undefined);
+            expect(response.body[1].error.compile).to.be(false);
+            expect(response.body[1].processor_id).to.be('processor2');
+          })
+        ]);
+      });
 
-        bdd.it('should only return a result for the processor that threw the error', function () {
+      bdd.it('should return results up to and including the erroring processor', () => {
+        return Promise.all([
           request.post('/kibana/ingest/simulate')
           .send(pipeline)
           .expect(200)
           .then((response) => {
-            expect(response.body[0].processor_id).to.be('processor2');
-            expect(response.body[0].error.compile).to.be(true);
-            expect(response.body.length).to.be(1);
-          });
-        });
-      });
-
-      bdd.describe('data errors', function simulatePipeline() {
-        const pipeline = {
-          input: { foo: '[message]' },
-          processors: [
-            {
-              processor_id: 'processor1',
-              type_id: 'set',
-              target_field: 'foo',
-              value: 'bar'
-            },
-            {
-              processor_id: 'processor2',
-              type_id: 'gsub',
-              source_field: '', //invalid source field
-              pattern: '\\[',
-              replacement: '<'
-            },
-            {
-              processor_id: 'processor3',
-              type_id: 'set',
-              target_field: 'bar',
-              value: 'baz'
-            }
-          ]
-        };
-
-        bdd.it('should return 200 with non-compile error object for a processor with an invalid source_field', () => {
-          return Promise.all([
-            request.post('/kibana/ingest/simulate')
-            .send(pipeline)
-            .expect(200)
-            .then((response) => {
-              expect(response.body[0].error).to.be(undefined);
-              expect(response.body[1].error.compile).to.be(false);
-              expect(response.body[1].processor_id).to.be('processor2');
-            })
-          ]);
-        });
-
-        bdd.it('should return results up to and including the erroring processor', () => {
-          return Promise.all([
-            request.post('/kibana/ingest/simulate')
-            .send(pipeline)
-            .expect(200)
-            .then((response) => {
-              expect(response.body.length).to.be(2);
-            })
-          ]);
-        });
-
+            expect(response.body.length).to.be(2);
+          })
+        ]);
       });
 
     });
-  };
-});
+
+  });
+}
diff --git a/test/unit/api/ingest/index.js b/test/unit/api/ingest/index.js
index b5f09ecc01aa6..6ca2c2abcfa83 100644
--- a/test/unit/api/ingest/index.js
+++ b/test/unit/api/ingest/index.js
@@ -1,31 +1,27 @@
-define(function (require) {
-  var bdd = require('intern!bdd');
-  var serverConfig = require('intern/dojo/node!../../../server_config');
-  var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenario_manager');
-  var request = require('intern/dojo/node!supertest-as-promised');
-  var url = require('intern/dojo/node!url');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
-  var simulate = require('./_simulate');
-  var processors = require('./_processors');
-  var processorTypes = require('./processors/index');
-  var fieldCapabilities = require('./_field_capabilities');
+import bdd from 'intern!bdd';
+import serverConfig from 'intern/dojo/node!../../../server_config';
+import ScenarioManager from 'intern/dojo/node!../../../fixtures/scenario_manager';
+let request = require('intern/dojo/node!supertest-as-promised');
+import url from 'intern/dojo/node!url';
+import simulate from './_simulate';
+import processors from './_processors';
+import processorTypes from './processors/index';
+import fieldCapabilities from './_field_capabilities';
 
-  bdd.describe('ingest API', function () {
-    var scenarioManager = new ScenarioManager(url.format(serverConfig.servers.elasticsearch));
-    request = request(url.format(serverConfig.servers.kibana) + '/api');
+bdd.describe('ingest API', function () {
+  const scenarioManager = new ScenarioManager(url.format(serverConfig.servers.elasticsearch));
+  request = request(url.format(serverConfig.servers.kibana) + '/api');
 
-    bdd.before(function () {
-      return scenarioManager.load('emptyKibana');
-    });
-
-    bdd.after(function () {
-      return scenarioManager.unload('emptyKibana');
-    });
+  bdd.before(function () {
+    return scenarioManager.load('emptyKibana');
+  });
 
-    simulate(bdd, scenarioManager, request);
-    processors(bdd, scenarioManager, request);
-    processorTypes(bdd, scenarioManager, request);
-    fieldCapabilities(bdd, scenarioManager, request);
+  bdd.after(function () {
+    return scenarioManager.unload('emptyKibana');
   });
+
+  simulate(bdd, scenarioManager, request);
+  processors(bdd, scenarioManager, request);
+  processorTypes(bdd, scenarioManager, request);
+  fieldCapabilities(bdd, scenarioManager, request);
 });
diff --git a/test/unit/api/ingest/processors/_append.js b/test/unit/api/ingest/processors/_append.js
index 238cac6b9ee24..5c606e269df3d 100644
--- a/test/unit/api/ingest/processors/_append.js
+++ b/test/unit/api/ingest/processors/_append.js
@@ -1,67 +1,64 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'append',
-      target_field: 'foo',
-      values: [ 'value1', 'value2' ]
-    }],
-    input: {}
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'append',
+    target_field: 'foo',
+    values: [ 'value1', 'value2' ]
+  }],
+  input: {}
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - append processor', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - append processor', () => {
 
-      bdd.it('should return 400 for an invalid payload', () => {
-        return Promise.all([
-          // Append processor requires targetField property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            input: {},
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'append',
-              values: [ 'value1', 'value2' ],
-              target_field: 42
-            }]
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(response.body[0].output.foo).to.be.eql([ 'value1', 'value2' ]);
-          });
-      });
-
-      bdd.it('should enforce snake case', () => {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', () => {
+      return Promise.all([
+        // Append processor requires targetField property
+        request.post('/kibana/ingest/simulate')
         .send({
+          input: {},
           processors: [{
-            processorId: 'processor1',
-            typeId: 'append',
-            targetField: 'foo',
-            value: [ 'value1', 'value2' ]
-          }],
-          input: {}
+            processor_id: 'processor1',
+            type_id: 'append',
+            values: [ 'value1', 'value2' ],
+            target_field: 42
+          }]
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
 
+    bdd.it('should return 200 for a valid simulate request', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
     });
-  };
-});
+
+    bdd.it('should return a simulated output with the correct result for the given processor', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(response.body[0].output.foo).to.be.eql([ 'value1', 'value2' ]);
+        });
+    });
+
+    bdd.it('should enforce snake case', () => {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'append',
+          targetField: 'foo',
+          value: [ 'value1', 'value2' ]
+        }],
+        input: {}
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_convert.js b/test/unit/api/ingest/processors/_convert.js
index 38a07d3507766..349f17dd44a72 100644
--- a/test/unit/api/ingest/processors/_convert.js
+++ b/test/unit/api/ingest/processors/_convert.js
@@ -1,70 +1,67 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'convert',
-      source_field: 'foo',
-      target_field: 'foo',
-      type: 'auto'
-    }],
-    input: { foo: '1234' }
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'convert',
+    source_field: 'foo',
+    target_field: 'foo',
+    type: 'auto'
+  }],
+  input: { foo: '1234' }
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - convert processor', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - convert processor', () => {
 
-      bdd.it('should return 400 for an invalid payload', () => {
-        return Promise.all([
-          // Convert processor requires source_field property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            input: {},
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'convert',
-              value: 'auto',
-              source_field: 42,
-              target_field: 'foo'
-            }]
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', function () {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(response.body[0].output.foo).to.be(1234);
-          });
-      });
-
-      bdd.it('should enforce snake case', () => {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', () => {
+      return Promise.all([
+        // Convert processor requires source_field property
+        request.post('/kibana/ingest/simulate')
         .send({
+          input: {},
           processors: [{
-            processorId: 'processor1',
-            typeId: 'convert',
-            sourceField: 'foo',
-            targetField: 'foo',
-            type: 'string'
-          }],
-          input: {}
+            processor_id: 'processor1',
+            type_id: 'convert',
+            value: 'auto',
+            source_field: 42,
+            target_field: 'foo'
+          }]
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
 
+    bdd.it('should return 200 for a valid simulate request', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
     });
-  };
-});
+
+    bdd.it('should return a simulated output with the correct result for the given processor', function () {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(response.body[0].output.foo).to.be(1234);
+        });
+    });
+
+    bdd.it('should enforce snake case', () => {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'convert',
+          sourceField: 'foo',
+          targetField: 'foo',
+          type: 'string'
+        }],
+        input: {}
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_date.js b/test/unit/api/ingest/processors/_date.js
index a3e018e4bd885..bb82f92a41d9a 100644
--- a/test/unit/api/ingest/processors/_date.js
+++ b/test/unit/api/ingest/processors/_date.js
@@ -1,89 +1,86 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
-  var moment = require('intern/dojo/node!moment');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
+import moment from 'intern/dojo/node!moment';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'date',
-      source_field: 'dob',
-      target_field: 'dob',
-      formats: ['Custom'],
-      timezone: 'Etc/UTC',
-      locale: 'ENGLISH',
-      custom_format: 'MM/dd/yyyy'
-    }],
-    input: { dob: '07/05/1979' }
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'date',
+    source_field: 'dob',
+    target_field: 'dob',
+    formats: ['Custom'],
+    timezone: 'Etc/UTC',
+    locale: 'ENGLISH',
+    custom_format: 'MM/dd/yyyy'
+  }],
+  input: { dob: '07/05/1979' }
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - date processor', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - date processor', () => {
 
-      bdd.it('should return 400 for an invalid payload', () => {
-        return Promise.all([
-          // Date processor requires source_field property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            input: { dob: '07/05/1979' },
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'date',
-              source_field: 42,
-              target_field: 'dob',
-              formats: 'Custom',
-              timezone: 'Etc/UTC',
-              locale: 'ENGLISH',
-              custom_format: 'MM/dd/yyyy'
-            }]
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', function () {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(response.body[0].output.dob).to.be('1979-07-05T00:00:00.000Z');
-          });
-      });
-
-      bdd.it('should return a date in ISO 8601 format', function () {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(moment(response.body[0].output.dob, moment.ISO_8601).isValid()).to.be(true);
-          });
-      });
-
-      bdd.it('should enforce snake case', () => {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', () => {
+      return Promise.all([
+        // Date processor requires source_field property
+        request.post('/kibana/ingest/simulate')
         .send({
+          input: { dob: '07/05/1979' },
           processors: [{
-            processorId: 'processor1',
-            typeId: 'date',
-            sourceField: 'dob',
-            targetField: 'dob',
-            formats: ['Custom'],
+            processor_id: 'processor1',
+            type_id: 'date',
+            source_field: 42,
+            target_field: 'dob',
+            formats: 'Custom',
             timezone: 'Etc/UTC',
             locale: 'ENGLISH',
-            customFormat: 'MM/dd/yyyy'
-          }],
-          input: { dob: '07/05/1979' }
+            custom_format: 'MM/dd/yyyy'
+          }]
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
+
+    bdd.it('should return 200 for a valid simulate request', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
+    });
+
+    bdd.it('should return a simulated output with the correct result for the given processor', function () {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(response.body[0].output.dob).to.be('1979-07-05T00:00:00.000Z');
+        });
+    });
 
+    bdd.it('should return a date in ISO 8601 format', function () {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(moment(response.body[0].output.dob, moment.ISO_8601).isValid()).to.be(true);
+        });
     });
-  };
-});
+
+    bdd.it('should enforce snake case', () => {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'date',
+          sourceField: 'dob',
+          targetField: 'dob',
+          formats: ['Custom'],
+          timezone: 'Etc/UTC',
+          locale: 'ENGLISH',
+          customFormat: 'MM/dd/yyyy'
+        }],
+        input: { dob: '07/05/1979' }
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_geoip.js b/test/unit/api/ingest/processors/_geoip.js
index 452c3e5d8416c..5796720654316 100644
--- a/test/unit/api/ingest/processors/_geoip.js
+++ b/test/unit/api/ingest/processors/_geoip.js
@@ -1,71 +1,54 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
-
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'geoip',
-      source_field: 'ip',
-      target_field: 'geoip'
-    }],
-    input: { ip: '74.125.21.103' }
-  };
-
-
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - geoip processor', () => {
-  //TODO: These tests can be re-added when we address
-  // installing plugins for integration tests
-  // https://github.com/elastic/kibana/issues/6852
-
-  //     bdd.it('should return 400 for an invalid payload', () => {
-  //       return Promise.all([
-  //         // Geo IP processor requires source_field property
-  //         request.post('/kibana/ingest/simulate')
-  //         .send({
-  //           input: { ip: '74.125.21.103' },
-  //           processors: [{
-  //             processor_id: 'processor1',
-  //             type_id: 'geoip',
-  //             source_field: 42,
-  //             target_field: 'geoip'
-  //           }]
-  //         })
-  //         .expect(400)
-  //       ]);
-  //     });
-
-  //     bdd.it('should return 200 for a valid simulate request', () => {
-  //       return request.post('/kibana/ingest/simulate')
-  //         .send(testPipeline)
-  //         .expect(200);
-  //     });
-
-  //     bdd.it('should return a simulated output with the correct result for the given processor', () => {
-  //       return request.post('/kibana/ingest/simulate')
-  //         .send(testPipeline)
-  //         .expect(200)
-  //         .then(function (response) {
-  //           expect(response.body[0].output.geoip.city_name).to.be('Mountain View');
-  //         });
-  //     });
-
-  //     bdd.it('should enforce snake case', () => {
-  //       return request.post('/kibana/ingest/simulate')
-  //       .send({
-  //         processors: [{
-  //           processorId: 'processor1',
-  //           typeId: 'geoip',
-  //           sourceField: 'ip',
-  //           targetField: 'geoip'
-  //         }],
-  //         input: { ip: '74.125.21.103' }
-  //       })
-  //       .expect(400);
-  //     });
-
-    });
-  };
-});
+export default function (bdd) {
+  bdd.describe('simulate - geoip processor', () => {
+//TODO: These tests can be re-added when we address
+// installing plugins for integration tests
+// https://github.com/elastic/kibana/issues/6852
+
+//     bdd.it('should return 400 for an invalid payload', () => {
+//       return Promise.all([
+//         // Geo IP processor requires source_field property
+//         request.post('/kibana/ingest/simulate')
+//         .send({
+//           input: { ip: '74.125.21.103' },
+//           processors: [{
+//             processor_id: 'processor1',
+//             type_id: 'geoip',
+//             source_field: 42,
+//             target_field: 'geoip'
+//           }]
+//         })
+//         .expect(400)
+//       ]);
+//     });
+
+//     bdd.it('should return 200 for a valid simulate request', () => {
+//       return request.post('/kibana/ingest/simulate')
+//         .send(testPipeline)
+//         .expect(200);
+//     });
+
+//     bdd.it('should return a simulated output with the correct result for the given processor', () => {
+//       return request.post('/kibana/ingest/simulate')
+//         .send(testPipeline)
+//         .expect(200)
+//         .then(function (response) {
+//           expect(response.body[0].output.geoip.city_name).to.be('Mountain View');
+//         });
+//     });
+
+//     bdd.it('should enforce snake case', () => {
+//       return request.post('/kibana/ingest/simulate')
+//       .send({
+//         processors: [{
+//           processorId: 'processor1',
+//           typeId: 'geoip',
+//           sourceField: 'ip',
+//           targetField: 'geoip'
+//         }],
+//         input: { ip: '74.125.21.103' }
+//       })
+//       .expect(400);
+//     });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_grok.js b/test/unit/api/ingest/processors/_grok.js
index b1ee7d4e2de25..efbdac2bf11a6 100644
--- a/test/unit/api/ingest/processors/_grok.js
+++ b/test/unit/api/ingest/processors/_grok.js
@@ -1,72 +1,69 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'grok',
-      source_field: 'foo',
-      pattern: '%{GREEDYDATA:bar} - %{GREEDYDATA:baz}'
-    }],
-    input: { foo: 'value1 - value2' }
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'grok',
+    source_field: 'foo',
+    pattern: '%{GREEDYDATA:bar} - %{GREEDYDATA:baz}'
+  }],
+  input: { foo: 'value1 - value2' }
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - grok processor', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - grok processor', () => {
 
-      bdd.it('should return 400 for an invalid payload', () => {
-        return Promise.all([
-          // Grok processor requires source_field property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            input: {},
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'grok',
-              source_field: 123,
-              pattern: '%{GREEDYDATA:bar} - %{GREEDYDATA:baz}'
-            }],
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', function () {
-        const expected = {
-          foo: 'value1 - value2',
-          bar: 'value1',
-          baz: 'value2'
-        };
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(response.body[0].output).to.eql(expected);
-          });
-      });
-
-      bdd.it('should enforce snake case', () => {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', () => {
+      return Promise.all([
+        // Grok processor requires source_field property
+        request.post('/kibana/ingest/simulate')
         .send({
+          input: {},
           processors: [{
-            processorId: 'processor1',
-            typeId: 'grok',
-            sourceField: 'foo',
+            processor_id: 'processor1',
+            type_id: 'grok',
+            source_field: 123,
             pattern: '%{GREEDYDATA:bar} - %{GREEDYDATA:baz}'
           }],
-          input: { foo: 'value1 - value2' }
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
 
+    bdd.it('should return 200 for a valid simulate request', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
     });
-  };
-});
+
+    bdd.it('should return a simulated output with the correct result for the given processor', function () {
+      const expected = {
+        foo: 'value1 - value2',
+        bar: 'value1',
+        baz: 'value2'
+      };
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(response.body[0].output).to.eql(expected);
+        });
+    });
+
+    bdd.it('should enforce snake case', () => {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'grok',
+          sourceField: 'foo',
+          pattern: '%{GREEDYDATA:bar} - %{GREEDYDATA:baz}'
+        }],
+        input: { foo: 'value1 - value2' }
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_gsub.js b/test/unit/api/ingest/processors/_gsub.js
index 2d97067a911f1..b5197bf3a3710 100644
--- a/test/unit/api/ingest/processors/_gsub.js
+++ b/test/unit/api/ingest/processors/_gsub.js
@@ -1,70 +1,67 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'gsub',
-      source_field: 'foo',
-      pattern: 'bar',
-      replacement: 'baz'
-    }],
-    input: { foo: 'bar' }
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'gsub',
+    source_field: 'foo',
+    pattern: 'bar',
+    replacement: 'baz'
+  }],
+  input: { foo: 'bar' }
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - gsub processor', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - gsub processor', () => {
 
-      bdd.it('should return 400 for an invalid payload', () => {
-        return Promise.all([
-          // GSub processor requires targetField property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            input: { foo: 'bar' },
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'gsub',
-              source_field: 42,
-              pattern: 'bar',
-              replacement: 'baz'
-            }]
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then((response) => {
-            expect(response.body[0].output.foo).to.be.equal('baz');
-          });
-      });
-
-      bdd.it('should enforce snake case', () => {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', () => {
+      return Promise.all([
+        // GSub processor requires targetField property
+        request.post('/kibana/ingest/simulate')
         .send({
+          input: { foo: 'bar' },
           processors: [{
-            processorId: 'processor1',
-            typeId: 'gsub',
-            sourceField: 'foo',
+            processor_id: 'processor1',
+            type_id: 'gsub',
+            source_field: 42,
             pattern: 'bar',
             replacement: 'baz'
-          }],
-          input: { foo: 'bar' }
+          }]
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
 
+    bdd.it('should return 200 for a valid simulate request', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
     });
-  };
-});
+
+    bdd.it('should return a simulated output with the correct result for the given processor', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then((response) => {
+          expect(response.body[0].output.foo).to.be.equal('baz');
+        });
+    });
+
+    bdd.it('should enforce snake case', () => {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'gsub',
+          sourceField: 'foo',
+          pattern: 'bar',
+          replacement: 'baz'
+        }],
+        input: { foo: 'bar' }
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_join.js b/test/unit/api/ingest/processors/_join.js
index 7e98650fc47c1..fd7ba4a4ed16f 100644
--- a/test/unit/api/ingest/processors/_join.js
+++ b/test/unit/api/ingest/processors/_join.js
@@ -1,67 +1,64 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'join',
-      source_field: 'foo',
-      separator: ' '
-    }],
-    input: { foo: ['value1', 'value2'] }
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'join',
+    source_field: 'foo',
+    separator: ' '
+  }],
+  input: { foo: ['value1', 'value2'] }
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - join processor', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - join processor', () => {
 
-      bdd.it('should return 400 for an invalid payload', () => {
-        return Promise.all([
-          // processor requires source_field property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'join',
-              source_field: 1234,
-              separator: ' '
-            }],
-            input: { foo: ['value1', 'value2'] }
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', function () {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(response.body[0].output.foo).to.be('value1 value2');
-          });
-      });
-
-      bdd.it('should enforce snake case', () => {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', () => {
+      return Promise.all([
+        // processor requires source_field property
+        request.post('/kibana/ingest/simulate')
         .send({
           processors: [{
-            processorId: 'processor1',
-            typeId: 'join',
-            sourceField: 'foo',
+            processor_id: 'processor1',
+            type_id: 'join',
+            source_field: 1234,
             separator: ' '
           }],
           input: { foo: ['value1', 'value2'] }
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
 
+    bdd.it('should return 200 for a valid simulate request', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
     });
-  };
-});
+
+    bdd.it('should return a simulated output with the correct result for the given processor', function () {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(response.body[0].output.foo).to.be('value1 value2');
+        });
+    });
+
+    bdd.it('should enforce snake case', () => {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'join',
+          sourceField: 'foo',
+          separator: ' '
+        }],
+        input: { foo: ['value1', 'value2'] }
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_lowercase.js b/test/unit/api/ingest/processors/_lowercase.js
index 747dfb003b6c6..67178b075548c 100644
--- a/test/unit/api/ingest/processors/_lowercase.js
+++ b/test/unit/api/ingest/processors/_lowercase.js
@@ -1,64 +1,61 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'lowercase',
-      source_field: 'foo'
-    }],
-    input: { foo: 'I am Mixed Case' }
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'lowercase',
+    source_field: 'foo'
+  }],
+  input: { foo: 'I am Mixed Case' }
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - lowercase processor', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - lowercase processor', () => {
 
-      bdd.it('should return 400 for an invalid payload', () => {
-        return Promise.all([
-          // processor requires source_field property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'lowercase',
-              source_field: 1234
-            }],
-            input: { foo: 'I am Mixed Case' }
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(response.body[0].output.foo).to.be('i am mixed case');
-          });
-      });
-
-      bdd.it('should enforce snake case', () => {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', () => {
+      return Promise.all([
+        // processor requires source_field property
+        request.post('/kibana/ingest/simulate')
         .send({
           processors: [{
-            processorId: 'processor1',
-            typeId: 'lowercase',
-            sourceField: 'foo'
+            processor_id: 'processor1',
+            type_id: 'lowercase',
+            source_field: 1234
           }],
           input: { foo: 'I am Mixed Case' }
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
 
+    bdd.it('should return 200 for a valid simulate request', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
     });
-  };
-});
+
+    bdd.it('should return a simulated output with the correct result for the given processor', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(response.body[0].output.foo).to.be('i am mixed case');
+        });
+    });
+
+    bdd.it('should enforce snake case', () => {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'lowercase',
+          sourceField: 'foo'
+        }],
+        input: { foo: 'I am Mixed Case' }
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_remove.js b/test/unit/api/ingest/processors/_remove.js
index f454b79ff936b..93ef7fee979c6 100644
--- a/test/unit/api/ingest/processors/_remove.js
+++ b/test/unit/api/ingest/processors/_remove.js
@@ -1,64 +1,61 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'remove',
-      source_field: 'foo'
-    }],
-    input: { foo: 'value1', bar: 'value2' }
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'remove',
+    source_field: 'foo'
+  }],
+  input: { foo: 'value1', bar: 'value2' }
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - remove processor', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - remove processor', () => {
 
-      bdd.it('should return 400 for an invalid payload', () => {
-        return Promise.all([
-          // processor requires source_field property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'remove',
-              source_field: 1234
-            }],
-            input: { foo: 'value1', bar: 'value2' }
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(response.body[0].output).to.eql({ bar: 'value2' });
-          });
-      });
-
-      bdd.it('should enforce snake case', () => {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', () => {
+      return Promise.all([
+        // processor requires source_field property
+        request.post('/kibana/ingest/simulate')
         .send({
           processors: [{
-            processorId: 'processor1',
-            typeId: 'remove',
-            sourceField: 'foo'
+            processor_id: 'processor1',
+            type_id: 'remove',
+            source_field: 1234
           }],
           input: { foo: 'value1', bar: 'value2' }
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
 
+    bdd.it('should return 200 for a valid simulate request', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
     });
-  };
-});
+
+    bdd.it('should return a simulated output with the correct result for the given processor', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(response.body[0].output).to.eql({ bar: 'value2' });
+        });
+    });
+
+    bdd.it('should enforce snake case', () => {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'remove',
+          sourceField: 'foo'
+        }],
+        input: { foo: 'value1', bar: 'value2' }
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_rename.js b/test/unit/api/ingest/processors/_rename.js
index 3370ba6f48b45..28a5d7c9aa52e 100644
--- a/test/unit/api/ingest/processors/_rename.js
+++ b/test/unit/api/ingest/processors/_rename.js
@@ -1,67 +1,64 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'rename',
-      source_field: 'foo',
-      target_field: 'bar'
-    }],
-    input: { foo: 'value1' }
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'rename',
+    source_field: 'foo',
+    target_field: 'bar'
+  }],
+  input: { foo: 'value1' }
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - rename processor', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - rename processor', () => {
 
-      bdd.it('should return 400 for an invalid payload', () => {
-        return Promise.all([
-          // processor requires source_field property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'rename',
-              source_field: 1234,
-              target_field: 'bar'
-            }],
-            input: { foo: 'value1' }
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(response.body[0].output).to.eql({ bar: 'value1' });
-          });
-      });
-
-      bdd.it('should enforce snake case', () => {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', () => {
+      return Promise.all([
+        // processor requires source_field property
+        request.post('/kibana/ingest/simulate')
         .send({
           processors: [{
-            processorId: 'processor1',
-            typeId: 'rename',
-            sourceField: 'foo',
-            targetField: 'bar'
+            processor_id: 'processor1',
+            type_id: 'rename',
+            source_field: 1234,
+            target_field: 'bar'
           }],
           input: { foo: 'value1' }
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
 
+    bdd.it('should return 200 for a valid simulate request', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
     });
-  };
-});
+
+    bdd.it('should return a simulated output with the correct result for the given processor', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(response.body[0].output).to.eql({ bar: 'value1' });
+        });
+    });
+
+    bdd.it('should enforce snake case', () => {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'rename',
+          sourceField: 'foo',
+          targetField: 'bar'
+        }],
+        input: { foo: 'value1' }
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_set.js b/test/unit/api/ingest/processors/_set.js
index 395a29a80d5b2..208a9077e9711 100644
--- a/test/unit/api/ingest/processors/_set.js
+++ b/test/unit/api/ingest/processors/_set.js
@@ -1,67 +1,64 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'set',
-      target_field: 'foo',
-      value: 'bar'
-    }],
-    input: {}
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'set',
+    target_field: 'foo',
+    value: 'bar'
+  }],
+  input: {}
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - set processor', function simulatePipeline() {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - set processor', function simulatePipeline() {
 
-      bdd.it('should return 400 for an invalid payload', function invalidPayload() {
-        return Promise.all([
-          // Set processor requires targetField property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            input: {},
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'set',
-              value: 'bar',
-              target_field: 42
-            }]
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', function validSetSimulate() {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', function () {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(response.body[0].output.foo).to.be.equal('bar');
-          });
-      });
-
-      bdd.it('should enforce snake case', function setSimulateSnakeCase() {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', function invalidPayload() {
+      return Promise.all([
+        // Set processor requires targetField property
+        request.post('/kibana/ingest/simulate')
         .send({
+          input: {},
           processors: [{
-            processorId: 'processor1',
-            typeId: 'set',
-            targetField: 'foo',
-            value: 'bar'
-          }],
-          input: {}
+            processor_id: 'processor1',
+            type_id: 'set',
+            value: 'bar',
+            target_field: 42
+          }]
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
 
+    bdd.it('should return 200 for a valid simulate request', function validSetSimulate() {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
     });
-  };
-});
+
+    bdd.it('should return a simulated output with the correct result for the given processor', function () {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(response.body[0].output.foo).to.be.equal('bar');
+        });
+    });
+
+    bdd.it('should enforce snake case', function setSimulateSnakeCase() {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'set',
+          targetField: 'foo',
+          value: 'bar'
+        }],
+        input: {}
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_split.js b/test/unit/api/ingest/processors/_split.js
index 9e6900b0f822e..25a5fb5e59f1b 100644
--- a/test/unit/api/ingest/processors/_split.js
+++ b/test/unit/api/ingest/processors/_split.js
@@ -1,67 +1,64 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'split',
-      source_field: 'foo',
-      separator: ','
-    }],
-    input: { foo: 'foo,bar,baz' }
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'split',
+    source_field: 'foo',
+    separator: ','
+  }],
+  input: { foo: 'foo,bar,baz' }
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - split processor', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - split processor', () => {
 
-      bdd.it('should return 400 for an invalid payload', () => {
-        return Promise.all([
-          // processor requires source_field property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'split',
-              source_field: 1234,
-              separator: ','
-            }],
-            input: { foo: 'foo,bar,baz' }
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(response.body[0].output).to.eql({ foo: ['foo', 'bar', 'baz'] });
-          });
-      });
-
-      bdd.it('should enforce snake case', () => {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', () => {
+      return Promise.all([
+        // processor requires source_field property
+        request.post('/kibana/ingest/simulate')
         .send({
           processors: [{
-            processorId: 'processor1',
-            typeId: 'split',
-            sourceField: 'foo',
+            processor_id: 'processor1',
+            type_id: 'split',
+            source_field: 1234,
             separator: ','
           }],
           input: { foo: 'foo,bar,baz' }
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
 
+    bdd.it('should return 200 for a valid simulate request', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
     });
-  };
-});
+
+    bdd.it('should return a simulated output with the correct result for the given processor', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(response.body[0].output).to.eql({ foo: ['foo', 'bar', 'baz'] });
+        });
+    });
+
+    bdd.it('should enforce snake case', () => {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'split',
+          sourceField: 'foo',
+          separator: ','
+        }],
+        input: { foo: 'foo,bar,baz' }
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_trim.js b/test/unit/api/ingest/processors/_trim.js
index 1f08d5c1eb167..1e35d495e40f0 100644
--- a/test/unit/api/ingest/processors/_trim.js
+++ b/test/unit/api/ingest/processors/_trim.js
@@ -1,64 +1,61 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'trim',
-      source_field: 'foo'
-    }],
-    input: { foo: ' bar baz ' }
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'trim',
+    source_field: 'foo'
+  }],
+  input: { foo: ' bar baz ' }
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - trim processor', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - trim processor', () => {
 
-      bdd.it('should return 400 for an invalid payload', () => {
-        return Promise.all([
-          // processor requires source_field property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'trim',
-              source_field: 1234
-            }],
-            input: { foo: ' bar baz ' }
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(response.body[0].output).to.eql({ foo: 'bar baz' });
-          });
-      });
-
-      bdd.it('should enforce snake case', () => {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', () => {
+      return Promise.all([
+        // processor requires source_field property
+        request.post('/kibana/ingest/simulate')
         .send({
           processors: [{
-            processorId: 'processor1',
-            typeId: 'trim',
-            sourceField: 'foo'
+            processor_id: 'processor1',
+            type_id: 'trim',
+            source_field: 1234
           }],
           input: { foo: ' bar baz ' }
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
 
+    bdd.it('should return 200 for a valid simulate request', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
     });
-  };
-});
+
+    bdd.it('should return a simulated output with the correct result for the given processor', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(response.body[0].output).to.eql({ foo: 'bar baz' });
+        });
+    });
+
+    bdd.it('should enforce snake case', () => {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'trim',
+          sourceField: 'foo'
+        }],
+        input: { foo: ' bar baz ' }
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/_uppercase.js b/test/unit/api/ingest/processors/_uppercase.js
index c2cd5cf1b7256..c6dd68d8b95c3 100644
--- a/test/unit/api/ingest/processors/_uppercase.js
+++ b/test/unit/api/ingest/processors/_uppercase.js
@@ -1,64 +1,61 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import Promise from 'bluebird';
+import expect from 'intern/dojo/node!expect.js';
 
-  const testPipeline = {
-    processors: [{
-      processor_id: 'processor1',
-      type_id: 'uppercase',
-      source_field: 'foo'
-    }],
-    input: { foo: 'bar baz' }
-  };
+const testPipeline = {
+  processors: [{
+    processor_id: 'processor1',
+    type_id: 'uppercase',
+    source_field: 'foo'
+  }],
+  input: { foo: 'bar baz' }
+};
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('simulate - uppercase processor', () => {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('simulate - uppercase processor', () => {
 
-      bdd.it('should return 400 for an invalid payload', () => {
-        return Promise.all([
-          // processor requires source_field property
-          request.post('/kibana/ingest/simulate')
-          .send({
-            processors: [{
-              processor_id: 'processor1',
-              type_id: 'uppercase',
-              source_field: 1234
-            }],
-            input: { foo: 'bar baz' }
-          })
-          .expect(400)
-        ]);
-      });
-
-      bdd.it('should return 200 for a valid simulate request', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200);
-      });
-
-      bdd.it('should return a simulated output with the correct result for the given processor', () => {
-        return request.post('/kibana/ingest/simulate')
-          .send(testPipeline)
-          .expect(200)
-          .then(function (response) {
-            expect(response.body[0].output).to.eql({ foo: 'BAR BAZ' });
-          });
-      });
-
-      bdd.it('should enforce snake case', () => {
-        return request.post('/kibana/ingest/simulate')
+    bdd.it('should return 400 for an invalid payload', () => {
+      return Promise.all([
+        // processor requires source_field property
+        request.post('/kibana/ingest/simulate')
         .send({
           processors: [{
-            processorId: 'processor1',
-            typeId: 'uppercase',
-            sourceField: 'foo'
+            processor_id: 'processor1',
+            type_id: 'uppercase',
+            source_field: 1234
           }],
           input: { foo: 'bar baz' }
         })
-        .expect(400);
-      });
+        .expect(400)
+      ]);
+    });
 
+    bdd.it('should return 200 for a valid simulate request', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200);
     });
-  };
-});
+
+    bdd.it('should return a simulated output with the correct result for the given processor', () => {
+      return request.post('/kibana/ingest/simulate')
+        .send(testPipeline)
+        .expect(200)
+        .then(function (response) {
+          expect(response.body[0].output).to.eql({ foo: 'BAR BAZ' });
+        });
+    });
+
+    bdd.it('should enforce snake case', () => {
+      return request.post('/kibana/ingest/simulate')
+      .send({
+        processors: [{
+          processorId: 'processor1',
+          typeId: 'uppercase',
+          sourceField: 'foo'
+        }],
+        input: { foo: 'bar baz' }
+      })
+      .expect(400);
+    });
+
+  });
+}
diff --git a/test/unit/api/ingest/processors/index.js b/test/unit/api/ingest/processors/index.js
index 3420996767864..b64c730351211 100644
--- a/test/unit/api/ingest/processors/index.js
+++ b/test/unit/api/ingest/processors/index.js
@@ -1,34 +1,31 @@
-define(function (require) {
-  var append = require('./_append');
-  var convert = require('./_convert');
-  var date = require('./_date');
-  var geoip = require('./_geoip');
-  var grok = require('./_grok');
-  var gsub = require('./_gsub');
-  var join = require('./_join');
-  var lowercase = require('./_lowercase');
-  var remove = require('./_remove');
-  var rename = require('./_rename');
-  var set = require('./_set');
-  var split = require('./_split');
-  var trim = require('./_trim');
-  var uppercase = require('./_uppercase');
+import append from './_append';
+import convert from './_convert';
+import date from './_date';
+import geoip from './_geoip';
+import grok from './_grok';
+import gsub from './_gsub';
+import join from './_join';
+import lowercase from './_lowercase';
+import remove from './_remove';
+import rename from './_rename';
+import set from './_set';
+import split from './_split';
+import trim from './_trim';
+import uppercase from './_uppercase';
 
-  return function processors(bdd, scenarioManager, request) {
-    append(bdd, scenarioManager, request);
-    convert(bdd, scenarioManager, request);
-    date(bdd, scenarioManager, request);
-    geoip(bdd, scenarioManager, request);
-    grok(bdd, scenarioManager, request);
-    gsub(bdd, scenarioManager, request);
-    join(bdd, scenarioManager, request);
-    lowercase(bdd, scenarioManager, request);
-    remove(bdd, scenarioManager, request);
-    rename(bdd, scenarioManager, request);
-    set(bdd, scenarioManager, request);
-    split(bdd, scenarioManager, request);
-    trim(bdd, scenarioManager, request);
-    uppercase(bdd, scenarioManager, request);
-  };
-
-});
+export default function processors(bdd, scenarioManager, request) {
+  append(bdd, scenarioManager, request);
+  convert(bdd, scenarioManager, request);
+  date(bdd, scenarioManager, request);
+  geoip(bdd, scenarioManager, request);
+  grok(bdd, scenarioManager, request);
+  gsub(bdd, scenarioManager, request);
+  join(bdd, scenarioManager, request);
+  lowercase(bdd, scenarioManager, request);
+  remove(bdd, scenarioManager, request);
+  rename(bdd, scenarioManager, request);
+  set(bdd, scenarioManager, request);
+  split(bdd, scenarioManager, request);
+  trim(bdd, scenarioManager, request);
+  uppercase(bdd, scenarioManager, request);
+}
diff --git a/test/unit/api/scripts/_languages.js b/test/unit/api/scripts/_languages.js
index 9f9afa19926eb..91ebb02556232 100644
--- a/test/unit/api/scripts/_languages.js
+++ b/test/unit/api/scripts/_languages.js
@@ -1,27 +1,25 @@
-define(function (require) {
-  var expect = require('intern/dojo/node!expect.js');
+import expect from 'intern/dojo/node!expect.js';
 
-  return function (bdd, request) {
-    bdd.describe('Languages API', function getLanguages() {
+export default function (bdd, request) {
+  bdd.describe('Languages API', function getLanguages() {
 
-      bdd.it('should return 200 with an array of languages', function () {
-        return request.get('/kibana/scripts/languages')
-        .expect(200)
-        .then(function (response) {
-          expect(response.body).to.be.an('array');
-        });
+    bdd.it('should return 200 with an array of languages', function () {
+      return request.get('/kibana/scripts/languages')
+      .expect(200)
+      .then(function (response) {
+        expect(response.body).to.be.an('array');
       });
+    });
 
-      bdd.it('should only return langs enabled for inline scripting', function () {
-        return request.get('/kibana/scripts/languages')
-        .expect(200)
-        .then(function (response) {
-          expect(response.body).to.contain('expression');
-          expect(response.body).to.contain('painless');
+    bdd.it('should only return langs enabled for inline scripting', function () {
+      return request.get('/kibana/scripts/languages')
+      .expect(200)
+      .then(function (response) {
+        expect(response.body).to.contain('expression');
+        expect(response.body).to.contain('painless');
 
-          expect(response.body).to.not.contain('groovy');
-        });
+        expect(response.body).to.not.contain('groovy');
       });
     });
-  };
-});
+  });
+}
diff --git a/test/unit/api/scripts/index.js b/test/unit/api/scripts/index.js
index 7b147eec59bb7..9d48874c6a47c 100644
--- a/test/unit/api/scripts/index.js
+++ b/test/unit/api/scripts/index.js
@@ -1,13 +1,11 @@
-define(function (require) {
-  var bdd = require('intern!bdd');
-  var serverConfig = require('intern/dojo/node!../../../server_config');
-  var request = require('intern/dojo/node!supertest-as-promised');
-  var url = require('intern/dojo/node!url');
-  var languages = require('./_languages');
+import bdd from 'intern!bdd';
+import serverConfig from 'intern/dojo/node!../../../server_config';
+let request = require('intern/dojo/node!supertest-as-promised');
+import url from 'intern/dojo/node!url';
+import languages from './_languages';
 
-  bdd.describe('scripts API', function () {
-    request = request(url.format(serverConfig.servers.kibana) + '/api');
+bdd.describe('scripts API', function () {
+  request = request(url.format(serverConfig.servers.kibana) + '/api');
 
-    languages(bdd, request);
-  });
+  languages(bdd, request);
 });
diff --git a/test/unit/api/search/_count.js b/test/unit/api/search/_count.js
index 239a936cfd1ed..d44d5a6b04948 100644
--- a/test/unit/api/search/_count.js
+++ b/test/unit/api/search/_count.js
@@ -1,72 +1,68 @@
-define(function (require) {
-  var Promise = require('bluebird');
-  var _ = require('intern/dojo/node!lodash');
-  var expect = require('intern/dojo/node!expect.js');
+import expect from 'intern/dojo/node!expect.js';
 
-  return function (bdd, scenarioManager, request) {
-    bdd.describe('Count API', function postIngest() {
+export default function (bdd, scenarioManager, request) {
+  bdd.describe('Count API', function postIngest() {
 
-      bdd.before(function () {
+    bdd.before(function () {
+      return scenarioManager.client.create({
+        index: 'foo-1',
+        type: 'bar',
+        id: '1',
+        body: {
+          foo: 'bar'
+        }
+      })
+      .then(function () {
         return scenarioManager.client.create({
-          index: 'foo-1',
+          index: 'foo-2',
           type: 'bar',
-          id: '1',
+          id: '2',
           body: {
             foo: 'bar'
           }
-        })
-        .then(function () {
-          return scenarioManager.client.create({
-            index: 'foo-2',
-            type: 'bar',
-            id: '2',
-            body: {
-              foo: 'bar'
-            }
-          });
-        })
-        .then(function () {
-          return scenarioManager.client.indices.refresh({
-            index: ['foo-1', 'foo-2']
-          });
+        });
+      })
+      .then(function () {
+        return scenarioManager.client.indices.refresh({
+          index: ['foo-1', 'foo-2']
         });
       });
+    });
 
-      bdd.after(function () {
-        return scenarioManager.reload('emptyKibana')
-        .then(function () {
-          scenarioManager.client.indices.delete({
-            index: 'foo*'
-          });
+    bdd.after(function () {
+      return scenarioManager.reload('emptyKibana')
+      .then(function () {
+        scenarioManager.client.indices.delete({
+          index: 'foo*'
         });
       });
+    });
+
+    bdd.it('should return 200 with a document count for existing indices', function () {
+      return request.post('/kibana/foo-*/_count')
+      .expect(200)
+      .then(function (response) {
+        expect(response.body.count).to.be(2);
+      });
+    });
 
-      bdd.it('should return 200 with a document count for existing indices', function () {
-        return request.post('/kibana/foo-*/_count')
+    bdd.it('should support GET requests as well', function () {
+      return request.get('/kibana/foo-*/_count')
         .expect(200)
         .then(function (response) {
           expect(response.body.count).to.be(2);
         });
-      });
+    });
 
-      bdd.it('should support GET requests as well', function () {
-        return request.get('/kibana/foo-*/_count')
-          .expect(200)
-          .then(function (response) {
-            expect(response.body.count).to.be(2);
-          });
-      });
+    bdd.it('should return 404 if a pattern matches no indices', function () {
+      return request.post('/kibana/doesnotexist-*/_count')
+      .expect(404);
+    });
 
-      bdd.it('should return 404 if a pattern matches no indices', function () {
-        return request.post('/kibana/doesnotexist-*/_count')
+    bdd.it('should return 404 if a concrete index does not exist', function () {
+      return request.post('/kibana/concrete/_count')
         .expect(404);
-      });
-
-      bdd.it('should return 404 if a concrete index does not exist', function () {
-        return request.post('/kibana/concrete/_count')
-          .expect(404);
-      });
-
     });
-  };
-});
+
+  });
+}
diff --git a/test/unit/api/search/index.js b/test/unit/api/search/index.js
index 85fd81bc12253..e331bf9eab0db 100644
--- a/test/unit/api/search/index.js
+++ b/test/unit/api/search/index.js
@@ -1,23 +1,21 @@
-define(function (require) {
-  var bdd = require('intern!bdd');
-  var serverConfig = require('intern/dojo/node!../../../server_config');
-  var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenario_manager');
-  var request = require('intern/dojo/node!supertest-as-promised');
-  var url = require('intern/dojo/node!url');
-  var count = require('./_count');
+import bdd from 'intern!bdd';
+import serverConfig from 'intern/dojo/node!../../../server_config';
+import ScenarioManager from 'intern/dojo/node!../../../fixtures/scenario_manager';
+let request = require('intern/dojo/node!supertest-as-promised');
+import url from 'intern/dojo/node!url';
+import count from './_count';
 
-  bdd.describe('search API', function () {
-    var scenarioManager = new ScenarioManager(url.format(serverConfig.servers.elasticsearch));
-    request = request(url.format(serverConfig.servers.kibana) + '/api');
+bdd.describe('search API', function () {
+  const scenarioManager = new ScenarioManager(url.format(serverConfig.servers.elasticsearch));
+  request = request(url.format(serverConfig.servers.kibana) + '/api');
 
-    bdd.before(function () {
-      return scenarioManager.load('emptyKibana');
-    });
-
-    bdd.after(function () {
-      return scenarioManager.unload('emptyKibana');
-    });
+  bdd.before(function () {
+    return scenarioManager.load('emptyKibana');
+  });
 
-    count(bdd, scenarioManager, request);
+  bdd.after(function () {
+    return scenarioManager.unload('emptyKibana');
   });
+
+  count(bdd, scenarioManager, request);
 });
diff --git a/test/utils/__tests__/get_page.js b/test/utils/__tests__/get_page.js
index d46f23c77359e..beae7dcd2ab62 100644
--- a/test/utils/__tests__/get_page.js
+++ b/test/utils/__tests__/get_page.js
@@ -1,9 +1,9 @@
-var expect = require('expect.js');
-var getUrl = require('../get_url');
+import expect from 'expect.js';
+import getUrl from '../get_url';
 
 describe('getUrl', function () {
   it('should convert to a url', function () {
-    var url = getUrl({
+    const url = getUrl({
       protocol: 'http',
       hostname: 'localhost',
     }, {
@@ -14,7 +14,7 @@ describe('getUrl', function () {
   });
 
   it('should convert to a url with port', function () {
-    var url = getUrl({
+    const url = getUrl({
       protocol: 'http',
       hostname: 'localhost',
       port: 9220
diff --git a/test/utils/get_url.js b/test/utils/get_url.js
index 8dd676d98b627..f381502bb1969 100644
--- a/test/utils/get_url.js
+++ b/test/utils/get_url.js
@@ -1,5 +1,5 @@
-var _ = require('lodash');
-var url = require('url');
+import _ from 'lodash';
+import url from 'url';
 
 /**
 * Converts a config and a pathname to a url
@@ -24,7 +24,7 @@ module.exports = getUrl;
 
 function getUrl(config, app) {
   return url.format(_.assign(config, app));
-};
+}
 
 getUrl.noAuth = function getUrlNoAuth(config, app) {
   config = _.pick(config, function (val, param) {
diff --git a/test/utils/kbn_server.js b/test/utils/kbn_server.js
index 52e243142465b..d317b38c69fe2 100644
--- a/test/utils/kbn_server.js
+++ b/test/utils/kbn_server.js
@@ -35,7 +35,7 @@ const SERVER_DEFAULTS = {
 export function createServer(params = {}) {
   params = defaultsDeep({}, params, SERVER_DEFAULTS);
   return new KbnServer(params);
-};
+}
 
 /**
  * Creates request configuration with a basic auth header
@@ -44,7 +44,7 @@ export function authOptions() {
   const { username, password } = kibanaUser;
   const authHeader = basicAuthHeader(username, password);
   return set({}, 'headers.Authorization', authHeader);
-};
+}
 
 /**
  * Makes a request with test headers via hapi server inject()
@@ -60,4 +60,4 @@ export function authOptions() {
 export function makeRequest(kbnServer, options, fn) {
   options = defaultsDeep({}, authOptions(), options);
   return kbnServer.server.inject(options, fn);
-};
+}
diff --git a/test/visual_regression/home/_loading.js b/test/visual_regression/home/_loading.js
index a3d77860f34f8..e28e749fa31f4 100644
--- a/test/visual_regression/home/_loading.js
+++ b/test/visual_regression/home/_loading.js
@@ -1,11 +1,4 @@
-import {
-  bdd,
-  scenarioManager,
-  common,
-  consolePage
-} from '../../support';
-
-var expect = require('expect.js');
+import { bdd } from '../../support';
 
 bdd.describe('Loading', function coverLoadingUi() {
   bdd.it('should show loading feebdack', async function () {
diff --git a/test/visual_regression/home/index.js b/test/visual_regression/home/index.js
index 34f3aa4b3e0e0..2e045788e15ee 100644
--- a/test/visual_regression/home/index.js
+++ b/test/visual_regression/home/index.js
@@ -1,9 +1,4 @@
-import {
-  bdd,
-  remote,
-  scenarioManager,
-  defaultTimeout
-} from '../../support';
+import { bdd, remote, defaultTimeout } from '../../support';
 
 bdd.describe('Home', function () {
   this.timeout = defaultTimeout;
diff --git a/test/visual_regression/index.js b/test/visual_regression/index.js
index 17bec9761f36e..56f79f77620d2 100644
--- a/test/visual_regression/index.js
+++ b/test/visual_regression/index.js
@@ -1,26 +1,24 @@
-define(function (require) {
-  require('intern/dojo/node!../support/env_setup');
+require('intern/dojo/node!../support/env_setup');
 
-  const bdd = require('intern!bdd');
-  const intern = require('intern');
-  const initCallbacks = [];
+import bdd from 'intern!bdd';
+import intern from 'intern';
+const initCallbacks = [];
 
-  function onInit(callback) {
-    initCallbacks.push(callback);
-  }
+function onInit(callback) {
+  initCallbacks.push(callback);
+}
 
-  global.__kibana__intern__ = { intern, bdd, onInit };
+global.__kibana__intern__ = { intern, bdd, onInit };
 
-  bdd.describe('Kibana visual regressions', function () {
-    bdd.before(function () {
-      initCallbacks.forEach(callback => {
-        callback.call(this);
-      });
+bdd.describe('Kibana visual regressions', function () {
+  bdd.before(function () {
+    initCallbacks.forEach(callback => {
+      callback.call(this);
     });
-
-    require([
-      'intern/dojo/node!../support/index',
-      'intern/dojo/node!./home',
-    ], function () {});
   });
+
+  require([
+    'intern/dojo/node!../support/index',
+    'intern/dojo/node!./home',
+  ], function () {});
 });