diff --git a/src/Agent.Worker/Build/TFCommandManager.cs b/src/Agent.Worker/Build/TFCommandManager.cs
index d777849211..ee6bdcbb9d 100644
--- a/src/Agent.Worker/Build/TFCommandManager.cs
+++ b/src/Agent.Worker/Build/TFCommandManager.cs
@@ -48,7 +48,7 @@ public string ResolvePath(string serverPath)
             return localPath?.Trim() ?? string.Empty;
         }
 
-        public async Task ScorchAsync() => await RunCommandAsync(FormatFlags.OmitCollectionUrl, "vc", "scorch", "/diff", "/recursive", "/unmapped", SourcesDirectory);
+        public async Task ScorchAsync() => await RunCommandAsync(FormatFlags.OmitCollectionUrl, "vc", "scorch", "/diff", "/recursive", "/unmapped", "*");
 
         public async Task ShelveAsync(string shelveset, string commentFile)
         {
diff --git a/src/Agent.Worker/Build/TfsVCSourceProvider.cs b/src/Agent.Worker/Build/TfsVCSourceProvider.cs
index c954557a56..b9b2b2cc3d 100644
--- a/src/Agent.Worker/Build/TfsVCSourceProvider.cs
+++ b/src/Agent.Worker/Build/TfsVCSourceProvider.cs
@@ -163,9 +163,6 @@ public async Task GetSourceAsync(
                         {
                             // Scorch failed.
                             // Warn, drop the folder, and re-clone.
-                            // TODO: Fix tf.exe scorch and remove this catch handler. This catch handler was
-                            //       added because scorch fails to interpret the workspace when a root mapping
-                            //       does not exist.
                             executionContext.Warning(ex.Message);
                             existingTFWorkspace = null;
                         }