diff --git a/src/Runner.Worker/Variables.cs b/src/Runner.Worker/Variables.cs
index a0281ff69e9..84304f98980 100644
--- a/src/Runner.Worker/Variables.cs
+++ b/src/Runner.Worker/Variables.cs
@@ -75,8 +75,6 @@ public Variables(IHostContext hostContext, IDictionary<string, VariableValue> co
 
         public string System_PhaseDisplayName => Get(Constants.Variables.System.PhaseDisplayName);
 
-        public string System_TFCollectionUrl => Get(WellKnownDistributedTaskVariables.TFCollectionUrl);
-
         public string Get(string name)
         {
             Variable variable;
diff --git a/src/Test/L0/Listener/RunnerL0.cs b/src/Test/L0/Listener/RunnerL0.cs
index c0eab86d712..bca52af6897 100644
--- a/src/Test/L0/Listener/RunnerL0.cs
+++ b/src/Test/L0/Listener/RunnerL0.cs
@@ -141,11 +141,11 @@ public async void TestRunAsync()
                 else
                 {
                     //Act
-                    hc.ShutdownRunner(ShutdownReason.UserCancelled); //stop Agent
+                    hc.ShutdownRunner(ShutdownReason.UserCancelled); //stop Runner
 
                     //Assert
                     Task[] taskToWait2 = { runnerTask, Task.Delay(2000) };
-                    //wait for the Agent to exit
+                    //wait for the runner to exit
                     await Task.WhenAny(taskToWait2);
 
                     Assert.True(runnerTask.IsCompleted, $"{nameof(runner.ExecuteCommand)} timed out.");
@@ -164,9 +164,9 @@ public async void TestRunAsync()
 
         public static TheoryData<string[], bool, Times> RunAsServiceTestData = new TheoryData<string[], bool, Times>()
                                                                     {
-                                                                        // staring with run command, configured as run as service, should start the agent
+                                                                        // staring with run command, configured as run as service, should start the runner
                                                                         { new [] { "run" }, true, Times.Once() },
-                                                                        // starting with no argument, configured not to run as service, should start agent interactively
+                                                                        // starting with no argument, configured not to run as service, should start runner interactively
                                                                         { new [] { "run" }, false, Times.Once() }
                                                                     };
         [Theory]