diff --git a/scripts/generate/js_api/templates/action.tmpl b/scripts/generate/js_api/templates/action.tmpl
index d75624ac9..a059f5671 100644
--- a/scripts/generate/js_api/templates/action.tmpl
+++ b/scripts/generate/js_api/templates/action.tmpl
@@ -1,6 +1,5 @@
 var _ = require('<%= path2lib %>utils');
-var errors = require('<%= path2lib %>errors');
-var q = require('q');<%
+var errors = require('<%= path2lib %>errors');<%
 
 
 if (_.keys(enumOptions).length) {
diff --git a/scripts/generate/logs/index.js b/scripts/generate/logs/index.js
index a8a7544b6..79e5d7aa9 100644
--- a/scripts/generate/logs/index.js
+++ b/scripts/generate/logs/index.js
@@ -27,7 +27,6 @@ var count = parseInt(argv._[0] || 14000, 10),
 
 var es = require('../../../src/elasticsearch'),
   _ = require('../../../src/lib/utils'),
-  q = require('q'),
   async = require('async'),
   moment = require('moment'),
   makeSamples = require('./samples').make,
diff --git a/scripts/generate/logs/samples/stochator.js b/scripts/generate/logs/samples/stochator.js
index 88f5c4d0c..67e351573 100644
--- a/scripts/generate/logs/samples/stochator.js
+++ b/scripts/generate/logs/samples/stochator.js
@@ -1,4 +1,4 @@
-/*jshint maxlen:false, white:false, -W116:false, quotmark:false, -W018:false, -W064:false */
+/*jshint maxlen:false, white:false, -W116:false, quotmark:false, -W018:false, -W064:false, -W015:false */
 (function() {
   var Set, Stochator, callFunctions, floatGenerator, integerGenerator, inverseNormalCumulativeDistribution, isType, randomBoundedFloat, randomBoundedInteger, randomCharacter, randomColor, randomNormallyDistributedFloat, randomSetMember, randomSetMemberWithoutReplacement, randomWeightedSetMember, setGenerator, shuffleSet,
     __indexOf = Array.prototype.indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
diff --git a/src/lib/Client.js b/src/lib/Client.js
index fa4784984..9822cdea4 100644
--- a/src/lib/Client.js
+++ b/src/lib/Client.js
@@ -33,7 +33,6 @@ module.exports = Client;
 var _ = require('./utils');
 var ClientConfig = require('./client_config');
 var ca = require('./client_action').create;
-var q = require('q');
 var errors = require('./errors');
 var api = require('./api.js');
 
diff --git a/src/lib/client.js b/src/lib/client.js
index fa4784984..9822cdea4 100644
--- a/src/lib/client.js
+++ b/src/lib/client.js
@@ -33,7 +33,6 @@ module.exports = Client;
 var _ = require('./utils');
 var ClientConfig = require('./client_config');
 var ca = require('./client_action').create;
-var q = require('q');
 var errors = require('./errors');
 var api = require('./api.js');
 
diff --git a/src/lib/connection_pool.js b/src/lib/connection_pool.js
index 0fc08daf3..3510c4a08 100644
--- a/src/lib/connection_pool.js
+++ b/src/lib/connection_pool.js
@@ -12,7 +12,6 @@ var _ = require('./utils'),
   selectors = _.reKey(_.requireDir(module, './selectors'), _.camelCase),
   connectors = _.reKey(_.requireDir(module, './connections'), _.studlyCase),
   EventEmitter = require('events').EventEmitter,
-  q = require('q'),
   errors = require('./errors');
 
 function ConnectionPool(config) {
diff --git a/src/lib/connections/http.js b/src/lib/connections/http.js
index ea5d403a9..f2b0c2aa9 100644
--- a/src/lib/connections/http.js
+++ b/src/lib/connections/http.js
@@ -10,7 +10,6 @@ module.exports = HttpConnection;
 
 var http = require('http'),
   _ = require('../utils'),
-  q = require('q'),
   errors = require('../errors'),
   ConnectionAbstract = require('../connection'),
   defaultHeaders = {
diff --git a/test/integration/yaml_suite/server.js b/test/integration/yaml_suite/server.js
index 7edda92bf..bfffa03a9 100644
--- a/test/integration/yaml_suite/server.js
+++ b/test/integration/yaml_suite/server.js
@@ -1,6 +1,5 @@
 var childProc = require('child_process'),
   events = require('events'),
-  q = require('q'),
   path = require('path'),
   fs = require('fs'),
   _ = require('../../../src/lib/utils');