diff --git a/global-functions.rsc b/global-functions.rsc
index 37e297a8..2461b9e5 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1153,12 +1153,10 @@
   }
 
   :onerror Err {
-    /file/remove [ find where name=$DirName ];
+    /file/remove $DirName;
   } do={
-    :if (!($Err ~ "no such item")) do={
-      $LogPrint error $0 ("Removing directory '" . $DirName . "' failed: " . $Err);
-      :return false;
-    }
+    $LogPrint error $0 ("Removing directory '" . $DirName . "' failed: " . $Err);
+    :return false;
   }
   :return true;
 }
@@ -1184,12 +1182,10 @@
   }
 
   :onerror Err {
-    /file/remove [ find where name=$FileName ];
+    /file/remove $FileName;
   } do={
-    :if (!($Err ~ "no such item")) do={
-      $LogPrint error $0 ("Removing file '" . $FileName . "' failed: " . $Err);
-      :return false;
-    }
+    $LogPrint error $0 ("Removing file '" . $FileName . "' failed: " . $Err);
+    :return false;
   }
   :return true;
 }