diff --git a/src/datastore_mad/remotes/vcenter/rm b/src/datastore_mad/remotes/vcenter/rm
index 35f96c6af5..9d29b50ab9 100755
--- a/src/datastore_mad/remotes/vcenter/rm
+++ b/src/datastore_mad/remotes/vcenter/rm
@@ -79,8 +79,8 @@ begin
                 ds.delete_file(img_src)
             end
 
-            vcenter_version = vi_client.vim.serviceContent.about.apiVersion
-            ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) && vcenter_version != "6.5"
+            #vcenter_version = vi_client.vim.serviceContent.about.apiVersion
+            ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) #&& vcenter_version != "6.5"
 
         rescue Exception => e
             if !e.message.start_with?('FileNotFound')
diff --git a/src/tm_mad/vcenter/delete b/src/tm_mad/vcenter/delete
index f300243587..f1e8682755 100755
--- a/src/tm_mad/vcenter/delete
+++ b/src/tm_mad/vcenter/delete
@@ -119,8 +119,8 @@ if path.match(/disk\.\d+$/)
 
                         ds.delete_virtual_disk(img_path)
                         img_dir = File.dirname(img_path)
-                        vcenter_version = vi_client.vim.serviceContent.about.apiVersion
-                        ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) && vcenter_version != "6.5"
+                        #vcenter_version = vi_client.vim.serviceContent.about.apiVersion
+                        ds.rm_directory(img_dir) if ds.dir_empty?(img_dir) #&& vcenter_version != "6.5"
 
                     rescue Exception => e
                         if !e.message.start_with?('FileNotFound')
diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb b/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb
index 8db8aaf170..1cfc3a020e 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb
@@ -364,7 +364,7 @@ class Datastore < Storage
             :datacenter               => get_dc.item
         }
 
-        get_fm.DeleteDatastoreFile_Task(rm_directory_params)
+        get_fm.DeleteDatastoreFile_Task(rm_directory_params).wait_for_completion
     end
 
     def dir_empty?(path)