diff --git a/lib/middleware/browsericons.js b/lib/middleware/browsericons.js
index c206d242..e0b571a2 100644
--- a/lib/middleware/browsericons.js
+++ b/lib/middleware/browsericons.js
@@ -2,7 +2,7 @@ var express = require('express')
 
 var pathutil = require('../util/pathutil')
 
-module.exports = function(options) {
+module.exports = function() {
   return express.static(
     pathutil.root('node_modules/stf-browser-db/dist'))
 }
diff --git a/lib/middleware/deviceicons.js b/lib/middleware/deviceicons.js
index 94c9bc49..332acb7d 100644
--- a/lib/middleware/deviceicons.js
+++ b/lib/middleware/deviceicons.js
@@ -2,7 +2,7 @@ var express = require('express')
 
 var pathutil = require('../util/pathutil')
 
-module.exports = function(options) {
+module.exports = function() {
   return express.static(
     pathutil.root('node_modules/stf-device-db/data/small'))
 }
diff --git a/lib/roles/auth/ldap.js b/lib/roles/auth/ldap.js
index 18169075..c07be35f 100644
--- a/lib/roles/auth/ldap.js
+++ b/lib/roles/auth/ldap.js
@@ -20,7 +20,7 @@ module.exports = function(options) {
   lifecycle.observe(function() {
     log.info('Waiting for client connections to end')
     return server.closeAsync()
-      .catch(function(err) {
+      .catch(function() {
         // Okay
       })
   })
diff --git a/lib/roles/auth/mock.js b/lib/roles/auth/mock.js
index 1ac36fff..937274eb 100644
--- a/lib/roles/auth/mock.js
+++ b/lib/roles/auth/mock.js
@@ -19,7 +19,7 @@ module.exports = function(options) {
   lifecycle.observe(function() {
     log.info('Waiting for client connections to end')
     return server.closeAsync()
-      .catch(function(err) {
+      .catch(function() {
         // Okay
       })
   })
diff --git a/lib/roles/device/plugins/browser.js b/lib/roles/device/plugins/browser.js
index a81e378d..2b156128 100644
--- a/lib/roles/device/plugins/browser.js
+++ b/lib/roles/device/plugins/browser.js
@@ -1,3 +1,5 @@
+var util = require('util')
+
 var syrup = require('syrup')
 
 var browsers = require('stf-browser-db')
diff --git a/lib/roles/device/plugins/logger.js b/lib/roles/device/plugins/logger.js
index f7be9d43..6c01ff36 100644
--- a/lib/roles/device/plugins/logger.js
+++ b/lib/roles/device/plugins/logger.js
@@ -1,4 +1,3 @@
-var Promise = require('bluebird')
 var syrup = require('syrup')
 
 var logger = require('../../../util/logger')
diff --git a/lib/roles/device/plugins/service.js b/lib/roles/device/plugins/service.js
index 6e6dc58a..12a7af9f 100644
--- a/lib/roles/device/plugins/service.js
+++ b/lib/roles/device/plugins/service.js
@@ -3,7 +3,6 @@ var events = require('events')
 
 var syrup = require('syrup')
 var Promise = require('bluebird')
-var _ = require('lodash')
 
 var wire = require('../../../wire')
 var wireutil = require('../../../wire/util')
@@ -165,13 +164,14 @@ module.exports = syrup.serial()
 
     function handleEnvelope(data) {
       var envelope = apk.wire.Envelope.decode(data)
+        , message
       if (envelope.id !== null) {
         messageResolver.resolve(envelope.id, envelope.message)
       }
       else {
         switch (envelope.type) {
           case apk.wire.MessageType.EVENT_AIRPLANE_MODE:
-            var message = apk.wire.AirplaneModeEvent.decode(envelope.message)
+            message = apk.wire.AirplaneModeEvent.decode(envelope.message)
             push.send([
               wireutil.global
             , wireutil.envelope(new wire.AirplaneModeEvent(
@@ -182,7 +182,7 @@ module.exports = syrup.serial()
             plugin.emit('airplaneModeChange', message)
             break
           case apk.wire.MessageType.EVENT_BATTERY:
-            var message = apk.wire.BatteryEvent.decode(envelope.message)
+            message = apk.wire.BatteryEvent.decode(envelope.message)
             push.send([
               wireutil.global
             , wireutil.envelope(new wire.BatteryEvent(
@@ -199,11 +199,11 @@ module.exports = syrup.serial()
             plugin.emit('batteryChange', message)
             break
           case apk.wire.MessageType.EVENT_BROWSER_PACKAGE:
-            var message = apk.wire.BrowserPackageEvent.decode(envelope.message)
+            message = apk.wire.BrowserPackageEvent.decode(envelope.message)
             plugin.emit('browserPackageChange', message)
             break
           case apk.wire.MessageType.EVENT_CONNECTIVITY:
-            var message = apk.wire.ConnectivityEvent.decode(envelope.message)
+            message = apk.wire.ConnectivityEvent.decode(envelope.message)
             push.send([
               wireutil.global
             , wireutil.envelope(new wire.ConnectivityEvent(
@@ -218,7 +218,7 @@ module.exports = syrup.serial()
             plugin.emit('connectivityChange', message)
             break
           case apk.wire.MessageType.EVENT_PHONE_STATE:
-            var message = apk.wire.PhoneStateEvent.decode(envelope.message)
+            message = apk.wire.PhoneStateEvent.decode(envelope.message)
             push.send([
               wireutil.global
             , wireutil.envelope(new wire.PhoneStateEvent(
@@ -231,7 +231,7 @@ module.exports = syrup.serial()
             plugin.emit('phoneStateChange', message)
             break
           case apk.wire.MessageType.EVENT_ROTATION:
-            var message = apk.wire.RotationEvent.decode(envelope.message)
+            message = apk.wire.RotationEvent.decode(envelope.message)
             push.send([
               wireutil.global
             , wireutil.envelope(new wire.RotationEvent(
diff --git a/lib/roles/device/plugins/store.js b/lib/roles/device/plugins/store.js
index 9db23fdd..b7e29270 100644
--- a/lib/roles/device/plugins/store.js
+++ b/lib/roles/device/plugins/store.js
@@ -11,7 +11,7 @@ module.exports = syrup.serial()
   .define(function(options, router, push, adb) {
     var log = logger.createLogger('device:plugins:store')
 
-    router.on(wire.StoreOpenMessage, function(channel, message) {
+    router.on(wire.StoreOpenMessage, function(channel) {
       log.info('Opening Play Store')
 
       var reply = wireutil.reply(options.serial)
diff --git a/lib/roles/storage/temp.js b/lib/roles/storage/temp.js
index 00056056..1bd81f47 100644
--- a/lib/roles/storage/temp.js
+++ b/lib/roles/storage/temp.js
@@ -165,7 +165,7 @@ module.exports = function(options) {
         }
         else {
           var form = Promise.promisifyAll(new formidable.IncomingForm())
-          function progressListener(received, expected) {
+          var progressListener = function(received, expected) {
             if (expected) {
               sendProgress('uploading', 70 * (received / expected))
             }
diff --git a/lib/util/datautil.js b/lib/util/datautil.js
index 52078e0f..afa4d495 100644
--- a/lib/util/datautil.js
+++ b/lib/util/datautil.js
@@ -1,8 +1,6 @@
 var deviceData = require('stf-device-db')
 var browserData = require('stf-browser-db')
-var express = require('express')
 
-var pathutil = require('./pathutil')
 var logger = require('./logger')
 
 var log = logger.createLogger('util:datautil')
diff --git a/lib/util/grouputil.js b/lib/util/grouputil.js
index 31b6be9d..b93f2058 100644
--- a/lib/util/grouputil.js
+++ b/lib/util/grouputil.js
@@ -17,7 +17,7 @@ util.inherits(RequirementMismatchError, Error)
 
 module.exports.RequirementMismatchError = RequirementMismatchError
 
-function AlreadyGroupedError(name) {
+function AlreadyGroupedError() {
   Error.call(this)
   this.name = 'AlreadyGroupedError'
   this.message = 'Already a member of another group'