From e7bac5c6f56ae4963486c9849a8d7f60662d4c19 Mon Sep 17 00:00:00 2001
From: Martijn Laarman <Mpdreamz@gmail.com>
Date: Thu, 21 Aug 2025 19:53:11 +0200
Subject: [PATCH] Address a bunch of code-analysis quick fixes

---
 aspire/AppHost.cs                                    |  2 +-
 src/Elastic.ApiExplorer/Endpoints/IndexViewModel.cs  |  3 ---
 .../Assembler/AssemblyConfiguration.cs               | 12 ++++--------
 .../Assembler/Repository.cs                          |  1 -
 .../ConfigurationFileProvider.cs                     |  1 -
 .../Serialization/YamlStaticContext.cs               |  1 -
 .../Versions/VersionsConfigurationExtensions.cs      |  1 -
 .../Extensions.cs                                    |  5 ++---
 src/Elastic.Documentation.Site/Htmx.cs               |  3 ---
 .../Layout/_SecondaryNav.cshtml                      |  1 -
 src/Elastic.Documentation/AppliesTo/ApplicableTo.cs  |  1 -
 .../Search/DocumentationDocument.cs                  |  1 -
 .../Serialization/SourceGenerationContext.cs         |  1 -
 src/Elastic.Markdown/DocumentationGenerator.cs       |  3 ---
 .../Exporters/LlmMarkdownExporter.cs                 |  1 -
 src/Elastic.Markdown/Helpers/Interpolation.cs        |  6 +-----
 src/Elastic.Markdown/HtmlWriter.cs                   |  3 ---
 src/Elastic.Markdown/IO/DocumentationFile.cs         |  1 -
 src/Elastic.Markdown/IO/MarkdownFile.cs              |  4 ----
 .../IO/Navigation/TableOfContentsTreeCollector.cs    |  1 -
 .../Myst/CodeBlocks/EnhancedCodeBlockParser.cs       |  2 --
 .../Myst/Components/ApplicableToComponent.cshtml     |  1 -
 .../Myst/Components/ApplicableToViewModel.cs         |  1 -
 .../Myst/Directives/AppliesTo/AppliesToDirective.cs  |  1 -
 .../Myst/Directives/CsvInclude/CsvIncludeBlock.cs    |  2 --
 .../Myst/Directives/CsvInclude/CsvReader.cs          |  2 --
 .../Myst/Directives/Diagram/DiagramEncoder.cs        |  2 --
 .../Myst/Directives/Image/ImageCarouselBlock.cs      |  6 ------
 .../Myst/Directives/Image/ImageCarouselViewModel.cs  |  4 ----
 .../Myst/Directives/Stepper/StepViewModel.cs         |  5 +----
 .../Myst/FrontMatter/FrontMatterParser.cs            |  1 -
 .../Substitution/SubstitutionMutationHelper.cs       |  6 ------
 .../InlineParsers/Substitution/SubstitutionParser.cs |  4 ----
 .../SubstitutionInlineCodeParser.cs                  |  9 ---------
 src/Elastic.Markdown/Myst/MarkdownParser.cs          |  2 --
 .../Myst/Renderers/HtmxLinkInlineRenderer.cs         |  4 +---
 .../Myst/Renderers/LlmMarkdown/LlmBlockRenderers.cs  |  2 --
 .../Myst/Roles/AppliesTo/AppliesToRole.cs            |  1 -
 .../Myst/Roles/Icons/IconRoleRenderer.cs             |  1 -
 src/Elastic.Markdown/Myst/Roles/Kbd/KbdParser.cs     |  2 --
 src/Elastic.Markdown/Page/IndexViewModel.cs          |  1 -
 .../Search/SearchUsecase.cs                          |  2 --
 .../CompositeDisposableServiceProvider.cs            |  2 +-
 .../Exporters/ElasticsearchMarkdownExporter.cs       |  2 --
 .../Filters/CatchExceptionFilter.cs                  |  2 +-
 src/tooling/docs-assembler/AssembleContext.cs        |  2 --
 src/tooling/docs-assembler/AssembleSources.cs        | 10 +++-------
 .../docs-assembler/Building/AssemblerBuilder.cs      |  1 -
 src/tooling/docs-assembler/Cli/DeployCommands.cs     |  1 -
 .../docs-assembler/Cli/InboundLinkCommands.cs        |  1 -
 src/tooling/docs-assembler/Cli/LegacyDocsCommands.cs |  3 ++-
 src/tooling/docs-assembler/Cli/NavigationCommands.cs |  1 -
 src/tooling/docs-assembler/Cli/RepositoryCommands.cs |  1 +
 .../Deploying/AwsCloudFrontKeyValueStoreProxy.cs     | 10 ++++++----
 .../docs-assembler/Legacy/PageLegacyUrlMapper.cs     |  1 -
 .../docs-assembler/Links/NavigationPrefixChecker.cs  |  2 +-
 .../Navigation/AssemblerDocumentationSet.cs          |  1 -
 .../Navigation/GlobalNavigationFile.cs               |  1 -
 .../Sourcing/RepositorySourcesFetcher.cs             |  2 +-
 src/tooling/docs-builder/Cli/Commands.cs             |  5 -----
 src/tooling/docs-builder/Cli/DiffCommands.cs         |  7 +++----
 src/tooling/docs-builder/Cli/InboundLinkCommands.cs  |  2 --
 .../docs-builder/Http/DocumentationWebHost.cs        |  9 ---------
 src/tooling/docs-builder/Http/GcpIdTokenGenerator.cs |  2 --
 .../docs-builder/Http/ReloadGeneratorService.cs      |  1 +
 .../docs-builder/Http/ReloadableGeneratorState.cs    |  1 -
 src/tooling/docs-builder/Program.cs                  |  3 ---
 .../AssembleFixture.cs                               |  6 ++----
 tests/Elastic.ApiExplorer.Tests/ReaderTests.cs       |  1 -
 .../LegacyPageLookupTests.cs                         |  1 -
 .../Directives/AdmonitionTests.cs                    |  2 +-
 .../Directives/DirectiveBaseTests.cs                 |  2 --
 .../Directives/ImageCarouselTests.cs                 |  1 -
 .../Elastic.Markdown.Tests/Directives/ImageTests.cs  |  1 -
 tests/Elastic.Markdown.Tests/Directives/TabTests.cs  |  2 +-
 .../Directives/VersionTests.cs                       |  1 -
 .../DocSet/NavigationTestsBase.cs                    |  1 -
 .../FileInclusion/IncludeTests.cs                    |  1 -
 .../FileInclusion/LiteralIncludeTests.cs             |  1 -
 .../Elastic.Markdown.Tests/Inline/HardBreakTests.cs  |  2 --
 .../Elastic.Markdown.Tests/Inline/InlneBaseTests.cs  |  2 --
 tests/Elastic.Markdown.Tests/OutputDirectoryTests.cs |  2 --
 tests/Elastic.Markdown.Tests/PrettyHtmlExtensions.cs |  1 +
 .../SettingsInclusion/IncludeTests.cs                |  1 -
 .../docs-assembler.Tests/GlobalNavigationTests.cs    |  3 ---
 85 files changed, 35 insertions(+), 182 deletions(-)

diff --git a/aspire/AppHost.cs b/aspire/AppHost.cs
index e99f405dd..e39f678c2 100644
--- a/aspire/AppHost.cs
+++ b/aspire/AppHost.cs
@@ -5,7 +5,6 @@
 
 using ConsoleAppFramework;
 using Elastic.Documentation;
-using Elastic.Documentation.Configuration;
 using Microsoft.Extensions.Logging;
 using static Elastic.Documentation.Aspire.ResourceNames;
 
@@ -29,6 +28,7 @@
 return;
 
 // ReSharper disable once RedundantLambdaParameterType
+// ReSharper disable once VariableHidesOuterVariable
 async Task BuildAspireHost(bool startElasticsearch, bool assumeCloned, bool skipPrivateRepositories, Cancel ctx)
 {
 	var builder = DistributedApplication.CreateBuilder(args);
diff --git a/src/Elastic.ApiExplorer/Endpoints/IndexViewModel.cs b/src/Elastic.ApiExplorer/Endpoints/IndexViewModel.cs
index a09202d23..8aeea43fc 100644
--- a/src/Elastic.ApiExplorer/Endpoints/IndexViewModel.cs
+++ b/src/Elastic.ApiExplorer/Endpoints/IndexViewModel.cs
@@ -2,9 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using Elastic.ApiExplorer.Landing;
-using Elastic.Documentation;
-
 namespace Elastic.ApiExplorer.Endpoints;
 
 public class IndexViewModel(ApiRenderContext context) : ApiViewModel(context)
diff --git a/src/Elastic.Documentation.Configuration/Assembler/AssemblyConfiguration.cs b/src/Elastic.Documentation.Configuration/Assembler/AssemblyConfiguration.cs
index 655f6baf5..1a04094c8 100644
--- a/src/Elastic.Documentation.Configuration/Assembler/AssemblyConfiguration.cs
+++ b/src/Elastic.Documentation.Configuration/Assembler/AssemblyConfiguration.cs
@@ -90,10 +90,8 @@ private static TRepository RepositoryDefaults<TRepository>(TRepository r, string
 		};
 		// ensure we always null path if we are running in CI
 		if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("CI")))
-			repository = repository with
-			{
-				Path = null
-			};
+			repository = repository with { Path = null };
+
 		if (string.IsNullOrEmpty(repository.Origin))
 		{
 			if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("GITHUB_ACTIONS")))
@@ -149,10 +147,8 @@ public ContentSourceMatch Match(string repository, string branchOrTag)
 			var next = r.GetBranch(ContentSource.Next);
 			var isVersionBranch = ContentSourceRegex.MatchVersionBranch().IsMatch(branchOrTag);
 			if (current == branchOrTag)
-				match = match with
-				{
-					Current = ContentSource.Current
-				};
+				match = match with { Current = ContentSource.Current };
+
 			if (next == branchOrTag)
 				match = match with
 				{
diff --git a/src/Elastic.Documentation.Configuration/Assembler/Repository.cs b/src/Elastic.Documentation.Configuration/Assembler/Repository.cs
index 7b8d39440..c09a71976 100644
--- a/src/Elastic.Documentation.Configuration/Assembler/Repository.cs
+++ b/src/Elastic.Documentation.Configuration/Assembler/Repository.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Collections;
 using System.Runtime.Serialization;
 using YamlDotNet.Serialization;
 
diff --git a/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs b/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
index a8cac2085..0b94a0784 100644
--- a/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
+++ b/src/Elastic.Documentation.Configuration/ConfigurationFileProvider.cs
@@ -7,7 +7,6 @@
 using Elastic.Documentation.Configuration.Assembler;
 using Microsoft.Extensions.DependencyInjection;
 using NetEscapades.EnumGenerators;
-using YamlDotNet.RepresentationModel;
 
 namespace Elastic.Documentation.Configuration;
 
diff --git a/src/Elastic.Documentation.Configuration/Serialization/YamlStaticContext.cs b/src/Elastic.Documentation.Configuration/Serialization/YamlStaticContext.cs
index e0586055b..3bc8769c0 100644
--- a/src/Elastic.Documentation.Configuration/Serialization/YamlStaticContext.cs
+++ b/src/Elastic.Documentation.Configuration/Serialization/YamlStaticContext.cs
@@ -4,7 +4,6 @@
 
 using Elastic.Documentation.Configuration.Assembler;
 using Elastic.Documentation.Configuration.Versions;
-using YamlDotNet.RepresentationModel;
 using YamlDotNet.Serialization;
 
 namespace Elastic.Documentation.Configuration.Serialization;
diff --git a/src/Elastic.Documentation.Configuration/Versions/VersionsConfigurationExtensions.cs b/src/Elastic.Documentation.Configuration/Versions/VersionsConfigurationExtensions.cs
index b79f3743b..25c0f2f0f 100644
--- a/src/Elastic.Documentation.Configuration/Versions/VersionsConfigurationExtensions.cs
+++ b/src/Elastic.Documentation.Configuration/Versions/VersionsConfigurationExtensions.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.IO.Abstractions;
 using Elastic.Documentation.Configuration.Serialization;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
diff --git a/src/Elastic.Documentation.ServiceDefaults/Extensions.cs b/src/Elastic.Documentation.ServiceDefaults/Extensions.cs
index 4af55c492..3bfaa382c 100644
--- a/src/Elastic.Documentation.ServiceDefaults/Extensions.cs
+++ b/src/Elastic.Documentation.ServiceDefaults/Extensions.cs
@@ -9,7 +9,6 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using OpenTelemetry;
-using OpenTelemetry.Logs;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
 
@@ -57,9 +56,9 @@ public static TBuilder ConfigureOpenTelemetry<TBuilder>(this TBuilder builder) w
 			.WithTracing(tracing =>
 			{
 				_ = tracing.AddSource(builder.Environment.ApplicationName)
-					.AddAspNetCoreInstrumentation(tracing =>
+					.AddAspNetCoreInstrumentation(instrumentation =>
 						// Exclude health check requests from tracing
-						tracing.Filter = context =>
+						instrumentation.Filter = context =>
 							!context.Request.Path.StartsWithSegments(HealthEndpointPath)
 							&& !context.Request.Path.StartsWithSegments(AlivenessEndpointPath)
 					)
diff --git a/src/Elastic.Documentation.Site/Htmx.cs b/src/Elastic.Documentation.Site/Htmx.cs
index ff340d363..d9752f365 100644
--- a/src/Elastic.Documentation.Site/Htmx.cs
+++ b/src/Elastic.Documentation.Site/Htmx.cs
@@ -2,10 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Reflection;
 using System.Text;
-using System.Text.Encodings.Web;
-using Elastic.Documentation.Extensions;
 
 namespace Elastic.Documentation.Site;
 
diff --git a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
index 2db4a455f..fca499cca 100644
--- a/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
+++ b/src/Elastic.Documentation.Site/Layout/_SecondaryNav.cshtml
@@ -1,4 +1,3 @@
-@using Elastic.Documentation.Configuration.Builder
 @inherits RazorSlice<Elastic.Documentation.Site.GlobalLayoutViewModel>
 <nav id="secondary-nav" hx-disable="true" class="bg-grey-10 border-t-1 border-grey-20 font-sans font-semibold text-sm text-ink-light md:text-base">
 	<div class="max-w-(--max-layout-width) flex mx-auto justify-between items-center p-6">
diff --git a/src/Elastic.Documentation/AppliesTo/ApplicableTo.cs b/src/Elastic.Documentation/AppliesTo/ApplicableTo.cs
index 29cf72b3c..496f45291 100644
--- a/src/Elastic.Documentation/AppliesTo/ApplicableTo.cs
+++ b/src/Elastic.Documentation/AppliesTo/ApplicableTo.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.Collections;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 using Elastic.Documentation.Diagnostics;
 using YamlDotNet.Serialization;
diff --git a/src/Elastic.Documentation/Search/DocumentationDocument.cs b/src/Elastic.Documentation/Search/DocumentationDocument.cs
index 2053ec6ee..df036320d 100644
--- a/src/Elastic.Documentation/Search/DocumentationDocument.cs
+++ b/src/Elastic.Documentation/Search/DocumentationDocument.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Collections;
 using System.Text.Json.Serialization;
 using Elastic.Documentation.AppliesTo;
 
diff --git a/src/Elastic.Documentation/Serialization/SourceGenerationContext.cs b/src/Elastic.Documentation/Serialization/SourceGenerationContext.cs
index a5313f6c0..5feb7a18f 100644
--- a/src/Elastic.Documentation/Serialization/SourceGenerationContext.cs
+++ b/src/Elastic.Documentation/Serialization/SourceGenerationContext.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Collections.Frozen;
 using System.Text.Json.Serialization;
 using Elastic.Documentation.AppliesTo;
 using Elastic.Documentation.Links;
diff --git a/src/Elastic.Markdown/DocumentationGenerator.cs b/src/Elastic.Markdown/DocumentationGenerator.cs
index b4133f990..723e8f32b 100644
--- a/src/Elastic.Markdown/DocumentationGenerator.cs
+++ b/src/Elastic.Markdown/DocumentationGenerator.cs
@@ -13,11 +13,8 @@
 using Elastic.Documentation.Site.Navigation;
 using Elastic.Documentation.State;
 using Elastic.Markdown.Exporters;
-using Elastic.Markdown.Helpers;
 using Elastic.Markdown.IO;
 using Elastic.Markdown.Links.CrossLinks;
-using Elastic.Markdown.Myst.Renderers;
-using Elastic.Markdown.Myst.Renderers.LlmMarkdown;
 using Markdig.Syntax;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/Elastic.Markdown/Exporters/LlmMarkdownExporter.cs b/src/Elastic.Markdown/Exporters/LlmMarkdownExporter.cs
index e8b1cb572..ea54b9520 100644
--- a/src/Elastic.Markdown/Exporters/LlmMarkdownExporter.cs
+++ b/src/Elastic.Markdown/Exporters/LlmMarkdownExporter.cs
@@ -8,7 +8,6 @@
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Builder;
 using Elastic.Markdown.Helpers;
-using Elastic.Markdown.Myst.Renderers.LlmMarkdown;
 using Markdig.Syntax;
 
 namespace Elastic.Markdown.Exporters;
diff --git a/src/Elastic.Markdown/Helpers/Interpolation.cs b/src/Elastic.Markdown/Helpers/Interpolation.cs
index 2c40116e9..52ba262d1 100644
--- a/src/Elastic.Markdown/Helpers/Interpolation.cs
+++ b/src/Elastic.Markdown/Helpers/Interpolation.cs
@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information
 
 using System.Diagnostics.CodeAnalysis;
-using System.Text.Json;
 using System.Text.RegularExpressions;
-using Elastic.Documentation;
 using Elastic.Documentation.Diagnostics;
 using Elastic.Markdown.Myst;
 using Elastic.Markdown.Myst.InlineParsers.Substitution;
@@ -79,11 +77,9 @@ private static bool ReplaceSubstitutions(
 			{
 				if (lookup.TryGetValue(cleanKey, out var value))
 				{
-					// Apply mutations if present using shared utility
+					// Apply mutations if present using a shared utility
 					if (mutations.Length > 0)
-					{
 						value = SubstitutionMutationHelper.ApplyMutations(value, mutations);
-					}
 
 					collector?.CollectUsedSubstitutionKey(cleanKey);
 
diff --git a/src/Elastic.Markdown/HtmlWriter.cs b/src/Elastic.Markdown/HtmlWriter.cs
index 190399205..e940fa79b 100644
--- a/src/Elastic.Markdown/HtmlWriter.cs
+++ b/src/Elastic.Markdown/HtmlWriter.cs
@@ -5,14 +5,11 @@
 using System.IO.Abstractions;
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration.Builder;
-using Elastic.Documentation.Extensions;
 using Elastic.Documentation.Legacy;
 using Elastic.Documentation.Site.FileProviders;
 using Elastic.Documentation.Site.Navigation;
 using Elastic.Markdown.Extensions.DetectionRules;
 using Elastic.Markdown.IO;
-using Elastic.Markdown.Myst.Renderers;
-using Elastic.Markdown.Myst.Renderers.LlmMarkdown;
 using Elastic.Markdown.Page;
 using Markdig.Syntax;
 using RazorSlices;
diff --git a/src/Elastic.Markdown/IO/DocumentationFile.cs b/src/Elastic.Markdown/IO/DocumentationFile.cs
index e867af7d7..a4d53b89e 100644
--- a/src/Elastic.Markdown/IO/DocumentationFile.cs
+++ b/src/Elastic.Markdown/IO/DocumentationFile.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 using System.IO.Abstractions;
-using Elastic.Documentation.Site;
 using Elastic.Markdown.Myst;
 using Elastic.Markdown.Myst.FrontMatter;
 
diff --git a/src/Elastic.Markdown/IO/MarkdownFile.cs b/src/Elastic.Markdown/IO/MarkdownFile.cs
index 19c33c1a0..b5b738d56 100644
--- a/src/Elastic.Markdown/IO/MarkdownFile.cs
+++ b/src/Elastic.Markdown/IO/MarkdownFile.cs
@@ -7,7 +7,6 @@
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.Navigation;
-using Elastic.Documentation.Site;
 using Elastic.Documentation.Site.Navigation;
 using Elastic.Markdown.Helpers;
 using Elastic.Markdown.Links.CrossLinks;
@@ -19,7 +18,6 @@
 using Elastic.Markdown.Myst.InlineParsers;
 using Markdig;
 using Markdig.Extensions.Yaml;
-using Markdig.Renderers.Roundtrip;
 using Markdig.Syntax;
 
 namespace Elastic.Markdown.IO;
@@ -294,9 +292,7 @@ public static List<PageTocItem> GetAnchors(
 				var processedTitle = step.Title;
 				// Apply substitutions to step titles
 				if (subs.Count > 0 && processedTitle.AsSpan().ReplaceSubstitutions(subs, set.Context.Collector, out var replacement))
-				{
 					processedTitle = replacement;
-				}
 
 				return new
 				{
diff --git a/src/Elastic.Markdown/IO/Navigation/TableOfContentsTreeCollector.cs b/src/Elastic.Markdown/IO/Navigation/TableOfContentsTreeCollector.cs
index 103a91a93..bee43324e 100644
--- a/src/Elastic.Markdown/IO/Navigation/TableOfContentsTreeCollector.cs
+++ b/src/Elastic.Markdown/IO/Navigation/TableOfContentsTreeCollector.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.Diagnostics.CodeAnalysis;
-using Elastic.Documentation.Configuration.TableOfContents;
 
 namespace Elastic.Markdown.IO.Navigation;
 
diff --git a/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockParser.cs b/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockParser.cs
index 896f8ab69..8b34aca0f 100644
--- a/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockParser.cs
+++ b/src/Elastic.Markdown/Myst/CodeBlocks/EnhancedCodeBlockParser.cs
@@ -6,9 +6,7 @@
 using Elastic.Documentation.AppliesTo;
 using Elastic.Markdown.Diagnostics;
 using Elastic.Markdown.Helpers;
-using Elastic.Markdown.Myst.Directives;
 using Elastic.Markdown.Myst.Directives.AppliesTo;
-using Elastic.Markdown.Myst.FrontMatter;
 using Markdig.Helpers;
 using Markdig.Parsers;
 using Markdig.Syntax;
diff --git a/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml b/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml
index a34f70721..5d19d9b6d 100644
--- a/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml
+++ b/src/Elastic.Markdown/Myst/Components/ApplicableToComponent.cshtml
@@ -2,7 +2,6 @@
 @using Elastic.Documentation
 @using Elastic.Documentation.AppliesTo
 @using Elastic.Documentation.Configuration.Versions
-@using Elastic.Markdown.Myst.FrontMatter
 @inherits RazorSlice<Elastic.Markdown.Myst.Components.ApplicableToViewModel>
 
 @{
diff --git a/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs b/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs
index af844a84f..103226fb7 100644
--- a/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs
+++ b/src/Elastic.Markdown/Myst/Components/ApplicableToViewModel.cs
@@ -4,7 +4,6 @@
 
 using Elastic.Documentation.AppliesTo;
 using Elastic.Documentation.Configuration.Versions;
-using Elastic.Markdown.Myst.FrontMatter;
 
 namespace Elastic.Markdown.Myst.Components;
 
diff --git a/src/Elastic.Markdown/Myst/Directives/AppliesTo/AppliesToDirective.cs b/src/Elastic.Markdown/Myst/Directives/AppliesTo/AppliesToDirective.cs
index 5852b4bec..ceca05129 100644
--- a/src/Elastic.Markdown/Myst/Directives/AppliesTo/AppliesToDirective.cs
+++ b/src/Elastic.Markdown/Myst/Directives/AppliesTo/AppliesToDirective.cs
@@ -4,7 +4,6 @@
 
 using Elastic.Documentation.AppliesTo;
 using Elastic.Markdown.Myst.CodeBlocks;
-using Elastic.Markdown.Myst.FrontMatter;
 using Markdig.Parsers;
 
 namespace Elastic.Markdown.Myst.Directives.AppliesTo;
diff --git a/src/Elastic.Markdown/Myst/Directives/CsvInclude/CsvIncludeBlock.cs b/src/Elastic.Markdown/Myst/Directives/CsvInclude/CsvIncludeBlock.cs
index 6e326b3bb..1fffcb5ba 100644
--- a/src/Elastic.Markdown/Myst/Directives/CsvInclude/CsvIncludeBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/CsvInclude/CsvIncludeBlock.cs
@@ -2,8 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Globalization;
-using System.IO.Abstractions;
 using Elastic.Markdown.Diagnostics;
 
 namespace Elastic.Markdown.Myst.Directives.CsvInclude;
diff --git a/src/Elastic.Markdown/Myst/Directives/CsvInclude/CsvReader.cs b/src/Elastic.Markdown/Myst/Directives/CsvInclude/CsvReader.cs
index 702086376..50b9f85e7 100644
--- a/src/Elastic.Markdown/Myst/Directives/CsvInclude/CsvReader.cs
+++ b/src/Elastic.Markdown/Myst/Directives/CsvInclude/CsvReader.cs
@@ -31,9 +31,7 @@ private static IEnumerable<string[]> ReadWithSep(string filePath, string separat
 			{
 				var rowData = new string[row.ColCount];
 				for (var i = 0; i < row.ColCount; i++)
-				{
 					rowData[i] = row[i].ToString();
-				}
 				yield return rowData;
 			}
 		}
diff --git a/src/Elastic.Markdown/Myst/Directives/Diagram/DiagramEncoder.cs b/src/Elastic.Markdown/Myst/Directives/Diagram/DiagramEncoder.cs
index 94303faf8..a698ed738 100644
--- a/src/Elastic.Markdown/Myst/Directives/Diagram/DiagramEncoder.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Diagram/DiagramEncoder.cs
@@ -59,9 +59,7 @@ private static byte[] Deflate(byte[] data, CompressionLevel? level = null)
 
 #if NET6_0_OR_GREATER
 		using (var zlibStream = level.HasValue ? new ZLibStream(memStream, level.Value, true) : new ZLibStream(memStream, CompressionMode.Compress, true))
-		{
 			zlibStream.Write(data);
-		}
 #else
 		// Reference: https://yal.cc/cs-deflatestream-zlib/#code
 
diff --git a/src/Elastic.Markdown/Myst/Directives/Image/ImageCarouselBlock.cs b/src/Elastic.Markdown/Myst/Directives/Image/ImageCarouselBlock.cs
index 7cc77c998..3a4d51d65 100644
--- a/src/Elastic.Markdown/Myst/Directives/Image/ImageCarouselBlock.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Image/ImageCarouselBlock.cs
@@ -2,11 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Elastic.Markdown.Diagnostics;
-using Elastic.Markdown.Myst;
 
 namespace Elastic.Markdown.Myst.Directives.Image;
 
@@ -29,9 +25,7 @@ public override void FinalizeAndValidate(ParserContext context)
 		{
 			var validHeights = new[] { "none", "small", "medium" };
 			if (!validHeights.Contains(MaxHeight.ToLower()))
-			{
 				this.EmitWarning($"Invalid max-height value '{MaxHeight}'. Valid options are: none, small, medium. Defaulting to 'none'.");
-			}
 		}
 
 		// Process child image blocks directly
diff --git a/src/Elastic.Markdown/Myst/Directives/Image/ImageCarouselViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Image/ImageCarouselViewModel.cs
index 314aa162c..4b036dc4c 100644
--- a/src/Elastic.Markdown/Myst/Directives/Image/ImageCarouselViewModel.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Image/ImageCarouselViewModel.cs
@@ -2,10 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Text;
-using Elastic.Documentation.Extensions;
-using Elastic.Markdown.Myst.Directives.Image;
-
 namespace Elastic.Markdown.Myst.Directives.Image;
 
 public class ImageCarouselViewModel : DirectiveViewModel
diff --git a/src/Elastic.Markdown/Myst/Directives/Stepper/StepViewModel.cs b/src/Elastic.Markdown/Myst/Directives/Stepper/StepViewModel.cs
index b7f17cdd8..5369468df 100644
--- a/src/Elastic.Markdown/Myst/Directives/Stepper/StepViewModel.cs
+++ b/src/Elastic.Markdown/Myst/Directives/Stepper/StepViewModel.cs
@@ -3,9 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Markdown.Helpers;
-using Elastic.Markdown.IO;
-using Markdig.Syntax;
-using Markdig.Syntax.Inlines;
 using Microsoft.AspNetCore.Html;
 
 namespace Elastic.Markdown.Myst.Directives.Stepper;
@@ -32,7 +29,7 @@ public HtmlString RenderTitle()
 		{
 			MarkdownSourcePath = directiveBlock.CurrentFile,
 			YamlFrontMatter = yamlFrontMatter,
-			DocumentationFileLookup = (path) => null!,
+			DocumentationFileLookup = _ => null!,
 			CrossLinkResolver = null!
 		});
 
diff --git a/src/Elastic.Markdown/Myst/FrontMatter/FrontMatterParser.cs b/src/Elastic.Markdown/Myst/FrontMatter/FrontMatterParser.cs
index b00922594..f58ba115d 100644
--- a/src/Elastic.Markdown/Myst/FrontMatter/FrontMatterParser.cs
+++ b/src/Elastic.Markdown/Myst/FrontMatter/FrontMatterParser.cs
@@ -4,7 +4,6 @@
 
 using Elastic.Documentation.AppliesTo;
 using Elastic.Documentation.Configuration.Builder;
-using Elastic.Documentation.Site;
 using YamlDotNet.Serialization;
 
 namespace Elastic.Markdown.Myst.FrontMatter;
diff --git a/src/Elastic.Markdown/Myst/InlineParsers/Substitution/SubstitutionMutationHelper.cs b/src/Elastic.Markdown/Myst/InlineParsers/Substitution/SubstitutionMutationHelper.cs
index 10b347d92..f5e696a9c 100644
--- a/src/Elastic.Markdown/Myst/InlineParsers/Substitution/SubstitutionMutationHelper.cs
+++ b/src/Elastic.Markdown/Myst/InlineParsers/Substitution/SubstitutionMutationHelper.cs
@@ -2,8 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System;
-using System.Linq;
 using System.Text.Json;
 using Elastic.Documentation;
 
@@ -39,9 +37,7 @@ public static string ApplyMutations(string value, IReadOnlyCollection<Substituti
 	{
 		var result = value;
 		foreach (var mutation in mutations)
-		{
 			result = ApplySingleMutation(result, mutation);
-		}
 		return result;
 	}
 
@@ -58,9 +54,7 @@ public static string ApplyMutations(string value, string[] mutations)
 		{
 			var trimmedMutation = mutationStr.Trim();
 			if (SubstitutionMutationExtensions.TryParse(trimmedMutation, out var mutation, true, true))
-			{
 				result = ApplySingleMutation(result, mutation);
-			}
 		}
 		return result;
 	}
diff --git a/src/Elastic.Markdown/Myst/InlineParsers/Substitution/SubstitutionParser.cs b/src/Elastic.Markdown/Myst/InlineParsers/Substitution/SubstitutionParser.cs
index 08422bd72..78c29dc8f 100644
--- a/src/Elastic.Markdown/Myst/InlineParsers/Substitution/SubstitutionParser.cs
+++ b/src/Elastic.Markdown/Myst/InlineParsers/Substitution/SubstitutionParser.cs
@@ -5,10 +5,6 @@
 using System.Buffers;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-using System.Text.Json;
-using Elastic.Documentation;
 using Elastic.Documentation.Diagnostics;
 using Elastic.Markdown.Diagnostics;
 using Markdig.Helpers;
diff --git a/src/Elastic.Markdown/Myst/InlineParsers/SubstitutionInlineCode/SubstitutionInlineCodeParser.cs b/src/Elastic.Markdown/Myst/InlineParsers/SubstitutionInlineCode/SubstitutionInlineCodeParser.cs
index 24f1e222d..47d16deea 100644
--- a/src/Elastic.Markdown/Myst/InlineParsers/SubstitutionInlineCode/SubstitutionInlineCodeParser.cs
+++ b/src/Elastic.Markdown/Myst/InlineParsers/SubstitutionInlineCode/SubstitutionInlineCodeParser.cs
@@ -2,21 +2,16 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Buffers;
 using System.Diagnostics;
 using System.Text;
 using System.Text.RegularExpressions;
-using Elastic.Documentation;
 using Elastic.Documentation.Diagnostics;
 using Elastic.Markdown.Diagnostics;
 using Elastic.Markdown.Myst.InlineParsers.Substitution;
 using Elastic.Markdown.Myst.Roles;
-using Markdig.Helpers;
 using Markdig.Parsers;
 using Markdig.Renderers;
 using Markdig.Renderers.Html;
-using Markdig.Syntax;
-using Markdig.Syntax.Inlines;
 
 namespace Elastic.Markdown.Myst.InlineParsers.SubstitutionInlineCode;
 
@@ -97,13 +92,9 @@ private static string ProcessSubstitutions(string content, ParserContext context
 						{
 							var trimmedMutation = mutationStr.Trim();
 							if (SubstitutionMutationExtensions.TryParse(trimmedMutation, out var mutation, true, true))
-							{
 								mutations.Add(mutation);
-							}
 							else
-							{
 								processor.EmitError(line + 1, column + match.Index, match.Length, $"Mutation '{trimmedMutation}' on {{{key}}} is undefined");
-							}
 						}
 
 						if (mutations.Count > 0)
diff --git a/src/Elastic.Markdown/Myst/MarkdownParser.cs b/src/Elastic.Markdown/Myst/MarkdownParser.cs
index 1609c64ce..8eb3dde01 100644
--- a/src/Elastic.Markdown/Myst/MarkdownParser.cs
+++ b/src/Elastic.Markdown/Myst/MarkdownParser.cs
@@ -238,9 +238,7 @@ private static string PreprocessLinkSubstitutions(string markdown, ParserContext
 				{
 					blockEnd += lines[j].Length + 1; // +1 for newline
 					if (lines[j].TrimStart().StartsWith("```"))
-					{
 						break;
-					}
 				}
 
 				ranges.Add((blockStart, blockEnd, subsDisabled));
diff --git a/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs b/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
index 9114f7fe8..1fc323598 100644
--- a/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Renderers/HtmxLinkInlineRenderer.cs
@@ -2,8 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Reflection;
-using Elastic.Documentation.Extensions;
 using Elastic.Documentation.Site;
 using Elastic.Documentation.Site.Navigation;
 using Elastic.Markdown.IO;
@@ -20,7 +18,7 @@ protected override void Write(HtmlRenderer renderer, LinkInline link)
 	{
 		if (renderer.EnableHtmlForInline && !link.IsImage)
 		{
-			if (link.GetData(nameof(ParserContext.CurrentUrlPath)) is not string currentUrl)
+			if (link.GetData(nameof(ParserContext.CurrentUrlPath)) is not string)
 			{
 				base.Write(renderer, link);
 				return;
diff --git a/src/Elastic.Markdown/Myst/Renderers/LlmMarkdown/LlmBlockRenderers.cs b/src/Elastic.Markdown/Myst/Renderers/LlmMarkdown/LlmBlockRenderers.cs
index 8fdebf0e6..70abcea02 100644
--- a/src/Elastic.Markdown/Myst/Renderers/LlmMarkdown/LlmBlockRenderers.cs
+++ b/src/Elastic.Markdown/Myst/Renderers/LlmMarkdown/LlmBlockRenderers.cs
@@ -282,9 +282,7 @@ protected override void Write(LlmMarkdownRenderer renderer, Table table)
 
 		// Render table body with aligned columns
 		foreach (var row in table.Skip(1).Cast<TableRow>())
-		{
 			RenderTableRowCells(renderer, row, columnWidths);
-		}
 	}
 
 	/// <summary>
diff --git a/src/Elastic.Markdown/Myst/Roles/AppliesTo/AppliesToRole.cs b/src/Elastic.Markdown/Myst/Roles/AppliesTo/AppliesToRole.cs
index fffd97f55..ad2e13627 100644
--- a/src/Elastic.Markdown/Myst/Roles/AppliesTo/AppliesToRole.cs
+++ b/src/Elastic.Markdown/Myst/Roles/AppliesTo/AppliesToRole.cs
@@ -7,7 +7,6 @@
 using Elastic.Documentation.AppliesTo;
 using Elastic.Documentation.Configuration;
 using Elastic.Markdown.Diagnostics;
-using Elastic.Markdown.Myst.FrontMatter;
 using Markdig;
 using Markdig.Parsers;
 using Markdig.Parsers.Inlines;
diff --git a/src/Elastic.Markdown/Myst/Roles/Icons/IconRoleRenderer.cs b/src/Elastic.Markdown/Myst/Roles/Icons/IconRoleRenderer.cs
index 8831baaad..e4f0593d7 100644
--- a/src/Elastic.Markdown/Myst/Roles/Icons/IconRoleRenderer.cs
+++ b/src/Elastic.Markdown/Myst/Roles/Icons/IconRoleRenderer.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Diagnostics.CodeAnalysis;
 using Markdig;
 using Markdig.Parsers.Inlines;
 using Markdig.Renderers;
diff --git a/src/Elastic.Markdown/Myst/Roles/Kbd/KbdParser.cs b/src/Elastic.Markdown/Myst/Roles/Kbd/KbdParser.cs
index 4cd459946..59cc0c56b 100644
--- a/src/Elastic.Markdown/Myst/Roles/Kbd/KbdParser.cs
+++ b/src/Elastic.Markdown/Myst/Roles/Kbd/KbdParser.cs
@@ -2,8 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System;
-using Elastic.Markdown.Diagnostics;
 using Markdig.Parsers;
 
 namespace Elastic.Markdown.Myst.Roles.Kbd;
diff --git a/src/Elastic.Markdown/Page/IndexViewModel.cs b/src/Elastic.Markdown/Page/IndexViewModel.cs
index 2df6b16d4..9977e951f 100644
--- a/src/Elastic.Markdown/Page/IndexViewModel.cs
+++ b/src/Elastic.Markdown/Page/IndexViewModel.cs
@@ -12,7 +12,6 @@
 using Elastic.Documentation.Site.Navigation;
 using Elastic.Markdown.IO;
 using Elastic.Markdown.IO.Navigation;
-using Elastic.Markdown.Myst.FrontMatter;
 
 namespace Elastic.Markdown.Page;
 
diff --git a/src/api/Elastic.Documentation.Api.Core/Search/SearchUsecase.cs b/src/api/Elastic.Documentation.Api.Core/Search/SearchUsecase.cs
index ec1badef7..256ea1049 100644
--- a/src/api/Elastic.Documentation.Api.Core/Search/SearchUsecase.cs
+++ b/src/api/Elastic.Documentation.Api.Core/Search/SearchUsecase.cs
@@ -2,8 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using Elastic.Documentation.Api.Core.Validation;
-
 namespace Elastic.Documentation.Api.Core.Search;
 
 public class SearchUsecase(ISearchGateway searchGateway)
diff --git a/src/tooling/Elastic.Documentation.Tooling/CompositeDisposableServiceProvider.cs b/src/tooling/Elastic.Documentation.Tooling/CompositeDisposableServiceProvider.cs
index 3e29e4aeb..1cc4cedf1 100644
--- a/src/tooling/Elastic.Documentation.Tooling/CompositeDisposableServiceProvider.cs
+++ b/src/tooling/Elastic.Documentation.Tooling/CompositeDisposableServiceProvider.cs
@@ -10,7 +10,7 @@ namespace Elastic.Documentation.Tooling;
 // This exists temporarily while https://github.com/Cysharp/ConsoleAppFramework/pull/188 is open
 
 public class CompositeDisposableServiceProvider(IDisposable host, IServiceProvider serviceServiceProvider, IDisposable scope, IServiceProvider serviceProvider)
-	: IServiceProvider, IKeyedServiceProvider, IDisposable, IAsyncDisposable
+	: IKeyedServiceProvider, IDisposable, IAsyncDisposable
 {
 	public object? GetService(Type serviceType) => serviceProvider.GetService(serviceType);
 
diff --git a/src/tooling/Elastic.Documentation.Tooling/Exporters/ElasticsearchMarkdownExporter.cs b/src/tooling/Elastic.Documentation.Tooling/Exporters/ElasticsearchMarkdownExporter.cs
index 0055ee866..e5bff6804 100644
--- a/src/tooling/Elastic.Documentation.Tooling/Exporters/ElasticsearchMarkdownExporter.cs
+++ b/src/tooling/Elastic.Documentation.Tooling/Exporters/ElasticsearchMarkdownExporter.cs
@@ -178,8 +178,6 @@ private async ValueTask<bool> TryWrite(DocumentationDocument document, Cancel ct
 	public async ValueTask<bool> ExportAsync(MarkdownExportFileContext fileContext, Cancel ctx)
 	{
 		var file = fileContext.SourceFile;
-		var document = fileContext.Document;
-
 		var url = file.Url;
 
 		//use LLM text if it was already provided (because we run with both llm and elasticsearch output)
diff --git a/src/tooling/Elastic.Documentation.Tooling/Filters/CatchExceptionFilter.cs b/src/tooling/Elastic.Documentation.Tooling/Filters/CatchExceptionFilter.cs
index 5fd769988..5f9d2b934 100644
--- a/src/tooling/Elastic.Documentation.Tooling/Filters/CatchExceptionFilter.cs
+++ b/src/tooling/Elastic.Documentation.Tooling/Filters/CatchExceptionFilter.cs
@@ -13,7 +13,7 @@ public sealed class CatchExceptionFilter(ConsoleAppFilter next, ILogger<CatchExc
 	private bool _cancelKeyPressed;
 	public override async Task InvokeAsync(ConsoleAppContext context, Cancel cancellationToken)
 	{
-		Console.CancelKeyPress += (sender, e) =>
+		Console.CancelKeyPress += (_, _) =>
 		{
 			logger.LogInformation("Received CTRL+C cancelling");
 			_cancelKeyPressed = true;
diff --git a/src/tooling/docs-assembler/AssembleContext.cs b/src/tooling/docs-assembler/AssembleContext.cs
index 3956a505c..131299530 100644
--- a/src/tooling/docs-assembler/AssembleContext.cs
+++ b/src/tooling/docs-assembler/AssembleContext.cs
@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.IO.Abstractions;
-using System.Reflection;
-using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Assembler;
 using Elastic.Documentation.Configuration.Versions;
diff --git a/src/tooling/docs-assembler/AssembleSources.cs b/src/tooling/docs-assembler/AssembleSources.cs
index 1bd8c1aa6..a57084b2e 100644
--- a/src/tooling/docs-assembler/AssembleSources.cs
+++ b/src/tooling/docs-assembler/AssembleSources.cs
@@ -11,8 +11,6 @@
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Assembler;
 using Elastic.Documentation.Configuration.Builder;
-using Elastic.Documentation.Configuration.Versions;
-using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.LinkIndex;
 using Elastic.Markdown.IO.Navigation;
 using Elastic.Markdown.Links.CrossLinks;
@@ -132,21 +130,19 @@ private static FrozenDictionary<string, IReadOnlyCollection<string>> GetLegacyUr
 	{
 		var dictionary = new Dictionary<string, IReadOnlyCollection<string>>();
 		var reader = new YamlStreamReader(context.ConfigurationFileProvider.LegacyUrlMappingsFile, context.Collector);
-		string? stack = null;
 		foreach (var entry in reader.Read())
 		{
 			switch (entry.Key)
 			{
 				case "mappings":
-					ReadHistoryMappings(dictionary, reader, entry, stack);
+					ReadHistoryMappings(dictionary, reader, entry);
 					break;
 			}
 		}
 
 		return dictionary.OrderByDescending(x => x.Key.Length).ToFrozenDictionary();
 
-		static void ReadHistoryMappings(IDictionary<string, IReadOnlyCollection<string>> dictionary, YamlStreamReader reader, YamlToplevelKey entry,
-			string? newStack)
+		static void ReadHistoryMappings(IDictionary<string, IReadOnlyCollection<string>> dictionary, YamlStreamReader reader, YamlToplevelKey entry)
 		{
 			if (entry.Entry.Value is not YamlMappingNode mappings)
 			{
@@ -224,7 +220,7 @@ static void ReadBlock(
 			YamlMappingNode tocEntry,
 			string? parent,
 			int depth,
-			int order,
+			int order, //TODO Remove this parameter
 			Uri? topLevelSource,
 			Uri? parentSource
 		)
diff --git a/src/tooling/docs-assembler/Building/AssemblerBuilder.cs b/src/tooling/docs-assembler/Building/AssemblerBuilder.cs
index fce3eb991..083d11a35 100644
--- a/src/tooling/docs-assembler/Building/AssemblerBuilder.cs
+++ b/src/tooling/docs-assembler/Building/AssemblerBuilder.cs
@@ -6,7 +6,6 @@
 using System.Text.Json;
 using Documentation.Assembler.Navigation;
 using Elastic.Documentation;
-using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Legacy;
 using Elastic.Documentation.Links;
 using Elastic.Documentation.Serialization;
diff --git a/src/tooling/docs-assembler/Cli/DeployCommands.cs b/src/tooling/docs-assembler/Cli/DeployCommands.cs
index 0f67a3baf..d5ceaca40 100644
--- a/src/tooling/docs-assembler/Cli/DeployCommands.cs
+++ b/src/tooling/docs-assembler/Cli/DeployCommands.cs
@@ -14,7 +14,6 @@
 using Elastic.Documentation.Configuration.Assembler;
 using Elastic.Documentation.Serialization;
 using Elastic.Documentation.Tooling.Diagnostics.Console;
-using Elastic.Documentation.Tooling.Filters;
 using Microsoft.Extensions.Logging;
 
 namespace Documentation.Assembler.Cli;
diff --git a/src/tooling/docs-assembler/Cli/InboundLinkCommands.cs b/src/tooling/docs-assembler/Cli/InboundLinkCommands.cs
index e0f5c2841..c3c3642d2 100644
--- a/src/tooling/docs-assembler/Cli/InboundLinkCommands.cs
+++ b/src/tooling/docs-assembler/Cli/InboundLinkCommands.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Diagnostics.CodeAnalysis;
 using System.IO.Abstractions;
 using Actions.Core.Services;
 using ConsoleAppFramework;
diff --git a/src/tooling/docs-assembler/Cli/LegacyDocsCommands.cs b/src/tooling/docs-assembler/Cli/LegacyDocsCommands.cs
index bb1b155b5..08856c472 100644
--- a/src/tooling/docs-assembler/Cli/LegacyDocsCommands.cs
+++ b/src/tooling/docs-assembler/Cli/LegacyDocsCommands.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.Diagnostics.CodeAnalysis;
-using System.IO.Abstractions;
 using Actions.Core.Services;
 using ConsoleAppFramework;
 using Elastic.Documentation.LegacyDocs;
@@ -25,6 +24,7 @@ private void AssignOutputLogger()
 
 	/// <summary> Generate the bloom filter binary file </summary>
 	/// <param name="builtDocsDir">The local dir of local elastic/built-docs repository</param>
+	/// <param name="ctx"></param>
 	public async Task<int> CreateBloomBin(string builtDocsDir, Cancel ctx = default)
 	{
 		AssignOutputLogger();
@@ -41,6 +41,7 @@ public async Task<int> CreateBloomBin(string builtDocsDir, Cancel ctx = default)
 
 	/// <summary> Generate the bloom filter binary file </summary>
 	/// <param name="path">The local dir of local elastic/built-docs repository</param>
+	/// <param name="ctx"></param>
 	public async Task<int> PageExists(string path, Cancel ctx = default)
 	{
 		AssignOutputLogger();
diff --git a/src/tooling/docs-assembler/Cli/NavigationCommands.cs b/src/tooling/docs-assembler/Cli/NavigationCommands.cs
index 81c59134f..b26f2c9b6 100644
--- a/src/tooling/docs-assembler/Cli/NavigationCommands.cs
+++ b/src/tooling/docs-assembler/Cli/NavigationCommands.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Diagnostics.CodeAnalysis;
 using System.IO.Abstractions;
 using Actions.Core.Services;
 using ConsoleAppFramework;
diff --git a/src/tooling/docs-assembler/Cli/RepositoryCommands.cs b/src/tooling/docs-assembler/Cli/RepositoryCommands.cs
index 01f53200c..1ac7d4726 100644
--- a/src/tooling/docs-assembler/Cli/RepositoryCommands.cs
+++ b/src/tooling/docs-assembler/Cli/RepositoryCommands.cs
@@ -43,6 +43,7 @@ private void AssignOutputLogger()
 
 	/// <summary> Clone the configuration folder </summary>
 	/// <param name="gitRef">The git reference of the config, defaults to 'main'</param>
+	/// <param name="ctx"></param>
 	[Command("init-config")]
 	public async Task<int> CloneConfigurationFolder(string? gitRef = null, Cancel ctx = default)
 	{
diff --git a/src/tooling/docs-assembler/Deploying/AwsCloudFrontKeyValueStoreProxy.cs b/src/tooling/docs-assembler/Deploying/AwsCloudFrontKeyValueStoreProxy.cs
index f6226e88c..58277c646 100644
--- a/src/tooling/docs-assembler/Deploying/AwsCloudFrontKeyValueStoreProxy.cs
+++ b/src/tooling/docs-assembler/Deploying/AwsCloudFrontKeyValueStoreProxy.cs
@@ -32,10 +32,12 @@ public void UpdateRedirects(string kvsName, IReadOnlyDictionary<string, string>
 		var existingRedirects = ListAllKeys(kvsArn);
 
 		var toPut = sourcedRedirects
-			.Select(kvp => new PutKeyRequestListItem { Key = kvp.Key, Value = kvp.Value });
+			.Select(kvp => new PutKeyRequestListItem { Key = kvp.Key, Value = kvp.Value })
+			.ToArray();
 		var toDelete = sourcedRedirects.Keys
 			.Except(existingRedirects)
-			.Select(k => new DeleteKeyRequestListItem { Key = k });
+			.Select(k => new DeleteKeyRequestListItem { Key = k })
+			.ToArray();
 
 		eTag = ProcessBatchUpdates(kvsArn, eTag, toDelete, KvsOperation.Deletes);
 		_ = ProcessBatchUpdates(kvsArn, eTag, toPut, KvsOperation.Puts);
@@ -115,11 +117,11 @@ private HashSet<string> ListAllKeys(string kvsArn)
 	private string ProcessBatchUpdates(
 		string kvsArn,
 		string eTag,
-		IEnumerable<object> items,
+		IReadOnlyCollection<object> items,
 		KvsOperation operation)
 	{
 		const int batchSize = 50;
-		ConsoleApp.Log($"Processing {items.Count()} items in batches of {batchSize} for {operation} update operation.");
+		ConsoleApp.Log($"Processing {items.Count} items in batches of {batchSize} for {operation} update operation.");
 		try
 		{
 			foreach (var batch in items.Chunk(batchSize))
diff --git a/src/tooling/docs-assembler/Legacy/PageLegacyUrlMapper.cs b/src/tooling/docs-assembler/Legacy/PageLegacyUrlMapper.cs
index c1fff1ad9..7f2228495 100644
--- a/src/tooling/docs-assembler/Legacy/PageLegacyUrlMapper.cs
+++ b/src/tooling/docs-assembler/Legacy/PageLegacyUrlMapper.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.IO.Abstractions;
 using Elastic.Documentation.Legacy;
 using Elastic.Documentation.LegacyDocs;
 
diff --git a/src/tooling/docs-assembler/Links/NavigationPrefixChecker.cs b/src/tooling/docs-assembler/Links/NavigationPrefixChecker.cs
index caa6a1fe9..14141aa93 100644
--- a/src/tooling/docs-assembler/Links/NavigationPrefixChecker.cs
+++ b/src/tooling/docs-assembler/Links/NavigationPrefixChecker.cs
@@ -95,7 +95,7 @@ private async Task FetchAndValidateCrossLinks(IDiagnosticsCollector collector, s
 
 			// Todo publish all relative folders as part of the link reference
 			// That way we don't need to iterate over all links and find all permutations of their relative paths
-			foreach (var (relativeLink, linkMetadata) in linkReference.Links)
+			foreach (var (relativeLink, _) in linkReference.Links)
 			{
 				var navigationPaths = _uriResolver.ResolveToSubPaths(new Uri($"{repository}://{relativeLink}"), relativeLink);
 				foreach (var navigationPath in navigationPaths)
diff --git a/src/tooling/docs-assembler/Navigation/AssemblerDocumentationSet.cs b/src/tooling/docs-assembler/Navigation/AssemblerDocumentationSet.cs
index bec76c528..8968a06c9 100644
--- a/src/tooling/docs-assembler/Navigation/AssemblerDocumentationSet.cs
+++ b/src/tooling/docs-assembler/Navigation/AssemblerDocumentationSet.cs
@@ -6,7 +6,6 @@
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Assembler;
-using Elastic.Documentation.Configuration.Versions;
 using Elastic.Markdown.IO;
 using Elastic.Markdown.IO.Navigation;
 using Elastic.Markdown.Links.CrossLinks;
diff --git a/src/tooling/docs-assembler/Navigation/GlobalNavigationFile.cs b/src/tooling/docs-assembler/Navigation/GlobalNavigationFile.cs
index 75f09a8ba..b730e0296 100644
--- a/src/tooling/docs-assembler/Navigation/GlobalNavigationFile.cs
+++ b/src/tooling/docs-assembler/Navigation/GlobalNavigationFile.cs
@@ -8,7 +8,6 @@
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Assembler;
 using Elastic.Documentation.Configuration.TableOfContents;
-using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.Navigation;
 using YamlDotNet.RepresentationModel;
 
diff --git a/src/tooling/docs-assembler/Sourcing/RepositorySourcesFetcher.cs b/src/tooling/docs-assembler/Sourcing/RepositorySourcesFetcher.cs
index 4f943b430..ccadeca05 100644
--- a/src/tooling/docs-assembler/Sourcing/RepositorySourcesFetcher.cs
+++ b/src/tooling/docs-assembler/Sourcing/RepositorySourcesFetcher.cs
@@ -9,7 +9,7 @@
 using Elastic.Documentation.LinkIndex;
 using Elastic.Documentation.Links;
 using Microsoft.Extensions.Logging;
-using ProcNet.Std;
+// ReSharper disable DuplicateItemInLoggerTemplate
 
 namespace Documentation.Assembler.Sourcing;
 
diff --git a/src/tooling/docs-builder/Cli/Commands.cs b/src/tooling/docs-builder/Cli/Commands.cs
index 785e7e07e..88d4606c3 100644
--- a/src/tooling/docs-builder/Cli/Commands.cs
+++ b/src/tooling/docs-builder/Cli/Commands.cs
@@ -10,17 +10,12 @@
 using Elastic.ApiExplorer;
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Configuration.Versions;
 using Elastic.Documentation.Refactor;
 using Elastic.Documentation.Tooling.Arguments;
 using Elastic.Documentation.Tooling.Diagnostics.Console;
 using Elastic.Markdown;
-using Elastic.Markdown.Exporters;
 using Elastic.Markdown.IO;
-using Elastic.Markdown.Myst.Renderers;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using static Elastic.Documentation.Exporter;
 
 namespace Documentation.Builder.Cli;
 
diff --git a/src/tooling/docs-builder/Cli/DiffCommands.cs b/src/tooling/docs-builder/Cli/DiffCommands.cs
index b7ee52be5..c80b61f6c 100644
--- a/src/tooling/docs-builder/Cli/DiffCommands.cs
+++ b/src/tooling/docs-builder/Cli/DiffCommands.cs
@@ -10,7 +10,6 @@
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Builder;
-using Elastic.Documentation.Configuration.Versions;
 using Elastic.Documentation.Tooling.Diagnostics.Console;
 using Microsoft.Extensions.Logging;
 
@@ -62,10 +61,10 @@ public async Task<int> ValidateRedirects([Argument] string? path = null, Cancel
 		}
 
 		IRepositoryTracker tracker = runningOnCi ? new IntegrationGitRepositoryTracker(path) : new LocalGitRepositoryTracker(collector, root, path);
-		var changed = tracker.GetChangedFiles();
+		var changed = tracker.GetChangedFiles().ToArray();
 
-		if (changed.Any())
-			_log.LogInformation("Found {Count} changes to files related to documentation in the current branch.", changed.Count());
+		if (changed.Length != 0)
+			_log.LogInformation("Found {Count} changes to files related to documentation in the current branch.", changed.Length);
 
 		foreach (var notFound in changed.DistinctBy(c => c.FilePath).Where(c => c.ChangeType is GitChangeType.Deleted or GitChangeType.Renamed
 																	&& !redirects.ContainsKey(c is RenamedGitChange renamed ? renamed.OldFilePath : c.FilePath)))
diff --git a/src/tooling/docs-builder/Cli/InboundLinkCommands.cs b/src/tooling/docs-builder/Cli/InboundLinkCommands.cs
index 7cc0fe9e2..a8be7e7cf 100644
--- a/src/tooling/docs-builder/Cli/InboundLinkCommands.cs
+++ b/src/tooling/docs-builder/Cli/InboundLinkCommands.cs
@@ -2,14 +2,12 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Diagnostics.CodeAnalysis;
 using System.IO.Abstractions;
 using Actions.Core.Services;
 using ConsoleAppFramework;
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Tooling.Diagnostics.Console;
-using Elastic.Documentation.Tooling.Filters;
 using Elastic.Markdown.Links.InboundLinks;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/tooling/docs-builder/Http/DocumentationWebHost.cs b/src/tooling/docs-builder/Http/DocumentationWebHost.cs
index cac4e260c..96505615d 100644
--- a/src/tooling/docs-builder/Http/DocumentationWebHost.cs
+++ b/src/tooling/docs-builder/Http/DocumentationWebHost.cs
@@ -6,19 +6,12 @@
 using System.Net;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Text.Json;
 using Documentation.Builder.Diagnostics.LiveMode;
 using Elastic.Documentation;
-using Elastic.Documentation.Api.Core;
-using Elastic.Documentation.Api.Core.AskAi;
 using Elastic.Documentation.Api.Infrastructure;
-using Elastic.Documentation.Api.Infrastructure.Adapters.AskAi;
-using Elastic.Documentation.Api.Infrastructure.Gcp;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Configuration.Versions;
 using Elastic.Documentation.ServiceDefaults;
 using Elastic.Documentation.Site.FileProviders;
-using Elastic.Documentation.Tooling;
 using Elastic.Markdown.IO;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -120,9 +113,7 @@ private void SetUpRoutes()
 					Console.WriteLine($"[UNHANDLED EXCEPTION] {ex.GetType().Name}: {ex.Message}");
 					Console.WriteLine($"[STACK TRACE] {ex.StackTrace}");
 					if (ex.InnerException != null)
-					{
 						Console.WriteLine($"[INNER EXCEPTION] {ex.InnerException.GetType().Name}: {ex.InnerException.Message}");
-					}
 
 					throw; // Re-throw to let ASP.NET Core handle it
 				}
diff --git a/src/tooling/docs-builder/Http/GcpIdTokenGenerator.cs b/src/tooling/docs-builder/Http/GcpIdTokenGenerator.cs
index eb280f041..139e47b21 100644
--- a/src/tooling/docs-builder/Http/GcpIdTokenGenerator.cs
+++ b/src/tooling/docs-builder/Http/GcpIdTokenGenerator.cs
@@ -113,9 +113,7 @@ private static async Task<string> ExchangeJwtForIdToken(string jwt, string targe
 		using var document = JsonDocument.Parse(responseJson);
 
 		if (document.RootElement.TryGetProperty("id_token", out var idTokenElement))
-		{
 			return idTokenElement.GetString() ?? throw new InvalidOperationException("ID token is null");
-		}
 
 		throw new InvalidOperationException("No id_token found in response");
 	}
diff --git a/src/tooling/docs-builder/Http/ReloadGeneratorService.cs b/src/tooling/docs-builder/Http/ReloadGeneratorService.cs
index fdc34e2e8..66235b18e 100644
--- a/src/tooling/docs-builder/Http/ReloadGeneratorService.cs
+++ b/src/tooling/docs-builder/Http/ReloadGeneratorService.cs
@@ -37,6 +37,7 @@ public async Task StartAsync(Cancel cancellationToken)
 	{
 		await ReloadableGenerator.ReloadAsync(cancellationToken);
 
+		// ReSharper disable once RedundantAssignment
 		var directory = ReloadableGenerator.Generator.DocumentationSet.SourceDirectory.FullName;
 #if DEBUG
 		directory = ReloadableGenerator.Generator.Context.DocumentationCheckoutDirectory?.FullName ?? throw new InvalidOperationException("No checkout directory");
diff --git a/src/tooling/docs-builder/Http/ReloadableGeneratorState.cs b/src/tooling/docs-builder/Http/ReloadableGeneratorState.cs
index 4aa826964..548b7f401 100644
--- a/src/tooling/docs-builder/Http/ReloadableGeneratorState.cs
+++ b/src/tooling/docs-builder/Http/ReloadableGeneratorState.cs
@@ -8,7 +8,6 @@
 using Elastic.Markdown;
 using Elastic.Markdown.Exporters;
 using Elastic.Markdown.IO;
-using Elastic.Markdown.Myst.Renderers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
diff --git a/src/tooling/docs-builder/Program.cs b/src/tooling/docs-builder/Program.cs
index ddef08cd4..eb4b5493c 100644
--- a/src/tooling/docs-builder/Program.cs
+++ b/src/tooling/docs-builder/Program.cs
@@ -3,14 +3,11 @@
 // See the LICENSE file in the project root for more information
 
 using System.Diagnostics.CodeAnalysis;
-using Actions.Core.Extensions;
 using ConsoleAppFramework;
 using Documentation.Builder.Cli;
-using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.ServiceDefaults;
 using Elastic.Documentation.Tooling;
 using Elastic.Documentation.Tooling.Filters;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
diff --git a/tests-integration/Elastic.Assembler.IntegrationTests/AssembleFixture.cs b/tests-integration/Elastic.Assembler.IntegrationTests/AssembleFixture.cs
index ad5a02944..bda41a813 100644
--- a/tests-integration/Elastic.Assembler.IntegrationTests/AssembleFixture.cs
+++ b/tests-integration/Elastic.Assembler.IntegrationTests/AssembleFixture.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Configuration;
 using Aspire.Hosting;
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Testing;
@@ -12,13 +11,12 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using static Elastic.Documentation.Aspire.ResourceNames;
-using ConfigurationManager = Microsoft.Extensions.Configuration.ConfigurationManager;
 
 [assembly: CaptureConsole, AssemblyFixture(typeof(Elastic.Assembler.IntegrationTests.DocumentationFixture))]
 
 namespace Elastic.Assembler.IntegrationTests;
 
-public static partial class DistributedApplicationExtensions
+public static class DistributedApplicationExtensions
 {
 	/// <summary>
 	/// Ensures all parameters in the application configuration have values set.
@@ -47,7 +45,7 @@ public async ValueTask InitializeAsync()
 	{
 		var builder = await DistributedApplicationTestingBuilder.CreateAsync<Projects.aspire>(
 			["--skip-private-repositories", "--assume-cloned"],
-			(options, settings) =>
+			(options, _) =>
 			{
 				options.DisableDashboard = true;
 				options.AllowUnsecuredTransport = true;
diff --git a/tests/Elastic.ApiExplorer.Tests/ReaderTests.cs b/tests/Elastic.ApiExplorer.Tests/ReaderTests.cs
index 273763675..dd7c5f731 100644
--- a/tests/Elastic.ApiExplorer.Tests/ReaderTests.cs
+++ b/tests/Elastic.ApiExplorer.Tests/ReaderTests.cs
@@ -5,7 +5,6 @@
 using System.IO.Abstractions;
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Configuration.Versions;
 using Elastic.Documentation.Diagnostics;
 using FluentAssertions;
 using Microsoft.Extensions.Logging.Abstractions;
diff --git a/tests/Elastic.Documentation.LegacyDocs.Tests/LegacyPageLookupTests.cs b/tests/Elastic.Documentation.LegacyDocs.Tests/LegacyPageLookupTests.cs
index 5dc818d58..26e6ddecc 100644
--- a/tests/Elastic.Documentation.LegacyDocs.Tests/LegacyPageLookupTests.cs
+++ b/tests/Elastic.Documentation.LegacyDocs.Tests/LegacyPageLookupTests.cs
@@ -2,7 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.IO.Abstractions;
 using FluentAssertions;
 
 namespace Elastic.Documentation.LegacyDocs.Tests;
diff --git a/tests/Elastic.Markdown.Tests/Directives/AdmonitionTests.cs b/tests/Elastic.Markdown.Tests/Directives/AdmonitionTests.cs
index 75f67eb04..7adf4f972 100644
--- a/tests/Elastic.Markdown.Tests/Directives/AdmonitionTests.cs
+++ b/tests/Elastic.Markdown.Tests/Directives/AdmonitionTests.cs
@@ -1,7 +1,7 @@
 // Licensed to Elasticsearch B.V under one or more agreements.
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
-using Elastic.Markdown.Myst.Directives;
+
 using Elastic.Markdown.Myst.Directives.Admonition;
 using FluentAssertions;
 
diff --git a/tests/Elastic.Markdown.Tests/Directives/DirectiveBaseTests.cs b/tests/Elastic.Markdown.Tests/Directives/DirectiveBaseTests.cs
index 0a7798c39..caf2bde88 100644
--- a/tests/Elastic.Markdown.Tests/Directives/DirectiveBaseTests.cs
+++ b/tests/Elastic.Markdown.Tests/Directives/DirectiveBaseTests.cs
@@ -2,9 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 using System.IO.Abstractions.TestingHelpers;
-using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Configuration.Versions;
 using Elastic.Markdown.IO;
 using Elastic.Markdown.Myst.Directives;
 using FluentAssertions;
diff --git a/tests/Elastic.Markdown.Tests/Directives/ImageCarouselTests.cs b/tests/Elastic.Markdown.Tests/Directives/ImageCarouselTests.cs
index ece33a3cd..2fc84bcf4 100644
--- a/tests/Elastic.Markdown.Tests/Directives/ImageCarouselTests.cs
+++ b/tests/Elastic.Markdown.Tests/Directives/ImageCarouselTests.cs
@@ -4,7 +4,6 @@
 
 using System.IO.Abstractions.TestingHelpers;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Myst.Directives;
 using Elastic.Markdown.Myst.Directives.Image;
 using FluentAssertions;
 
diff --git a/tests/Elastic.Markdown.Tests/Directives/ImageTests.cs b/tests/Elastic.Markdown.Tests/Directives/ImageTests.cs
index 1e0c71246..efeeb6a63 100644
--- a/tests/Elastic.Markdown.Tests/Directives/ImageTests.cs
+++ b/tests/Elastic.Markdown.Tests/Directives/ImageTests.cs
@@ -4,7 +4,6 @@
 
 using System.IO.Abstractions.TestingHelpers;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Myst.Directives;
 using Elastic.Markdown.Myst.Directives.Image;
 using FluentAssertions;
 
diff --git a/tests/Elastic.Markdown.Tests/Directives/TabTests.cs b/tests/Elastic.Markdown.Tests/Directives/TabTests.cs
index c77ae26ba..6a852dcb5 100644
--- a/tests/Elastic.Markdown.Tests/Directives/TabTests.cs
+++ b/tests/Elastic.Markdown.Tests/Directives/TabTests.cs
@@ -1,7 +1,7 @@
 // Licensed to Elasticsearch B.V under one or more agreements.
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
-using Elastic.Markdown.Myst.Directives;
+
 using Elastic.Markdown.Myst.Directives.Tabs;
 using FluentAssertions;
 
diff --git a/tests/Elastic.Markdown.Tests/Directives/VersionTests.cs b/tests/Elastic.Markdown.Tests/Directives/VersionTests.cs
index df606db62..97449c306 100644
--- a/tests/Elastic.Markdown.Tests/Directives/VersionTests.cs
+++ b/tests/Elastic.Markdown.Tests/Directives/VersionTests.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Documentation;
-using Elastic.Markdown.Myst.Directives;
 using Elastic.Markdown.Myst.Directives.Version;
 using FluentAssertions;
 
diff --git a/tests/Elastic.Markdown.Tests/DocSet/NavigationTestsBase.cs b/tests/Elastic.Markdown.Tests/DocSet/NavigationTestsBase.cs
index 6a4d1f55d..1e7957d0d 100644
--- a/tests/Elastic.Markdown.Tests/DocSet/NavigationTestsBase.cs
+++ b/tests/Elastic.Markdown.Tests/DocSet/NavigationTestsBase.cs
@@ -7,7 +7,6 @@
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Builder;
-using Elastic.Documentation.Configuration.Versions;
 using Elastic.Markdown.IO;
 using FluentAssertions;
 using Microsoft.Extensions.Logging;
diff --git a/tests/Elastic.Markdown.Tests/FileInclusion/IncludeTests.cs b/tests/Elastic.Markdown.Tests/FileInclusion/IncludeTests.cs
index 7be8a1d9e..d80533e41 100644
--- a/tests/Elastic.Markdown.Tests/FileInclusion/IncludeTests.cs
+++ b/tests/Elastic.Markdown.Tests/FileInclusion/IncludeTests.cs
@@ -4,7 +4,6 @@
 
 using System.IO.Abstractions.TestingHelpers;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Myst.Directives;
 using Elastic.Markdown.Myst.Directives.Include;
 using Elastic.Markdown.Tests.Directives;
 using FluentAssertions;
diff --git a/tests/Elastic.Markdown.Tests/FileInclusion/LiteralIncludeTests.cs b/tests/Elastic.Markdown.Tests/FileInclusion/LiteralIncludeTests.cs
index 4eb0fc2bc..3cd28a8d0 100644
--- a/tests/Elastic.Markdown.Tests/FileInclusion/LiteralIncludeTests.cs
+++ b/tests/Elastic.Markdown.Tests/FileInclusion/LiteralIncludeTests.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.IO.Abstractions.TestingHelpers;
-using Elastic.Markdown.Myst.Directives;
 using Elastic.Markdown.Myst.Directives.Include;
 using Elastic.Markdown.Tests.Directives;
 using FluentAssertions;
diff --git a/tests/Elastic.Markdown.Tests/Inline/HardBreakTests.cs b/tests/Elastic.Markdown.Tests/Inline/HardBreakTests.cs
index 378eb84ab..63d4283a5 100644
--- a/tests/Elastic.Markdown.Tests/Inline/HardBreakTests.cs
+++ b/tests/Elastic.Markdown.Tests/Inline/HardBreakTests.cs
@@ -2,8 +2,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using FluentAssertions;
-
 namespace Elastic.Markdown.Tests.Inline;
 
 public class AllowBrTagTest(ITestOutputHelper output)
diff --git a/tests/Elastic.Markdown.Tests/Inline/InlneBaseTests.cs b/tests/Elastic.Markdown.Tests/Inline/InlneBaseTests.cs
index 3f4cc1845..321cf05e1 100644
--- a/tests/Elastic.Markdown.Tests/Inline/InlneBaseTests.cs
+++ b/tests/Elastic.Markdown.Tests/Inline/InlneBaseTests.cs
@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information
 using System.IO.Abstractions.TestingHelpers;
 using System.Runtime.InteropServices;
-using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Configuration.Versions;
 using Elastic.Markdown.IO;
 using FluentAssertions;
 using JetBrains.Annotations;
diff --git a/tests/Elastic.Markdown.Tests/OutputDirectoryTests.cs b/tests/Elastic.Markdown.Tests/OutputDirectoryTests.cs
index 9bc11e86a..af619307c 100644
--- a/tests/Elastic.Markdown.Tests/OutputDirectoryTests.cs
+++ b/tests/Elastic.Markdown.Tests/OutputDirectoryTests.cs
@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information
 
 using System.IO.Abstractions.TestingHelpers;
-using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
-using Elastic.Documentation.Configuration.Versions;
 using Elastic.Documentation.Diagnostics;
 using Elastic.Markdown.IO;
 using FluentAssertions;
diff --git a/tests/Elastic.Markdown.Tests/PrettyHtmlExtensions.cs b/tests/Elastic.Markdown.Tests/PrettyHtmlExtensions.cs
index 54084da35..b07c86c9f 100644
--- a/tests/Elastic.Markdown.Tests/PrettyHtmlExtensions.cs
+++ b/tests/Elastic.Markdown.Tests/PrettyHtmlExtensions.cs
@@ -45,6 +45,7 @@ public static string PrettyHtml([LanguageInjection("html")] this string html, bo
 		element.Children
 			.ForEach(c =>
 			{
+				// ReSharper disable once AccessToDisposedClosure
 				c.ToHtml(sw, formatter);
 			});
 		return sw.ToString().TrimStart('\n');
diff --git a/tests/Elastic.Markdown.Tests/SettingsInclusion/IncludeTests.cs b/tests/Elastic.Markdown.Tests/SettingsInclusion/IncludeTests.cs
index 55fd76aec..3f830ff1c 100644
--- a/tests/Elastic.Markdown.Tests/SettingsInclusion/IncludeTests.cs
+++ b/tests/Elastic.Markdown.Tests/SettingsInclusion/IncludeTests.cs
@@ -5,7 +5,6 @@
 using System.IO.Abstractions.TestingHelpers;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Diagnostics;
-using Elastic.Markdown.Myst.Directives;
 using Elastic.Markdown.Myst.Directives.Settings;
 using Elastic.Markdown.Tests.Directives;
 using FluentAssertions;
diff --git a/tests/docs-assembler.Tests/src/docs-assembler.Tests/GlobalNavigationTests.cs b/tests/docs-assembler.Tests/src/docs-assembler.Tests/GlobalNavigationTests.cs
index 42ec58c0e..f170d334f 100644
--- a/tests/docs-assembler.Tests/src/docs-assembler.Tests/GlobalNavigationTests.cs
+++ b/tests/docs-assembler.Tests/src/docs-assembler.Tests/GlobalNavigationTests.cs
@@ -8,7 +8,6 @@
 using Elastic.Documentation;
 using Elastic.Documentation.Configuration;
 using Elastic.Documentation.Configuration.Assembler;
-using Elastic.Documentation.Configuration.Versions;
 using Elastic.Documentation.Diagnostics;
 using Elastic.Documentation.Site.Navigation;
 using Elastic.Markdown.IO;
@@ -220,8 +219,6 @@ public async Task ParsesGlobalNavigation()
 
 		IPositionalNavigation positionalNavigation = navigation;
 
-		var releaseNotes = positionalNavigation.MarkdownNavigationLookup.Where(kv => kv.Key.Contains("release-notes")).ToArray();
-
 		var addToHelm = positionalNavigation.MarkdownNavigationLookup.GetValueOrDefault("apm-k8s-attacher://reference/apm-webhook-add-helm-repo.md");
 		addToHelm.Should().NotBeNull();
 		var parentGroup = addToHelm.Parent as DocumentationGroup;