diff --git a/ContinuousTests/ContinuousLogDownloader.cs b/ContinuousTests/ContinuousLogDownloader.cs
index 7c3cb50..60a2882 100644
--- a/ContinuousTests/ContinuousLogDownloader.cs
+++ b/ContinuousTests/ContinuousLogDownloader.cs
@@ -8,7 +8,6 @@ namespace ContinuousTests
     {
         private readonly TestLifecycle lifecycle;
         private readonly RunningContainer[] containers;
-        //private readonly CodexDeployment deployment;
         private readonly string outputPath;
         private readonly CancellationToken cancelToken;
 
@@ -16,7 +15,6 @@ namespace ContinuousTests
         {
             this.lifecycle = lifecycle;
             this.containers = containers;
-            //this.deployment = deployment;
             this.outputPath = outputPath;
             this.cancelToken = cancelToken;
         }
diff --git a/ContinuousTests/ContinuousTestRunner.cs b/ContinuousTests/ContinuousTestRunner.cs
index 61ecbbf..2f82cbb 100644
--- a/ContinuousTests/ContinuousTestRunner.cs
+++ b/ContinuousTests/ContinuousTestRunner.cs
@@ -30,7 +30,8 @@ namespace ContinuousTests
 
             ClearAllCustomNamespaces(allTests, overviewLog);
 
-            StartLogDownloader(taskFactory);
+            // Disabled for now. Still looking for a better way.
+            // StartLogDownloader(taskFactory);
 
             var testLoops = allTests.Select(t => new TestLoop(taskFactory, config, overviewLog, t.GetType(), t.RunTestEvery, cancelToken)).ToArray();
 
diff --git a/DistTestCore/DistTest.cs b/DistTestCore/DistTest.cs
index f02e620..943b098 100644
--- a/DistTestCore/DistTest.cs
+++ b/DistTestCore/DistTest.cs
@@ -175,12 +175,17 @@ namespace DistTestCore
             GetTestLog().Debug(msg);
         }
 
+        public void Measure(string name, Action action)
+        {
+            Stopwatch.Measure(Get().Log, name, action);
+        }
+
         protected CodexSetup CreateCodexSetup(int numberOfNodes)
         {
             return new CodexSetup(numberOfNodes, configuration.GetCodexLogLevel());
         }
 
-        public TestLifecycle Get()
+        private TestLifecycle Get()
         {
             lock (lifecycleLock)
             {
diff --git a/Tests/BasicTests/ContinuousSubstitute.cs b/Tests/BasicTests/ContinuousSubstitute.cs
index 5b18c34..2ce65c8 100644
--- a/Tests/BasicTests/ContinuousSubstitute.cs
+++ b/Tests/BasicTests/ContinuousSubstitute.cs
@@ -99,7 +99,7 @@ namespace Tests.BasicTests
                             var cid = node.UploadFile(file);
 
                             var cidTag = cid.Id.Substring(cid.Id.Length - 6);
-                            Stopwatch.Measure(Get().Log, "upload-log-asserts", () =>
+                            Measure("upload-log-asserts", () =>
                             {
                                 var uploadLog = node.DownloadLog(tailLines: 50000);
 
@@ -120,7 +120,7 @@ namespace Tests.BasicTests
                             var dl = node.DownloadContent(cid);
                             file.AssertIsEqual(dl);
 
-                            Stopwatch.Measure(Get().Log, "download-log-asserts", () =>
+                            Measure("download-log-asserts", () =>
                             {
                                 var downloadLog = node.DownloadLog(tailLines: 50000);