diff --git a/drivers/LargeBlockSR.py b/drivers/LargeBlockSR.py
index 95842571..a6eaea03 100644
--- a/drivers/LargeBlockSR.py
+++ b/drivers/LargeBlockSR.py
@@ -72,9 +72,9 @@ def attach(self, sr_uuid):
         super(LargeBlockSR, self).attach(sr_uuid)
 
     def detach(self, sr_uuid):
-        vg_device = self._get_device()
-
-        self.dconf["device"] = ",".join(vg_device)
+        if not self.is_deleting:
+            vg_device = self._get_device()
+            self.dconf["device"] = ",".join(vg_device)
         super(LargeBlockSR, self).detach(sr_uuid)
         if not self.is_deleting:
             self._destroy_emulated_device()
@@ -106,6 +106,8 @@ def delete(self, sr_uuid):
         finally:
             self._destroy_emulated_device(base_devices)
             self.is_deleting = False
+            for dev in base_devices:
+                util.pread2(["pvremove", os.path.realpath(dev)])
 
     @deviceCheck
     def probe(self):