diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 26bcfa4c80f..28df9a668db 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -89,6 +89,7 @@ import com.cloud.dc.ClusterDetailsVO;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenterVO;
 import com.cloud.dc.HostPodVO;
+import com.cloud.dc.Pod;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.dc.dao.DataCenterDao;
 import com.cloud.dc.dao.HostPodDao;
@@ -1906,9 +1907,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
         Host host = _hostDao.findById(vm.getHostId());
         Cluster cluster = null;
         if (host != null) {
-            cluster = _configMgr.getCluster(host.getClusterId());
+            cluster = _entityMgr.findById(Cluster.class, host.getClusterId());
         }
-        HostPodVO pod = _configMgr.getPod(host.getPodId());
+        Pod pod = _entityMgr.findById(Pod.class, host.getPodId());
         DeployDestination dest = new DeployDestination(dc, pod, cluster, host);
 
         try {
diff --git a/server/src/com/cloud/configuration/ConfigurationManager.java b/server/src/com/cloud/configuration/ConfigurationManager.java
index 775601a0d8c..72253febdaf 100755
--- a/server/src/com/cloud/configuration/ConfigurationManager.java
+++ b/server/src/com/cloud/configuration/ConfigurationManager.java
@@ -225,10 +225,6 @@ public interface ConfigurationManager extends ConfigurationService, Manager {
 
     void createDefaultSystemNetworks(long zoneId) throws ConcurrentOperationException;
 
-    HostPodVO getPod(long id);
-
-    ClusterVO getCluster(long id);
-
     boolean releaseAccountSpecificVirtualRanges(long accountId);
 
     /**
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index b31dfe34eb9..5ef574d1407 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -4863,16 +4863,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         return result;
     }
 
-    @Override
-    public HostPodVO getPod(long id) {
-        return _podDao.findById(id);
-    }
-
-    @Override
-    public ClusterVO getCluster(long id) {
-        return _clusterDao.findById(id);
-    }
-
     @Override
     public AllocationState findClusterAllocationState(ClusterVO cluster) {
 
diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
index 3f756256a2f..c1a98082f45 100755
--- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
+++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
@@ -540,24 +540,6 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu
         
     }
 
-    /* (non-Javadoc)
-     * @see com.cloud.configuration.ConfigurationManager#getPod(long)
-     */
-    @Override
-    public HostPodVO getPod(long id) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see com.cloud.configuration.ConfigurationManager#getCluster(long)
-     */
-    @Override
-    public ClusterVO getCluster(long id) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
     /* (non-Javadoc)
      * @see com.cloud.configuration.ConfigurationManager#deleteAccountSpecificVirtualRanges(long)
      */