diff --git a/Build/_build.csproj b/Build/_build.csproj
index b7b64e4..bfe414e 100644
--- a/Build/_build.csproj
+++ b/Build/_build.csproj
@@ -7,24 +7,12 @@
     <NukeRootDirectory>..\</NukeRootDirectory>
     <NukeScriptDirectory>..\</NukeScriptDirectory>
   </PropertyGroup>
-  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
-    <DefineConstants>OS_WINDOWS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
-    <DefineConstants>OS_LINUX</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
-    <DefineConstants>OS_MAC</DefineConstants>
-  </PropertyGroup>
   <ItemGroup>
     <PackageDownload Include="GitVersion.Tool" Version="[5.12.0]" />
-    <PackageDownload Include="NSpec" Version="[3.1.0]" />
     <PackageDownload Include="ReportGenerator" Version="[5.1.23]" />
     <PackageDownload Include="xunit.runner.console" Version="[2.5.0]" />
-    <PackageDownload Include="Node.js.redist" Version="[16.20.0]" />
     <PackageReference Include="LibGit2Sharp" Version="0.27.2" />
     <PackageReference Include="Nuke.Common" Version="7.0.6" />
     <PackageReference Include="Nuke.Components" Version="7.0.6" />
-    <PackageDownload Include="Yarn.MSBuild" Version="[1.22.19]" />
   </ItemGroup>
 </Project>
diff --git a/Src/FluentAssertions.DataSets/DataRowAssertions.cs b/Src/FluentAssertions.DataSets/DataRowAssertions.cs
index 94e49ae..d96263d 100644
--- a/Src/FluentAssertions.DataSets/DataRowAssertions.cs
+++ b/Src/FluentAssertions.DataSets/DataRowAssertions.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Linq;
 using FluentAssertions.DataSets.Common;
-using FluentAssertions.Equivalency;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 
diff --git a/Src/FluentAssertions.DataSets/DataTableAssertions.cs b/Src/FluentAssertions.DataSets/DataTableAssertions.cs
index 134e979..d64276f 100644
--- a/Src/FluentAssertions.DataSets/DataTableAssertions.cs
+++ b/Src/FluentAssertions.DataSets/DataTableAssertions.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Linq;
 using FluentAssertions.DataSets.Common;
-using FluentAssertions.Equivalency;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
 
diff --git a/Src/FluentAssertions.DataSets/DataTableCollectionAssertionExtensions.cs b/Src/FluentAssertions.DataSets/DataTableCollectionAssertionExtensions.cs
index ccaaad5..4dd0d70 100644
--- a/Src/FluentAssertions.DataSets/DataTableCollectionAssertionExtensions.cs
+++ b/Src/FluentAssertions.DataSets/DataTableCollectionAssertionExtensions.cs
@@ -4,7 +4,6 @@
 using FluentAssertions.Collections;
 using FluentAssertions.DataSets;
 using FluentAssertions.DataSets.Common;
-using FluentAssertions.Execution;
 
 // ReSharper disable once CheckNamespace
 namespace FluentAssertions;
diff --git a/Tests/FluentAssertions.DataSets.Specs/DataSpecs.cs b/Tests/FluentAssertions.DataSets.Specs/DataSpecs.cs
index 1f2f86e..1500c07 100644
--- a/Tests/FluentAssertions.DataSets.Specs/DataSpecs.cs
+++ b/Tests/FluentAssertions.DataSets.Specs/DataSpecs.cs
@@ -4,6 +4,7 @@
 using System.Data;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Xunit;
 
 namespace FluentAssertions.DataSets.Specs;
 
@@ -588,17 +589,24 @@ public enum ChangeType
         Removed,
     }
 
-    public static IEnumerable<object[]> AllChangeTypes =>
-        Enum.GetValues(typeof(ChangeType)).Cast<ChangeType>().Select(t => new object[] { t });
+    public static TheoryData<ChangeType> AllChangeTypes =>
+        new(Enum.GetValues(typeof(ChangeType)).Cast<ChangeType>());
 
-    public static IEnumerable<object[]> AllChangeTypesWithAcceptChangesValues
+    public static TheoryData<ChangeType, bool> AllChangeTypesWithAcceptChangesValues
     {
         get
         {
-            return
-                from changeType in Enum.GetValues(typeof(ChangeType)).Cast<ChangeType>()
-                from acceptChanges in new[] { true, false }
-                select new object[] { changeType, acceptChanges };
+            var result = new TheoryData<ChangeType, bool>();
+
+            foreach (var changeType in Enum.GetValues(typeof(ChangeType)).Cast<ChangeType>())
+            {
+                foreach (var acceptChanges in new[] { true, false })
+                {
+                    result.Add(changeType, acceptChanges);
+                }
+            }
+
+            return result;
         }
     }
 
diff --git a/Tests/FluentAssertions.DataSets.Specs/DataTableSpecs.cs b/Tests/FluentAssertions.DataSets.Specs/DataTableSpecs.cs
index eed892a..6a0da6e 100644
--- a/Tests/FluentAssertions.DataSets.Specs/DataTableSpecs.cs
+++ b/Tests/FluentAssertions.DataSets.Specs/DataTableSpecs.cs
@@ -246,7 +246,7 @@ public void When_excluding_invalid_constraint_it_should_throw()
 
         // Act
         Action action = () => subject.Should().BeEquivalentTo(expectation, options => options
-            .ExcludingRelated((Constraint constraint) => new object()));
+            .ExcludingRelated((Constraint _) => new object()));
 
         // Assert
         action.Should().Throw<ArgumentException>().WithMessage(