diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinTask.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinTask.cs
index 5264ede83ccb..6337ab87724b 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinTask.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinTask.cs
@@ -16,7 +16,6 @@
 #nullable enable
 
 namespace Xamarin.MacDev.Tasks {
-	// This is the same as XamarinToolTask, except that it subclasses Task instead.
 	public abstract class XamarinTask : Task, IHasSessionId {
 
 		public string SessionId { get; set; } = string.Empty;
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinToolTask.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinToolTask.cs
deleted file mode 100644
index bd85228b7033..000000000000
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/XamarinToolTask.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using Microsoft.Build.Framework;
-using Microsoft.Build.Tasks;
-using Microsoft.Build.Utilities;
-
-using Xamarin.Localization.MSBuild;
-using Xamarin.Utils;
-
-#nullable enable
-
-namespace Xamarin.MacDev.Tasks {
-	// This is the same as XamarinTask, except that it subclasses ToolTask instead.
-	public abstract class XamarinToolTask : ToolTask {
-
-		public string SessionId { get; set; } = string.Empty;
-
-		public string TargetFrameworkMoniker { get; set; } = string.Empty;
-
-		void VerifyTargetFrameworkMoniker ()
-		{
-			if (!string.IsNullOrEmpty (TargetFrameworkMoniker))
-				return;
-			Log.LogError ($"The task {GetType ().Name} requires TargetFrameworkMoniker to be set.");
-		}
-
-		public string Product {
-			get {
-				return "Microsoft." + PlatformName;
-			}
-		}
-
-		ApplePlatform? platform;
-		public ApplePlatform Platform {
-			get {
-				if (!platform.HasValue)
-					platform = PlatformFrameworkHelper.GetFramework (TargetFrameworkMoniker);
-				return platform.Value;
-			}
-		}
-
-		TargetFramework? target_framework;
-		public TargetFramework TargetFramework {
-			get {
-				if (!target_framework.HasValue) {
-					VerifyTargetFrameworkMoniker ();
-					target_framework = TargetFramework.Parse (TargetFrameworkMoniker);
-				}
-				return target_framework.Value;
-			}
-		}
-
-		public string PlatformName {
-			get {
-				switch (Platform) {
-				case ApplePlatform.iOS:
-					return "iOS";
-				case ApplePlatform.TVOS:
-					return "tvOS";
-				case ApplePlatform.WatchOS:
-					return "watchOS";
-				case ApplePlatform.MacOSX:
-					return "macOS";
-				default:
-					throw new InvalidOperationException (string.Format (MSBStrings.InvalidPlatform, Platform));
-				}
-			}
-		}
-
-		public bool ShouldExecuteRemotely () => this.ShouldExecuteRemotely (SessionId);
-
-		protected internal static IEnumerable<ITaskItem> CreateItemsForAllFilesRecursively (params string [] directories)
-		{
-			return XamarinTask.CreateItemsForAllFilesRecursively ((IEnumerable<string>?) directories);
-		}
-	}
-}