diff --git a/bin/lamassu-server b/bin/lamassu-server
index 7455d2e3..fac0cf23 100755
--- a/bin/lamassu-server
+++ b/bin/lamassu-server
@@ -20,6 +20,8 @@ if (!argv.http) {
     key: fs.readFileSync(argv.key),
     cert: fs.readFileSync(argv.cert)
   };
+
+  options.mock = argv.mock;
 }
 
 var server = createServer(options);
diff --git a/lib/api_response.js b/lib/api_response.js
index 09f88776..41f1ef05 100644
--- a/lib/api_response.js
+++ b/lib/api_response.js
@@ -1,14 +1,11 @@
 'use strict';
 
-var ApiResponse = function(config) {
-  this.config = config;
-  this.response = config.response;
-  this.targetVersion = config.targetVersion;
-  this.version = config.version;
+var ApiResponse = function(res) {
+  this.response = res;
 };
 
-ApiResponse.factory = function factory(config) {
-  return new ApiResponse(config);
+ApiResponse.factory = function factory(res) {
+  return new ApiResponse(res);
 };
 
 module.exports = ApiResponse;
@@ -21,25 +18,15 @@ ApiResponse.prototype.respond = function respond(err, res, statusCodeOpt) {
 };
 
 ApiResponse.prototype._buildErr = function _buildErr(err) {
-  // Handle err as either string or error type
   var message = err.message || err; 
   var name = err.name || null;
 
-  if (this.targetVersion < 1) return {err: message, errType: name};
-  return {err: {
-      name: name,
-      message: message,
-      version: this.version
-    }
-  };
+  return {err: message, errType: name};
 };
 
 ApiResponse.prototype._buildResponse = function _buildResponse(res) {
-  if (this.targetVersion < 1) {
-    var fullRes = res;
-    fullRes = fullRes || {};
-    fullRes.err = null;
-    return fullRes;
-  }
-  return {err: null, result: res || null, version: this.version};
+  var fullRes = res;
+  fullRes = fullRes || {};
+  fullRes.err = null;
+  return fullRes;
 };
\ No newline at end of file
diff --git a/lib/routes.js b/lib/routes.js
index c940cc50..0127a8d0 100644
--- a/lib/routes.js
+++ b/lib/routes.js
@@ -11,15 +11,8 @@ var ApiResponse = require('./api_response');
 var STALE_TICKER  = 180000;
 var STALE_BALANCE = 180000;
 
-var API_VERSION = 1;
-
 function prepareApi(req, res) {
-  var targetVersion = parseInt(req.body.version || req.query.version || 0);
-  return ApiResponse.factory({
-    response: res, 
-    targetVersion: targetVersion, 
-    version: API_VERSION
-  });
+  return ApiResponse.factory(res);
 }
 
 var poll = function(req, res) {
@@ -112,6 +105,8 @@ exports.init = function(config) {
   var authMiddleware = config.authMiddleware;
   var app = config.app;
   _lamassuConfig.readExchangesConfig(function (err, res) {
+    var idVerifyConfig = res.exchanges.plugins.settings.idology;
+    idVerifyConfig.mock = config.mock;
     _idVerifier = require('lamassu-idology').factory(res.exchanges.plugins.settings.idology);
   });