diff --git a/BasicNodes/File/CopyFile.cs b/BasicNodes/File/CopyFile.cs
index 3bd39859..e9ca7340 100644
--- a/BasicNodes/File/CopyFile.cs
+++ b/BasicNodes/File/CopyFile.cs
@@ -104,24 +104,19 @@ namespace FileFlows.BasicNodes.File
             {
                 args.FileService.SetCreationTimeUtc(dest, dtCreateTimeUtc);
                 args.FileService.SetLastWriteTimeUtc(dest, dtLastWriteUtc);
-                
-                //Helpers.FileHelper.SetCreationTime(dest, dtCreateTimeUtc);
-                //Helpers.FileHelper.SetLastWriteTime(dest, dtLastWriteUtc);
             }
 
             var srcDir = FileHelper.GetDirectory(AdditionalFilesFromOriginal
-                ? args.MapPath(args.FileName)
-                : args.MapPath(args.WorkingFile));
+                ? args.FileName
+                : args.WorkingFile);
 
             if (AdditionalFiles?.Any() == true)
             {
                 try
                 {
-                    //var diSrc = new DirectoryInfo(srcDir);
                     foreach (var additional in AdditionalFiles)
                     {
-                        //foreach (var addFile in diSrc.GetFiles(additional))
-                        foreach(var addFile in args.FileService.GetFiles(additional).ValueOrDefault ?? new string[] {})
+                        foreach(var addFile in args.FileService.GetFiles(srcDir, additional).ValueOrDefault ?? new string[] {})
                         {
                             try
                             {
diff --git a/BasicNodes/File/FileExists.cs b/BasicNodes/File/FileExists.cs
index 81833f80..261ef0b3 100644
--- a/BasicNodes/File/FileExists.cs
+++ b/BasicNodes/File/FileExists.cs
@@ -34,16 +34,6 @@ public class FileExists: Node
             }
             args.Logger?.ILog("File does NOT exist: " + file);
             return 2;
-            
-            // file = args.MapPath(file);
-            // var fileInfo = new FileInfo(file);
-            // if (fileInfo.Exists)
-            // {
-            //     args.Logger?.ILog("File does exist: " + file);
-            //     return 1;
-            // }
-            // args.Logger?.ILog("File does NOT exist: " + file);
-            // return 2;
         }
         catch (Exception ex)
         {
diff --git a/VideoNodes/VideoNodes/SubtitleExtractor.cs b/VideoNodes/VideoNodes/SubtitleExtractor.cs
index 3967bb2c..68c0fe1d 100644
--- a/VideoNodes/VideoNodes/SubtitleExtractor.cs
+++ b/VideoNodes/VideoNodes/SubtitleExtractor.cs
@@ -125,7 +125,6 @@ public class SubtitleExtractor : EncodingNode
                 if (ExtractAll == false && string.IsNullOrEmpty(OutputFile) == false)
                 {
                     output = args.ReplaceVariables(OutputFile, true);
-                    output = args.MapPath(output);
                 }
                 else
                 {
diff --git a/VideoNodes/VideoNodes/VideoExtractAudio.cs b/VideoNodes/VideoNodes/VideoExtractAudio.cs
index 07becb52..35e7aa9f 100644
--- a/VideoNodes/VideoNodes/VideoExtractAudio.cs
+++ b/VideoNodes/VideoNodes/VideoExtractAudio.cs
@@ -121,7 +121,6 @@ public class VideoExtractAudio : AudioSelectionEncodingNode
             else
                 outputfile = args.FileName;
         }
-        outputfile = args.MapPath(outputfile);
 
         if (string.IsNullOrWhiteSpace(OutputCodec))
             OutputCodec = "mp3";