diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index ca47e3f8bf1..0970287e3eb 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -4099,15 +4099,9 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
         try {
             Connection conn = getConnection();
             SR sr = getStorageRepository(conn, poolTO);
-            sr.setNameLabel(conn, pool.getUuid());
-            sr.setNameDescription(conn, pool.getName());
-
+            removeSR(sr);
             Answer answer = new Answer(cmd, true, "success");
             return answer;
-        } catch (XenAPIException e) {
-            String msg = "DeleteStoragePoolCommand XenAPIException:" + e.toString() + " host:" + _host.uuid + " pool: " + pool.getName() + pool.getHostAddress() + pool.getPath();
-            s_logger.warn(msg, e);
-            return new Answer(cmd, false, msg);
         } catch (Exception e) {
             String msg = "DeleteStoragePoolCommand XenAPIException:" + e.getMessage() + " host:" + _host.uuid + " pool: " + pool.getName() + pool.getHostAddress() + pool.getPath();
             s_logger.warn(msg, e);
diff --git a/core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java b/core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java
index f8a3dafb121..e1d39bc1b53 100644
--- a/core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java
+++ b/core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java
@@ -199,7 +199,7 @@ public class StoragePoolDaoImpl extends GenericDaoBase<StoragePoolVO, Long>  imp
         sc.setParameters("hostAddress", host);
         sc.setParameters("path", path);
         
-        return listBy(sc);
+        return listActiveBy(sc);
 	}
 	
 	public StoragePoolVO listById(Integer id)
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 257ef4be10f..b001f8392c2 100644
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1359,7 +1359,8 @@ public class StorageManagerImpl implements StorageManager {
                     for (StoragePoolHostVO host : hostPoolRecords) {
                         _storagePoolHostDao.deleteStoragePoolHostDetails(host.getHostId(),host.getPoolId());
                     }
-
+                    sPool.setUuid(null);
+                    _storagePoolDao.update(id, sPool);
                     _storagePoolDao.remove(id);
                     return true;
                 }