diff --git a/arangod/RestHandler/RestDocumentHandler.cpp b/arangod/RestHandler/RestDocumentHandler.cpp
index 561cec00f2..d2bdd43a61 100644
--- a/arangod/RestHandler/RestDocumentHandler.cpp
+++ b/arangod/RestHandler/RestDocumentHandler.cpp
@@ -1036,7 +1036,7 @@ bool RestDocumentHandler::replaceDocument () {
 ///
 /// @RESTQUERYPARAMETERS
 ///
-/// @RESTQUERYPARAM{keepNull,string,optional}
+/// @RESTQUERYPARAM{keepNull,boolean,optional}
 /// If the intention is to delete existing attributes with the patch command, 
 /// the URL query parameter `keepNull` can be used with a value of `false`.
 /// This will modify the behavior of the patch command to remove any attributes
diff --git a/arangod/RestHandler/RestEdgeHandler.cpp b/arangod/RestHandler/RestEdgeHandler.cpp
index 20c10ab215..6822bb443a 100644
--- a/arangod/RestHandler/RestEdgeHandler.cpp
+++ b/arangod/RestHandler/RestEdgeHandler.cpp
@@ -574,7 +574,7 @@ bool RestEdgeHandler::createDocument () {
 ///
 /// @RESTQUERYPARAMETERS
 ///
-/// @RESTQUERYPARAM{keepNull,string,optional}
+/// @RESTQUERYPARAM{keepNull,boolean,optional}
 /// If the intention is to delete existing attributes with the patch command, 
 /// the URL query parameter `keepNull` can be used with a value of `false`.
 /// This will modify the behavior of the patch command to remove any attributes
diff --git a/js/actions/api-structure.js b/js/actions/api-structure.js
index 2efe566eab..45a1c48587 100644
--- a/js/actions/api-structure.js
+++ b/js/actions/api-structure.js
@@ -1475,7 +1475,7 @@ function delete_api_structure (req, res) {
 ///
 /// @RESTQUERYPARAMETERS
 ///
-/// @RESTQUERYPARAM{keepNull,string,optional}
+/// @RESTQUERYPARAM{keepNull,boolean,optional}
 /// If the intention is to delete existing attributes with the patch command, 
 /// the URL query parameter `keepNull` can be used with a value of `false`.
 /// This will modify the behavior of the patch command to remove any attributes
diff --git a/js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js b/js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
index b034c9f85c..fe5d7177a8 100644
--- a/js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
+++ b/js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
@@ -52,7 +52,6 @@
   // cannot use strict here as we are going to delete globals
 
   var exports = require("internal");
-  var fs = require("fs");
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                                 Module "internal"
diff --git a/js/apps/system/aardvark/frontend/js/modules/org/arangodb-common.js b/js/apps/system/aardvark/frontend/js/modules/org/arangodb-common.js
index f1bd025933..9484f90893 100644
--- a/js/apps/system/aardvark/frontend/js/modules/org/arangodb-common.js
+++ b/js/apps/system/aardvark/frontend/js/modules/org/arangodb-common.js
@@ -271,7 +271,7 @@ exports.printTable = function  (list, columns, options) {
   }
 
   var pad = '...';
-  var descriptions, matrix, col, what, j, value;
+  var descriptions, matrix, col, what, j;
 
   if (columns === undefined) {
     what = list[0];
diff --git a/js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph.js b/js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph.js
index 82b7a7df06..f2c63d7df8 100644
--- a/js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph.js
+++ b/js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph.js
@@ -30,9 +30,7 @@ module.define("org/arangodb/graph", function(exports, module) {
 ////////////////////////////////////////////////////////////////////////////////
 
 var arangodb = require("org/arangodb"),
-  arangosh = require("org/arangodb/arangosh"),
   is = require("org/arangodb/is"),
-  ArangoQueryCursor = require("org/arangodb/arango-query-cursor").ArangoQueryCursor,
   common = require("org/arangodb/graph-common"),
   Edge = common.Edge,
   Graph = common.Graph,
diff --git a/js/apps/system/aardvark/lib/swagger.js b/js/apps/system/aardvark/lib/swagger.js
index a75f5fe843..796c626595 100644
--- a/js/apps/system/aardvark/lib/swagger.js
+++ b/js/apps/system/aardvark/lib/swagger.js
@@ -32,7 +32,6 @@ exports.Swagger = function () {
   "use strict";
   
   var db = require("internal").db,
-    _routing = db._collection("_routing"),
     _aal = db._collection("_aal"),
     _ = require("underscore"),
     foxx_manager = require("org/arangodb/foxx/manager");
diff --git a/js/client/modules/org/arangodb/foxx/manager.js b/js/client/modules/org/arangodb/foxx/manager.js
index 8f3b568951..cbf0f27e62 100644
--- a/js/client/modules/org/arangodb/foxx/manager.js
+++ b/js/client/modules/org/arangodb/foxx/manager.js
@@ -1088,7 +1088,7 @@ exports.config = function () {
 exports.configJson = function () {
   'use strict';
 
-  var res = arango.GET("/_admin/foxx/config"), name;
+  var res = arango.GET("/_admin/foxx/config");
 
   arangosh.checkRequestResult(res);
 
diff --git a/js/client/modules/org/arangodb/graph.js b/js/client/modules/org/arangodb/graph.js
index 4cbcd2b297..c045463680 100644
--- a/js/client/modules/org/arangodb/graph.js
+++ b/js/client/modules/org/arangodb/graph.js
@@ -29,9 +29,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 var arangodb = require("org/arangodb"),
-  arangosh = require("org/arangodb/arangosh"),
   is = require("org/arangodb/is"),
-  ArangoQueryCursor = require("org/arangodb/arango-query-cursor").ArangoQueryCursor,
   common = require("org/arangodb/graph-common"),
   Edge = common.Edge,
   Graph = common.Graph,
diff --git a/js/common/modules/org/arangodb-common.js b/js/common/modules/org/arangodb-common.js
index 39735efd4e..8c7334665f 100644
--- a/js/common/modules/org/arangodb-common.js
+++ b/js/common/modules/org/arangodb-common.js
@@ -270,7 +270,7 @@ exports.printTable = function  (list, columns, options) {
   }
 
   var pad = '...';
-  var descriptions, matrix, col, what, j, value;
+  var descriptions, matrix, col, what, j;
 
   if (columns === undefined) {
     what = list[0];
diff --git a/js/common/modules/org/arangodb/graph/algorithms-common.js b/js/common/modules/org/arangodb/graph/algorithms-common.js
index 82650e0f76..bc028cfbfd 100644
--- a/js/common/modules/org/arangodb/graph/algorithms-common.js
+++ b/js/common/modules/org/arangodb/graph/algorithms-common.js
@@ -30,7 +30,6 @@
 
 var graph = require("org/arangodb/graph");
 
-var Edge = graph.Edge;
 var Graph = graph.Graph;
 var Vertex = graph.Vertex;
 
diff --git a/js/server/modules/org/arangodb/foxx/request_context.js b/js/server/modules/org/arangodb/foxx/request_context.js
index 0d9418617a..07d081f957 100644
--- a/js/server/modules/org/arangodb/foxx/request_context.js
+++ b/js/server/modules/org/arangodb/foxx/request_context.js
@@ -182,7 +182,6 @@ extend(RequestContext.prototype, {
   pathParam: function (paramName, attributes) {
     'use strict';
     var url = this.route.url,
-      docs = this.route.docs,
       constraint = url.constraint || {};
 
     constraint[paramName] = this.typeToRegex[attributes.type];