diff --git a/core/src/com/cloud/agent/Listener.java b/core/src/com/cloud/agent/Listener.java
index 6fbe0a2cf01..7f4ae8b3535 100755
--- a/core/src/com/cloud/agent/Listener.java
+++ b/core/src/com/cloud/agent/Listener.java
@@ -72,11 +72,12 @@ public interface Listener {
      * This method is called by AgentManager when an agent made a
      * connection to this server if the listener has
      * been registered for host events.
-     * @param agentId id of the agent
      * @param cmd command sent by the agent to the server on startup.
+     * @param forRebalance TODO
+     * @param agentId id of the agent
      * @throws ConnectionException if host has problems and needs to put into maintenance state.
      */
-    void processConnect(HostVO host, StartupCommand cmd) throws ConnectionException;
+    void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) throws ConnectionException;
     
     /**
      * This method is called by AgentManager when an agent disconnects
@@ -119,12 +120,5 @@ public interface Listener {
      * @return true if processed; false if not.
      */
     boolean processTimeout(long agentId, long seq);
-    
-    
-    /**
-     * If set to false, processConnect wouldn't be called for the host
-     * 
-     * @return true when connect has to be processed when host connects as a part of rebalance process, false otherwise
-     */
-    boolean processConnectForRebalanceHost();
+  
 }
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index e080081427a..68d17a711db 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -1097,16 +1097,12 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
         long hostId = attache.getId();
         HostVO host = _hostDao.findById(hostId);
         for (Pair<Integer, Listener> monitor : _hostMonitors) {
-            //some listeneres don't have to be notified when host is connected as a part of rebalance process
-            boolean processConnect = (!forRebalance || (forRebalance && monitor.second().processConnectForRebalanceHost()));
-            if (s_logger.isDebugEnabled() && processConnect) {
+            if (s_logger.isDebugEnabled()) {
                 s_logger.debug("Sending Connect to listener: " + monitor.second().getClass().getSimpleName());
             }
             for (int i = 0; i < cmd.length; i++) {
                 try {
-                    if (processConnect) {
-                        monitor.second().processConnect(host, cmd[i]);
-                    }
+                    monitor.second().processConnect(host, cmd[i], forRebalance);
                 } catch (Exception e) {
                     if (e instanceof ConnectionException) {
                         ConnectionException ce = (ConnectionException)e;
diff --git a/server/src/com/cloud/agent/manager/AgentMonitor.java b/server/src/com/cloud/agent/manager/AgentMonitor.java
index eae3d545f0d..3e5a134735f 100755
--- a/server/src/com/cloud/agent/manager/AgentMonitor.java
+++ b/server/src/com/cloud/agent/manager/AgentMonitor.java
@@ -185,7 +185,7 @@ public class AgentMonitor extends Thread implements Listener {
     }
 
     @Override
-    public void processConnect(HostVO host, StartupCommand cmd) {
+    public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) {
         s_logger.debug("Registering agent monitor for " + host.getId());
     }
 
@@ -204,8 +204,4 @@ public class AgentMonitor extends Thread implements Listener {
     	return -1;
     }
     
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
 }
diff --git a/server/src/com/cloud/agent/manager/SynchronousListener.java b/server/src/com/cloud/agent/manager/SynchronousListener.java
index 89d4a758a01..de501be5c22 100755
--- a/server/src/com/cloud/agent/manager/SynchronousListener.java
+++ b/server/src/com/cloud/agent/manager/SynchronousListener.java
@@ -80,7 +80,7 @@ public class SynchronousListener implements Listener {
     }
     
     @Override
-    public void processConnect(HostVO agent, StartupCommand cmd) {
+    public void processConnect(HostVO agent, StartupCommand cmd, boolean forRebalance) {
     }
 
     @Override
@@ -132,8 +132,4 @@ public class SynchronousListener implements Listener {
     	return -1;
     }
     
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
 }
diff --git a/server/src/com/cloud/capacity/CapacityManagerImpl.java b/server/src/com/cloud/capacity/CapacityManagerImpl.java
index 0d86e8c8398..25e55a321fd 100644
--- a/server/src/com/cloud/capacity/CapacityManagerImpl.java
+++ b/server/src/com/cloud/capacity/CapacityManagerImpl.java
@@ -653,7 +653,7 @@ public class CapacityManagerImpl implements CapacityManager, StateListener<State
     }
 
     @Override
-    public void processConnect(HostVO host, StartupCommand cmd) throws ConnectionException {
+    public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) throws ConnectionException {
         // TODO Auto-generated method stub
 
     }
@@ -681,10 +681,5 @@ public class CapacityManagerImpl implements CapacityManager, StateListener<State
         // TODO Auto-generated method stub
         return false;
     }
-    
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
 
 }
diff --git a/server/src/com/cloud/capacity/ComputeCapacityListener.java b/server/src/com/cloud/capacity/ComputeCapacityListener.java
index fe1f8831549..45c7e2782ad 100644
--- a/server/src/com/cloud/capacity/ComputeCapacityListener.java
+++ b/server/src/com/cloud/capacity/ComputeCapacityListener.java
@@ -71,7 +71,7 @@ public class ComputeCapacityListener implements Listener {
 
 
     @Override
-    public void processConnect(HostVO server, StartupCommand startup) throws ConnectionException {
+    public void processConnect(HostVO server, StartupCommand startup, boolean forRebalance) throws ConnectionException {
         if (!(startup instanceof StartupRoutingCommand)) {
             return;
         }
@@ -191,9 +191,4 @@ public class ComputeCapacityListener implements Listener {
         return false;
     }
     
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
-
 }
diff --git a/server/src/com/cloud/capacity/StorageCapacityListener.java b/server/src/com/cloud/capacity/StorageCapacityListener.java
index 9bff39b8927..4c9215d12cf 100644
--- a/server/src/com/cloud/capacity/StorageCapacityListener.java
+++ b/server/src/com/cloud/capacity/StorageCapacityListener.java
@@ -70,7 +70,7 @@ public class StorageCapacityListener implements Listener {
 
 
     @Override
-    public void processConnect(HostVO server, StartupCommand startup) throws ConnectionException {
+    public void processConnect(HostVO server, StartupCommand startup, boolean forRebalance) throws ConnectionException {
         
         if (!(startup instanceof StartupStorageCommand)) {
             return;
@@ -123,10 +123,5 @@ public class StorageCapacityListener implements Listener {
     public boolean processTimeout(long agentId, long seq) {
         return false;
     }
-    
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
 
 }
diff --git a/server/src/com/cloud/cluster/ClusterAsyncExectuionListener.java b/server/src/com/cloud/cluster/ClusterAsyncExectuionListener.java
index 9d551e02f2b..8588962dfbc 100644
--- a/server/src/com/cloud/cluster/ClusterAsyncExectuionListener.java
+++ b/server/src/com/cloud/cluster/ClusterAsyncExectuionListener.java
@@ -54,7 +54,7 @@ public class ClusterAsyncExectuionListener implements Listener {
     }
     
     @Override
-    public void processConnect(HostVO agent, StartupCommand cmd) {
+    public void processConnect(HostVO agent, StartupCommand cmd, boolean forRebalance) {
     }
     
     @Override
@@ -76,10 +76,6 @@ public class ClusterAsyncExectuionListener implements Listener {
     public int getTimeout() {
     	return -1;
     }
-    
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
+    
 }
 
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyListener.java b/server/src/com/cloud/consoleproxy/ConsoleProxyListener.java
index 6293c7d74a5..594e90422cf 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyListener.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyListener.java
@@ -65,7 +65,7 @@ public class ConsoleProxyListener implements Listener {
     }
 
     @Override
-    public void processConnect(HostVO host, StartupCommand cmd) {
+    public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) {
         _proxyMgr.onAgentConnect(host, cmd);
     	
     	if (cmd instanceof StartupProxyCommand) {
@@ -89,8 +89,4 @@ public class ConsoleProxyListener implements Listener {
         return -1;
     }
     
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
 }
diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
index 6ad2ee59192..638847e92ba 100644
--- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java
@@ -94,7 +94,7 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer,
 	}
 
 	@Override
-	public void processConnect(HostVO host, StartupCommand cmd) {
+	public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) {
 	}
 
 	@Override
@@ -290,8 +290,4 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer,
     	return Hypervisor.HypervisorType.KVM.toString().equalsIgnoreCase(hypervisor);
     }
     
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
 }
diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index b0d13534732..429f73e5bc6 100755
--- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -492,7 +492,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
     }
 
     @Override
-    public void processConnect(HostVO agent, StartupCommand cmd) throws ConnectionException {
+    public void processConnect(HostVO agent, StartupCommand cmd, boolean forRebalance) throws ConnectionException {
         if (!(cmd instanceof StartupRoutingCommand )) {
             return;
         }       
@@ -564,9 +564,4 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
         return false;
     }
     
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
-    
 }
diff --git a/server/src/com/cloud/network/SshKeysDistriMonitor.java b/server/src/com/cloud/network/SshKeysDistriMonitor.java
index be54fb479d6..ea774f4180e 100644
--- a/server/src/com/cloud/network/SshKeysDistriMonitor.java
+++ b/server/src/com/cloud/network/SshKeysDistriMonitor.java
@@ -72,7 +72,7 @@ public class SshKeysDistriMonitor implements Listener {
 	    }
 	    
 	    @Override
-	    public void processConnect(HostVO host, StartupCommand cmd) throws ConnectionException {
+	    public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) throws ConnectionException {
 	    	if (cmd instanceof StartupRoutingCommand) {
 	    		if (((StartupRoutingCommand) cmd).getHypervisorType() == HypervisorType.KVM ||
 	    		    ((StartupRoutingCommand) cmd).getHypervisorType() == HypervisorType.XenServer) {
@@ -116,9 +116,4 @@ public class SshKeysDistriMonitor implements Listener {
 			// TODO Auto-generated method stub
 			return false;
 		}
-		
-		@Override
-	    public boolean processConnectForRebalanceHost() {
-	        return true;
-	    }
 }
diff --git a/server/src/com/cloud/network/ovs/OvsListener.java b/server/src/com/cloud/network/ovs/OvsListener.java
index 9582776a1a7..3e05c35f1f8 100644
--- a/server/src/com/cloud/network/ovs/OvsListener.java
+++ b/server/src/com/cloud/network/ovs/OvsListener.java
@@ -116,7 +116,7 @@ public class OvsListener implements Listener {
 	}
 
 	@Override
-	public void processConnect(HostVO host, StartupCommand cmd)
+	public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance)
 			throws ConnectionException {
 		if (host.getType() != Host.Type.Routing) {
 			return;
@@ -181,10 +181,4 @@ public class OvsListener implements Listener {
 	public boolean processTimeout(long agentId, long seq) {
 		return true;
 	}
-	
-	@Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
-
 }
diff --git a/server/src/com/cloud/network/ovs/OvsTunnelListener.java b/server/src/com/cloud/network/ovs/OvsTunnelListener.java
index e14754e8648..999cc189810 100644
--- a/server/src/com/cloud/network/ovs/OvsTunnelListener.java
+++ b/server/src/com/cloud/network/ovs/OvsTunnelListener.java
@@ -69,7 +69,7 @@ public class OvsTunnelListener implements Listener {
 	}
 
 	@Override
-	public void processConnect(HostVO host, StartupCommand cmd)
+	public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance)
 			throws ConnectionException {
 		if (host.getType() != Host.Type.Routing) {
 			return;
@@ -130,10 +130,5 @@ public class OvsTunnelListener implements Listener {
 		// TODO Auto-generated method stub
 		return true;
 	}
-	
-	@Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
 
 }
diff --git a/server/src/com/cloud/network/security/SecurityGroupListener.java b/server/src/com/cloud/network/security/SecurityGroupListener.java
index 257cfc7ff9c..10b2148d2f0 100644
--- a/server/src/com/cloud/network/security/SecurityGroupListener.java
+++ b/server/src/com/cloud/network/security/SecurityGroupListener.java
@@ -114,7 +114,7 @@ public class SecurityGroupListener implements Listener {
 
 
 	@Override
-	public void processConnect(HostVO host, StartupCommand cmd) {
+	public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) {
 	    if(s_logger.isInfoEnabled())
             s_logger.info("Received a host startup notification");
         
@@ -152,10 +152,4 @@ public class SecurityGroupListener implements Listener {
 	public boolean processTimeout(long agentId, long seq) {
 		return true;
 	}
-	
-	@Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
-
 }
diff --git a/server/src/com/cloud/storage/LocalStoragePoolListener.java b/server/src/com/cloud/storage/LocalStoragePoolListener.java
index f46820bfe84..44daf593dd3 100644
--- a/server/src/com/cloud/storage/LocalStoragePoolListener.java
+++ b/server/src/com/cloud/storage/LocalStoragePoolListener.java
@@ -65,7 +65,7 @@ public class LocalStoragePoolListener implements Listener {
     
     @Override
     @DB
-    public void processConnect(HostVO host, StartupCommand cmd) throws ConnectionException {
+    public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) throws ConnectionException {
         if (!(cmd instanceof StartupStorageCommand)) {
             return;
         }
@@ -134,10 +134,4 @@ public class LocalStoragePoolListener implements Listener {
     public boolean processTimeout(long agentId, long seq) {
         return false;
     }
-    
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
-
 }
diff --git a/server/src/com/cloud/storage/download/DownloadListener.java b/server/src/com/cloud/storage/download/DownloadListener.java
index 0fea7f943ec..8925e9145c5 100644
--- a/server/src/com/cloud/storage/download/DownloadListener.java
+++ b/server/src/com/cloud/storage/download/DownloadListener.java
@@ -277,7 +277,7 @@ public class DownloadListener implements Listener {
 	}
 	
 	@Override
-	public void processConnect(HostVO agent, StartupCommand cmd) throws ConnectionException {
+	public void processConnect(HostVO agent, StartupCommand cmd, boolean forRebalance) throws ConnectionException {
 	    if (cmd instanceof StartupRoutingCommand) {
 	        downloadMonitor.handleSysTemplateDownload(agent);
 	    } else if ( cmd instanceof StartupStorageCommand) {
@@ -373,9 +373,4 @@ public class DownloadListener implements Listener {
     public int getTimeout() {
     	return -1;
     }
-    
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
 }
diff --git a/server/src/com/cloud/storage/listener/StoragePoolMonitor.java b/server/src/com/cloud/storage/listener/StoragePoolMonitor.java
index 09c2592ff4e..55f151ed16a 100755
--- a/server/src/com/cloud/storage/listener/StoragePoolMonitor.java
+++ b/server/src/com/cloud/storage/listener/StoragePoolMonitor.java
@@ -63,7 +63,7 @@ public class StoragePoolMonitor implements Listener {
     }
     
     @Override
-    public void processConnect(HostVO host, StartupCommand cmd) throws ConnectionException {
+    public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) throws ConnectionException {
     	if (cmd instanceof StartupRoutingCommand) {
     		StartupRoutingCommand scCmd = (StartupRoutingCommand)cmd;
     		if (scCmd.getHypervisorType() == HypervisorType.XenServer || scCmd.getHypervisorType() ==  HypervisorType.KVM ||
@@ -107,8 +107,4 @@ public class StoragePoolMonitor implements Listener {
     	return -1;
     }
     
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
 }
diff --git a/server/src/com/cloud/storage/listener/StorageSyncListener.java b/server/src/com/cloud/storage/listener/StorageSyncListener.java
index 70538efed66..2146e2f6084 100755
--- a/server/src/com/cloud/storage/listener/StorageSyncListener.java
+++ b/server/src/com/cloud/storage/listener/StorageSyncListener.java
@@ -52,7 +52,7 @@ public class StorageSyncListener implements Listener {
     }
     
     @Override
-    public void processConnect(HostVO agent, StartupCommand cmd) {
+    public void processConnect(HostVO agent, StartupCommand cmd, boolean forRebalance) {
     }
     
     @Override
@@ -81,9 +81,4 @@ public class StorageSyncListener implements Listener {
     	return -1;
     }
     
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
-    
 }
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java b/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java
index 00c1de6d869..ac0dced4d19 100644
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageListener.java
@@ -70,7 +70,7 @@ public class SecondaryStorageListener implements Listener {
     }
 
     @Override
-    public void processConnect(HostVO agent, StartupCommand cmd) {
+    public void processConnect(HostVO agent, StartupCommand cmd, boolean forRebalance) {
         
         if ((cmd instanceof StartupStorageCommand) ) {
             StartupStorageCommand scmd = (StartupStorageCommand)cmd;
@@ -108,9 +108,4 @@ public class SecondaryStorageListener implements Listener {
     public int getTimeout() {
     	return -1;
     }
-    
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
 }
diff --git a/server/src/com/cloud/storage/upload/UploadListener.java b/server/src/com/cloud/storage/upload/UploadListener.java
index 4e068bd1079..a6f9f6e49d7 100755
--- a/server/src/com/cloud/storage/upload/UploadListener.java
+++ b/server/src/com/cloud/storage/upload/UploadListener.java
@@ -241,7 +241,7 @@ public class UploadListener implements Listener {
 	}
 
 	@Override
-	public void processConnect(HostVO agent, StartupCommand cmd) {		
+	public void processConnect(HostVO agent, StartupCommand cmd, boolean forRebalance) {		
 		if (!(cmd instanceof StartupStorageCommand)) {
 	        return;
 	    }
@@ -447,9 +447,4 @@ public class UploadListener implements Listener {
 		this.currState = getState(currState.toString());		
 	}
 	
-	@Override
-    public boolean processConnectForRebalanceHost() {
-        return true;
-    }
-	
 }
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 4ddef23e9e3..ee8d231f81a 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1775,10 +1775,15 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
     }
 
     @Override
-    public void processConnect(HostVO agent, StartupCommand cmd) throws ConnectionException {
+    public void processConnect(HostVO agent, StartupCommand cmd, boolean forRebalance) throws ConnectionException {
         if (!(cmd instanceof StartupRoutingCommand)) {
             return;
         }
+        
+        if (forRebalance) {
+            s_logger.debug("Not processing listener " + this + " as connect happens on rebalance process");
+            return;
+        }
 
         long agentId = agent.getId();
 
@@ -1859,8 +1864,4 @@ public class VirtualMachineManagerImpl implements VirtualMachineManager, Listene
         }
     }
     
-    @Override
-    public boolean processConnectForRebalanceHost() {
-        return false;
-    }
 }