diff --git a/build/artifacts/Tasks/ArtifactsExecutableTest.cs b/build/artifacts/Tasks/ArtifactsExecutableTest.cs
index 8127f1762a..9db54bc5df 100644
--- a/build/artifacts/Tasks/ArtifactsExecutableTest.cs
+++ b/build/artifacts/Tasks/ArtifactsExecutableTest.cs
@@ -20,7 +20,7 @@ public override void Run(BuildContext context)
     {
         var packagesToTest = new[]
         {
-            "GitVersion.Commandline", "GitVersion.Portable"
+            "GitVersion.Portable"
         };
         foreach (var packageToTest in packagesToTest)
         {
diff --git a/build/build/Tasks/Package/PackageNuget.cs b/build/build/Tasks/Package/PackageNuget.cs
index ace94548b3..34154ef82e 100644
--- a/build/build/Tasks/Package/PackageNuget.cs
+++ b/build/build/Tasks/Package/PackageNuget.cs
@@ -1,5 +1,4 @@
 using Cake.Common.Tools.DotNet.Pack;
-using Cake.Common.Tools.NuGet.Pack;
 using Common.Utilities;
 
 namespace Build.Tasks;
@@ -14,7 +13,6 @@ public override void Run(BuildContext context)
         context.EnsureDirectoryExists(Paths.Nuget);
 
         PackageWithCli(context);
-        PackageUsingNuspec(context);
     }
     private static void PackageWithCli(BuildContext context)
     {
@@ -34,33 +32,4 @@ private static void PackageWithCli(BuildContext context)
         settings.ArgumentCustomization = arg => arg.Append("/p:IsPackaging=true");
         context.DotNetPack("./src/GitVersion.MsBuild", settings);
     }
-    private static void PackageUsingNuspec(BuildContextBase context)
-    {
-        var cmdlineNuspecFile = Paths.Nuspec.CombineWithFilePath("GitVersion.CommandLine.nuspec");
-        if (!context.FileExists(cmdlineNuspecFile))
-            return;
-
-        var artifactPath = context.MakeAbsolute(Paths.ArtifactsBinCmdline).FullPath;
-        var version = context.Version;
-        var gitVersion = version?.GitVersion;
-        var nugetSettings = new NuGetPackSettings
-        {
-            // KeepTemporaryNuSpecFile = true,
-            Version = version?.NugetVersion,
-            NoPackageAnalysis = true,
-            OutputDirectory = Paths.Nuget,
-            Repository = new NuGetRepository
-            {
-                Branch = gitVersion?.BranchName,
-                Commit = gitVersion?.Sha
-            },
-            Files = context.GetFiles(artifactPath + "/**/*.*")
-                .Select(file => new NuSpecContent { Source = file.FullPath, Target = file.FullPath.Replace(artifactPath, "") })
-                .Concat(context.GetFiles("docs/**/package_icon.png").Select(file => new NuSpecContent { Source = file.FullPath, Target = "package_icon.png" }))
-                .Concat(context.GetFiles("build/nuspec/README.md").Select(file => new NuSpecContent { Source = file.FullPath, Target = "README.md" }))
-                .ToArray()
-        };
-
-        context.NuGetPack(cmdlineNuspecFile, nugetSettings);
-    }
 }
diff --git a/build/build/Tasks/Package/PackagePrepare.cs b/build/build/Tasks/Package/PackagePrepare.cs
index dd5b0f2391..883155ec42 100644
--- a/build/build/Tasks/Package/PackagePrepare.cs
+++ b/build/build/Tasks/Package/PackagePrepare.cs
@@ -15,11 +15,6 @@ public override void Run(BuildContext context)
         var sourceDir = Paths.Native.Combine(PlatformFamily.Windows.ToString()).Combine("win-x64");
         var sourceFiles = context.GetFiles(sourceDir + "/*.*");
 
-        var cmdlineDir = Paths.ArtifactsBinCmdline.Combine("tools");
-
-        context.EnsureDirectoryExists(cmdlineDir);
-        context.CopyFiles(sourceFiles, cmdlineDir);
-
         var portableDir = Paths.ArtifactsBinPortable.Combine("tools");
         context.EnsureDirectoryExists(portableDir);
 
diff --git a/build/nuspec/GitVersion.CommandLine.nuspec b/build/nuspec/GitVersion.CommandLine.nuspec
deleted file mode 100644
index 8fac567a70..0000000000
--- a/build/nuspec/GitVersion.CommandLine.nuspec
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>GitVersion.CommandLine</id>
-    <version>$version$</version>
-    <title>GitVersion.CommandLine</title>
-    <authors>GitTools and Contributors</authors>
-    <owners>GitTools and Contributors</owners>
-    <license type="expression">MIT</license>
-    <copyright>Copyright GitTools 2021.</copyright>
-    <projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
-    <repository type="git" url="https://github.com/GitTools/GitVersion" />
-    <icon>package_icon.png</icon>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Derives SemVer information from a repository following GitFlow or GitHubFlow.</description>
-    <tags>Git Versioning GitVersion GitFlowVersion GitFlow GitHubFlow SemVer</tags>
-    <developmentDependency>true</developmentDependency>
-    <releaseNotes>https://github.com/GitTools/GitVersion/releases</releaseNotes>
-    <readme>README.md</readme>
-  </metadata>
-</package>
diff --git a/build/publish/Tasks/PublishNuget.cs b/build/publish/Tasks/PublishNuget.cs
index 25e40afb62..a1d730ff4d 100644
--- a/build/publish/Tasks/PublishNuget.cs
+++ b/build/publish/Tasks/PublishNuget.cs
@@ -26,7 +26,7 @@ public override bool ShouldRun(BuildContext context)
     public override void Run(BuildContext context)
     {
         // publish to github packages for commits on main and on original repo
-        if (context.IsGitHubActionsBuild && context.IsOnMainOrSupportBranchOriginalRepo)
+        if (context is { IsGitHubActionsBuild: true, IsOnMainOrSupportBranchOriginalRepo: true })
         {
             var apiKey = context.Credentials?.GitHub?.Token;
             if (string.IsNullOrEmpty(apiKey))