diff --git a/lib/contracts/code_generator.js b/lib/contracts/code_generator.js
index 54b550a1..9ff898af 100644
--- a/lib/contracts/code_generator.js
+++ b/lib/contracts/code_generator.js
@@ -101,11 +101,9 @@ class CodeGenerator {
       self.buildWeb3JS(cb);
     });
 
-    this.events.removeListener('code-generator:contract', () => {
-      self.events.setCommandHandler('code-generator:contract', (contractName, cb) => {
-        let contract = self.contractsManager.contracts[contractName];
-        self.buildContractJS(contractName, self.generateContractJSON(contractName, contract), cb);
-      });
+    self.events.setCommandHandler('code-generator:contract', (contractName, cb) => {
+      let contract = self.contractsManager.contracts[contractName];
+      self.buildContractJS(contractName, self.generateContractJSON(contractName, contract), cb);
     });
 
   }
diff --git a/lib/contracts/contracts.js b/lib/contracts/contracts.js
index e76bdef8..6d0e5c1a 100644
--- a/lib/contracts/contracts.js
+++ b/lib/contracts/contracts.js
@@ -27,10 +27,9 @@ class ContractsManager {
     });
 
     const self = this;
-    this.events.removeListener('contracts:list', () => {
-      self.events.setCommandHandler('contracts:list', (cb) => {
-        cb(self.listContracts());
-      });
+    self.events.setCommandHandler('contracts:list', (cb) => {
+      console.dir('received request');
+      cb(self.listContracts());
     });
   }
 
diff --git a/lib/pipeline/pipeline.js b/lib/pipeline/pipeline.js
index 2239f0ef..e12f3d72 100644
--- a/lib/pipeline/pipeline.js
+++ b/lib/pipeline/pipeline.js
@@ -3,6 +3,7 @@ const async = require('async');
 const child_process = require('child_process');
 const utils = require('../utils/utils.js');
 const constants = require('../constants');
+//require("../utils/debug_util.js")(__filename, async);
 
 require("babel-preset-react");
 require("babel-preset-es2015");
@@ -187,7 +188,7 @@ class Pipeline {
       self.events.request('contracts:list', (contracts) => {
         async.each(contracts, (contract, eachCb) => {
           fs.writeJson(fs.dappPath(this.buildDir, 'contracts', contract.className + ".json"), contract, {spaces: 2}, eachCb);
-        }, callback);
+        }, () => {callback()});
       });
     });
   }