diff --git a/Source/Testably.Abstractions.Interface/Helpers/PathSystemBase.cs b/Source/Testably.Abstractions.Interface/Helpers/PathSystemBase.cs
deleted file mode 100644
index 2e24039a5..000000000
--- a/Source/Testably.Abstractions.Interface/Helpers/PathSystemBase.cs
+++ /dev/null
@@ -1,292 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.IO.Abstractions;
-
-namespace Testably.Abstractions.Helpers;
-
-/// <summary>
-///     Default implementation for <see cref="System.IO.Path" /> abstractions.
-///     <para />
-///     Implements <seealso cref="IPath" />
-/// </summary>
-#if NETSTANDARD2_0
-[Obsolete]
-#else
-[Obsolete("Will be removed in a future version!")]
-#endif
-[ExcludeFromCodeCoverage]
-public abstract class PathSystemBase : IPath
-{
-	/// <summary>
-	///     Initializes a new instance of <see cref="PathSystemBase" /> for the given <paramref name="fileSystem" />.
-	/// </summary>
-	protected PathSystemBase(IFileSystem fileSystem)
-	{
-		FileSystem = fileSystem;
-	}
-
-	#region IPath Members
-
-	/// <inheritdoc cref="Path.AltDirectorySeparatorChar" />
-	public virtual char AltDirectorySeparatorChar
-		=> Path.AltDirectorySeparatorChar;
-
-	/// <inheritdoc cref="Path.DirectorySeparatorChar" />
-	public virtual char DirectorySeparatorChar
-		=> Path.DirectorySeparatorChar;
-
-	/// <inheritdoc cref="IFileSystemEntity.FileSystem" />
-	public IFileSystem FileSystem { get; }
-
-	/// <inheritdoc cref="Path.PathSeparator" />
-	public virtual char PathSeparator
-		=> Path.PathSeparator;
-
-	/// <inheritdoc cref="Path.VolumeSeparatorChar" />
-	public virtual char VolumeSeparatorChar
-		=> Path.VolumeSeparatorChar;
-
-	/// <inheritdoc cref="Path.ChangeExtension(string, string)" />
-	[return: NotNullIfNotNull("path")]
-	public virtual string? ChangeExtension(string? path, string? extension)
-		=> Path.ChangeExtension(path, extension);
-
-	/// <inheritdoc cref="Path.Combine(string, string)" />
-	public virtual string Combine(string path1, string path2)
-		=> Path.Combine(path1, path2);
-
-	/// <inheritdoc cref="Path.Combine(string, string, string)" />
-	public virtual string Combine(string path1, string path2, string path3)
-		=> Path.Combine(path1, path2, path3);
-
-	/// <inheritdoc cref="Path.Combine(string, string, string, string)" />
-	public virtual string Combine(string path1, string path2, string path3, string path4)
-		=> Path.Combine(path1, path2, path3, path4);
-
-	/// <inheritdoc cref="Path.Combine(string[])" />
-	public virtual string Combine(params string[] paths)
-		=> Path.Combine(paths);
-
-#if FEATURE_PATH_ADVANCED
-	/// <inheritdoc cref="Path.EndsInDirectorySeparator(ReadOnlySpan{char})" />
-	public virtual bool EndsInDirectorySeparator(ReadOnlySpan<char> path)
-		=> Path.EndsInDirectorySeparator(path);
-#endif
-
-#if FEATURE_PATH_ADVANCED
-	/// <inheritdoc cref="Path.EndsInDirectorySeparator(string)" />
-	public virtual bool EndsInDirectorySeparator(string path)
-		=> Path.EndsInDirectorySeparator(path);
-#endif
-
-#if FEATURE_FILESYSTEM_NET7
-	/// <inheritdoc cref="Path.Exists(string)" />
-	public abstract bool Exists([NotNullWhen(true)] string? path);
-#endif
-
-#if FEATURE_SPAN
-	/// <inheritdoc cref="Path.GetDirectoryName(ReadOnlySpan{char})" />
-	public virtual ReadOnlySpan<char> GetDirectoryName(ReadOnlySpan<char> path)
-		=> Path.GetDirectoryName(path);
-#endif
-
-	/// <inheritdoc cref="Path.GetDirectoryName(string)" />
-	public virtual string? GetDirectoryName(string? path)
-		=> Path.GetDirectoryName(path);
-
-#if FEATURE_SPAN
-	/// <inheritdoc cref="Path.GetExtension(ReadOnlySpan{char})" />
-	public virtual ReadOnlySpan<char> GetExtension(ReadOnlySpan<char> path)
-		=> Path.GetExtension(path);
-#endif
-
-	/// <inheritdoc cref="Path.GetExtension(string)" />
-	[return: NotNullIfNotNull("path")]
-	public virtual string? GetExtension(string? path)
-		=> Path.GetExtension(path);
-
-#if FEATURE_SPAN
-	/// <inheritdoc cref="Path.GetFileName(ReadOnlySpan{char})" />
-	public virtual ReadOnlySpan<char> GetFileName(ReadOnlySpan<char> path)
-		=> Path.GetFileName(path);
-#endif
-
-	/// <inheritdoc cref="Path.GetFileName(string)" />
-	[return: NotNullIfNotNull("path")]
-	public virtual string? GetFileName(string? path)
-		=> Path.GetFileName(path);
-
-#if FEATURE_SPAN
-	/// <inheritdoc cref="Path.GetFileNameWithoutExtension(ReadOnlySpan{char})" />
-	public virtual ReadOnlySpan<char> GetFileNameWithoutExtension(ReadOnlySpan<char> path)
-		=> Path.GetFileNameWithoutExtension(path);
-#endif
-
-	/// <inheritdoc cref="Path.GetFileNameWithoutExtension(string)" />
-	[return: NotNullIfNotNull("path")]
-	public virtual string? GetFileNameWithoutExtension(string? path)
-		=> Path.GetFileNameWithoutExtension(path);
-
-	/// <inheritdoc cref="Path.GetFullPath(string)" />
-	public virtual string GetFullPath(string path)
-		=> Path.GetFullPath(path);
-
-#if FEATURE_PATH_RELATIVE
-	/// <inheritdoc cref="Path.GetFullPath(string, string)" />
-	public virtual string GetFullPath(string path, string basePath)
-		=> Path.GetFullPath(path, basePath);
-#endif
-
-	/// <inheritdoc cref="Path.GetInvalidFileNameChars()" />
-	public virtual char[] GetInvalidFileNameChars()
-		=> Path.GetInvalidFileNameChars();
-
-	/// <inheritdoc cref="Path.GetInvalidPathChars()" />
-	public virtual char[] GetInvalidPathChars()
-		=> Path.GetInvalidPathChars();
-
-#if FEATURE_SPAN
-	/// <inheritdoc cref="Path.GetPathRoot(ReadOnlySpan{char})" />
-	public virtual ReadOnlySpan<char> GetPathRoot(ReadOnlySpan<char> path)
-		=> Path.GetPathRoot(path);
-#endif
-
-	/// <inheritdoc cref="Path.GetPathRoot(string?)" />
-	public virtual string? GetPathRoot(string? path)
-		=> Path.GetPathRoot(path);
-
-	/// <inheritdoc cref="Path.GetRandomFileName()" />
-	public virtual string GetRandomFileName()
-		=> Path.GetRandomFileName();
-
-#if FEATURE_PATH_RELATIVE
-	/// <inheritdoc cref="Path.GetRelativePath(string, string)" />
-	public virtual string GetRelativePath(string relativeTo, string path)
-		=> Path.GetRelativePath(relativeTo, path);
-#endif
-
-	/// <inheritdoc cref="Path.GetTempFileName()" />
-#if !NETSTANDARD2_0
-	[Obsolete(
-		"Insecure temporary file creation methods should not be used. Use `Path.Combine(Path.GetTempPath(), Path.GetRandomFileName())` instead.")]
-#endif
-	public virtual string GetTempFileName()
-		=> Path.GetTempFileName();
-
-	/// <inheritdoc cref="Path.GetTempPath()" />
-	public virtual string GetTempPath()
-		=> Path.GetTempPath();
-
-#if FEATURE_SPAN
-	/// <inheritdoc cref="Path.HasExtension(ReadOnlySpan{char})" />
-	public virtual bool HasExtension(ReadOnlySpan<char> path)
-		=> Path.HasExtension(path);
-#endif
-
-	/// <inheritdoc cref="Path.HasExtension(string)" />
-	public virtual bool HasExtension([NotNullWhen(true)] string? path)
-		=> Path.HasExtension(path);
-
-#if FEATURE_SPAN
-	/// <inheritdoc cref="Path.IsPathFullyQualified(ReadOnlySpan{char})" />
-	public virtual bool IsPathFullyQualified(ReadOnlySpan<char> path)
-		=> Path.IsPathFullyQualified(path);
-#endif
-
-#if FEATURE_PATH_RELATIVE
-	/// <inheritdoc cref="Path.IsPathFullyQualified(string)" />
-	public virtual bool IsPathFullyQualified(string path)
-		=> Path.IsPathFullyQualified(path);
-#endif
-
-#if FEATURE_SPAN
-	/// <inheritdoc cref="Path.IsPathRooted(ReadOnlySpan{char})" />
-	public virtual bool IsPathRooted(ReadOnlySpan<char> path)
-		=> Path.IsPathRooted(path);
-#endif
-
-	/// <inheritdoc cref="Path.IsPathRooted(string)" />
-	public virtual bool IsPathRooted(string? path)
-		=> Path.IsPathRooted(path);
-
-#if FEATURE_PATH_JOIN
-	/// <inheritdoc cref="Path.Join(ReadOnlySpan{char}, ReadOnlySpan{char})" />
-	public virtual string Join(ReadOnlySpan<char> path1, ReadOnlySpan<char> path2)
-		=> Path.Join(path1, path2);
-#endif
-
-#if FEATURE_PATH_JOIN
-	/// <inheritdoc cref="Path.Join(ReadOnlySpan{char}, ReadOnlySpan{char}, ReadOnlySpan{char})" />
-	public virtual string Join(ReadOnlySpan<char> path1,
-		ReadOnlySpan<char> path2,
-		ReadOnlySpan<char> path3)
-		=> Path.Join(path1, path2, path3);
-#endif
-
-#if FEATURE_PATH_ADVANCED
-	/// <inheritdoc cref="Path.Join(ReadOnlySpan{char}, ReadOnlySpan{char}, ReadOnlySpan{char}, ReadOnlySpan{char})" />
-	public virtual string Join(ReadOnlySpan<char> path1,
-		ReadOnlySpan<char> path2,
-		ReadOnlySpan<char> path3,
-		ReadOnlySpan<char> path4)
-		=> Path.Join(path1, path2, path3, path4);
-#endif
-
-#if FEATURE_PATH_ADVANCED
-	/// <inheritdoc cref="Path.Join(string, string)" />
-	public virtual string Join(string? path1, string? path2)
-		=> Path.Join(path1, path2);
-#endif
-
-#if FEATURE_PATH_ADVANCED
-	/// <inheritdoc cref="Path.Join(string, string, string)" />
-	public virtual string Join(string? path1, string? path2, string? path3)
-		=> Path.Join(path1, path2, path3);
-#endif
-
-#if FEATURE_PATH_ADVANCED
-	/// <inheritdoc cref="Path.Join(string, string, string, string)" />
-	public virtual string Join(string? path1, string? path2, string? path3, string? path4)
-		=> Path.Join(path1, path2, path3, path4);
-#endif
-
-#if FEATURE_PATH_ADVANCED
-	/// <inheritdoc cref="Path.Join(string[])" />
-	public virtual string Join(params string?[] paths)
-		=> Path.Join(paths);
-#endif
-
-#if FEATURE_PATH_ADVANCED
-	/// <inheritdoc cref="Path.TrimEndingDirectorySeparator(ReadOnlySpan{char})" />
-	public virtual ReadOnlySpan<char> TrimEndingDirectorySeparator(ReadOnlySpan<char> path)
-		=> Path.TrimEndingDirectorySeparator(path);
-#endif
-
-#if FEATURE_PATH_ADVANCED
-	/// <inheritdoc cref="Path.TrimEndingDirectorySeparator(string)" />
-	public virtual string TrimEndingDirectorySeparator(string path)
-		=> Path.TrimEndingDirectorySeparator(path);
-#endif
-
-#if FEATURE_PATH_JOIN
-	/// <inheritdoc cref="Path.TryJoin(ReadOnlySpan{char}, ReadOnlySpan{char}, Span{char}, out int)" />
-	public virtual bool TryJoin(ReadOnlySpan<char> path1,
-		ReadOnlySpan<char> path2,
-		Span<char> destination,
-		out int charsWritten)
-		=> Path.TryJoin(path1, path2, destination, out charsWritten);
-#endif
-
-#if FEATURE_PATH_JOIN
-	/// <inheritdoc cref="Path.TryJoin(ReadOnlySpan{char}, ReadOnlySpan{char}, ReadOnlySpan{char}, Span{char}, out int)" />
-	public virtual bool TryJoin(ReadOnlySpan<char> path1,
-		ReadOnlySpan<char> path2,
-		ReadOnlySpan<char> path3,
-		Span<char> destination,
-		out int charsWritten)
-		=> Path.TryJoin(path1, path2, path3, destination, out charsWritten);
-#endif
-
-	#endregion
-}
diff --git a/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_net6.0.txt b/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_net6.0.txt
index bbcc10fb7..40fd938fd 100644
--- a/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_net6.0.txt
+++ b/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_net6.0.txt
@@ -24,65 +24,6 @@ namespace Testably.Abstractions.Helpers
         void StoreMetadata<T>(string key, T? value);
         bool TryGetWrappedInstance<T>([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out T? wrappedInstance);
     }
-    [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-    [System.Obsolete("Will be removed in a future version!")]
-    public abstract class PathSystemBase : System.IO.Abstractions.IFileSystemEntity, System.IO.Abstractions.IPath
-    {
-        protected PathSystemBase(System.IO.Abstractions.IFileSystem fileSystem) { }
-        public virtual char AltDirectorySeparatorChar { get; }
-        public virtual char DirectorySeparatorChar { get; }
-        public System.IO.Abstractions.IFileSystem FileSystem { get; }
-        public virtual char PathSeparator { get; }
-        public virtual char VolumeSeparatorChar { get; }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? ChangeExtension(string? path, string? extension) { }
-        public virtual string Combine(params string[] paths) { }
-        public virtual string Combine(string path1, string path2) { }
-        public virtual string Combine(string path1, string path2, string path3) { }
-        public virtual string Combine(string path1, string path2, string path3, string path4) { }
-        public virtual bool EndsInDirectorySeparator(System.ReadOnlySpan<char> path) { }
-        public virtual bool EndsInDirectorySeparator(string path) { }
-        public virtual System.ReadOnlySpan<char> GetDirectoryName(System.ReadOnlySpan<char> path) { }
-        public virtual string? GetDirectoryName(string? path) { }
-        public virtual System.ReadOnlySpan<char> GetExtension(System.ReadOnlySpan<char> path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetExtension(string? path) { }
-        public virtual System.ReadOnlySpan<char> GetFileName(System.ReadOnlySpan<char> path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetFileName(string? path) { }
-        public virtual System.ReadOnlySpan<char> GetFileNameWithoutExtension(System.ReadOnlySpan<char> path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetFileNameWithoutExtension(string? path) { }
-        public virtual string GetFullPath(string path) { }
-        public virtual string GetFullPath(string path, string basePath) { }
-        public virtual char[] GetInvalidFileNameChars() { }
-        public virtual char[] GetInvalidPathChars() { }
-        public virtual System.ReadOnlySpan<char> GetPathRoot(System.ReadOnlySpan<char> path) { }
-        public virtual string? GetPathRoot(string? path) { }
-        public virtual string GetRandomFileName() { }
-        public virtual string GetRelativePath(string relativeTo, string path) { }
-        [System.Obsolete("Insecure temporary file creation methods should not be used. Use `Path.Combine(Pa" +
-            "th.GetTempPath(), Path.GetRandomFileName())` instead.")]
-        public virtual string GetTempFileName() { }
-        public virtual string GetTempPath() { }
-        public virtual bool HasExtension(System.ReadOnlySpan<char> path) { }
-        public virtual bool HasExtension([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] string? path) { }
-        public virtual bool IsPathFullyQualified(System.ReadOnlySpan<char> path) { }
-        public virtual bool IsPathFullyQualified(string path) { }
-        public virtual bool IsPathRooted(System.ReadOnlySpan<char> path) { }
-        public virtual bool IsPathRooted(string? path) { }
-        public virtual string Join(params string?[] paths) { }
-        public virtual string Join(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2) { }
-        public virtual string Join(string? path1, string? path2) { }
-        public virtual string Join(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.ReadOnlySpan<char> path3) { }
-        public virtual string Join(string? path1, string? path2, string? path3) { }
-        public virtual string Join(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.ReadOnlySpan<char> path3, System.ReadOnlySpan<char> path4) { }
-        public virtual string Join(string? path1, string? path2, string? path3, string? path4) { }
-        public virtual System.ReadOnlySpan<char> TrimEndingDirectorySeparator(System.ReadOnlySpan<char> path) { }
-        public virtual string TrimEndingDirectorySeparator(string path) { }
-        public virtual bool TryJoin(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.Span<char> destination, out int charsWritten) { }
-        public virtual bool TryJoin(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.ReadOnlySpan<char> path3, System.Span<char> destination, out int charsWritten) { }
-    }
     public sealed class RandomWrapper : Testably.Abstractions.RandomSystem.IRandom
     {
         public RandomWrapper(System.Random instance) { }
diff --git a/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_net7.0.txt b/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_net7.0.txt
index e66e57bd9..189dffbdb 100644
--- a/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_net7.0.txt
+++ b/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_net7.0.txt
@@ -28,66 +28,6 @@ namespace Testably.Abstractions.Helpers
         void StoreMetadata<T>(string key, T? value);
         bool TryGetWrappedInstance<T>([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out T? wrappedInstance);
     }
-    [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-    [System.Obsolete("Will be removed in a future version!")]
-    public abstract class PathSystemBase : System.IO.Abstractions.IFileSystemEntity, System.IO.Abstractions.IPath
-    {
-        protected PathSystemBase(System.IO.Abstractions.IFileSystem fileSystem) { }
-        public virtual char AltDirectorySeparatorChar { get; }
-        public virtual char DirectorySeparatorChar { get; }
-        public System.IO.Abstractions.IFileSystem FileSystem { get; }
-        public virtual char PathSeparator { get; }
-        public virtual char VolumeSeparatorChar { get; }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? ChangeExtension(string? path, string? extension) { }
-        public virtual string Combine(params string[] paths) { }
-        public virtual string Combine(string path1, string path2) { }
-        public virtual string Combine(string path1, string path2, string path3) { }
-        public virtual string Combine(string path1, string path2, string path3, string path4) { }
-        public virtual bool EndsInDirectorySeparator(System.ReadOnlySpan<char> path) { }
-        public virtual bool EndsInDirectorySeparator(string path) { }
-        public abstract bool Exists([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] string? path);
-        public virtual System.ReadOnlySpan<char> GetDirectoryName(System.ReadOnlySpan<char> path) { }
-        public virtual string? GetDirectoryName(string? path) { }
-        public virtual System.ReadOnlySpan<char> GetExtension(System.ReadOnlySpan<char> path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetExtension(string? path) { }
-        public virtual System.ReadOnlySpan<char> GetFileName(System.ReadOnlySpan<char> path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetFileName(string? path) { }
-        public virtual System.ReadOnlySpan<char> GetFileNameWithoutExtension(System.ReadOnlySpan<char> path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetFileNameWithoutExtension(string? path) { }
-        public virtual string GetFullPath(string path) { }
-        public virtual string GetFullPath(string path, string basePath) { }
-        public virtual char[] GetInvalidFileNameChars() { }
-        public virtual char[] GetInvalidPathChars() { }
-        public virtual System.ReadOnlySpan<char> GetPathRoot(System.ReadOnlySpan<char> path) { }
-        public virtual string? GetPathRoot(string? path) { }
-        public virtual string GetRandomFileName() { }
-        public virtual string GetRelativePath(string relativeTo, string path) { }
-        [System.Obsolete("Insecure temporary file creation methods should not be used. Use `Path.Combine(Pa" +
-            "th.GetTempPath(), Path.GetRandomFileName())` instead.")]
-        public virtual string GetTempFileName() { }
-        public virtual string GetTempPath() { }
-        public virtual bool HasExtension(System.ReadOnlySpan<char> path) { }
-        public virtual bool HasExtension([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] string? path) { }
-        public virtual bool IsPathFullyQualified(System.ReadOnlySpan<char> path) { }
-        public virtual bool IsPathFullyQualified(string path) { }
-        public virtual bool IsPathRooted(System.ReadOnlySpan<char> path) { }
-        public virtual bool IsPathRooted(string? path) { }
-        public virtual string Join(params string?[] paths) { }
-        public virtual string Join(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2) { }
-        public virtual string Join(string? path1, string? path2) { }
-        public virtual string Join(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.ReadOnlySpan<char> path3) { }
-        public virtual string Join(string? path1, string? path2, string? path3) { }
-        public virtual string Join(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.ReadOnlySpan<char> path3, System.ReadOnlySpan<char> path4) { }
-        public virtual string Join(string? path1, string? path2, string? path3, string? path4) { }
-        public virtual System.ReadOnlySpan<char> TrimEndingDirectorySeparator(System.ReadOnlySpan<char> path) { }
-        public virtual string TrimEndingDirectorySeparator(string path) { }
-        public virtual bool TryJoin(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.Span<char> destination, out int charsWritten) { }
-        public virtual bool TryJoin(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.ReadOnlySpan<char> path3, System.Span<char> destination, out int charsWritten) { }
-    }
     public sealed class RandomWrapper : Testably.Abstractions.RandomSystem.IRandom
     {
         public RandomWrapper(System.Random instance) { }
diff --git a/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_net8.0.txt b/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_net8.0.txt
index b2ab1de99..2625fbbaf 100644
--- a/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_net8.0.txt
+++ b/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_net8.0.txt
@@ -28,66 +28,6 @@ namespace Testably.Abstractions.Helpers
         void StoreMetadata<T>(string key, T? value);
         bool TryGetWrappedInstance<T>([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out T? wrappedInstance);
     }
-    [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-    [System.Obsolete("Will be removed in a future version!")]
-    public abstract class PathSystemBase : System.IO.Abstractions.IFileSystemEntity, System.IO.Abstractions.IPath
-    {
-        protected PathSystemBase(System.IO.Abstractions.IFileSystem fileSystem) { }
-        public virtual char AltDirectorySeparatorChar { get; }
-        public virtual char DirectorySeparatorChar { get; }
-        public System.IO.Abstractions.IFileSystem FileSystem { get; }
-        public virtual char PathSeparator { get; }
-        public virtual char VolumeSeparatorChar { get; }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? ChangeExtension(string? path, string? extension) { }
-        public virtual string Combine(params string[] paths) { }
-        public virtual string Combine(string path1, string path2) { }
-        public virtual string Combine(string path1, string path2, string path3) { }
-        public virtual string Combine(string path1, string path2, string path3, string path4) { }
-        public virtual bool EndsInDirectorySeparator(System.ReadOnlySpan<char> path) { }
-        public virtual bool EndsInDirectorySeparator(string path) { }
-        public abstract bool Exists([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] string? path);
-        public virtual System.ReadOnlySpan<char> GetDirectoryName(System.ReadOnlySpan<char> path) { }
-        public virtual string? GetDirectoryName(string? path) { }
-        public virtual System.ReadOnlySpan<char> GetExtension(System.ReadOnlySpan<char> path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetExtension(string? path) { }
-        public virtual System.ReadOnlySpan<char> GetFileName(System.ReadOnlySpan<char> path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetFileName(string? path) { }
-        public virtual System.ReadOnlySpan<char> GetFileNameWithoutExtension(System.ReadOnlySpan<char> path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetFileNameWithoutExtension(string? path) { }
-        public virtual string GetFullPath(string path) { }
-        public virtual string GetFullPath(string path, string basePath) { }
-        public virtual char[] GetInvalidFileNameChars() { }
-        public virtual char[] GetInvalidPathChars() { }
-        public virtual System.ReadOnlySpan<char> GetPathRoot(System.ReadOnlySpan<char> path) { }
-        public virtual string? GetPathRoot(string? path) { }
-        public virtual string GetRandomFileName() { }
-        public virtual string GetRelativePath(string relativeTo, string path) { }
-        [System.Obsolete("Insecure temporary file creation methods should not be used. Use `Path.Combine(Pa" +
-            "th.GetTempPath(), Path.GetRandomFileName())` instead.")]
-        public virtual string GetTempFileName() { }
-        public virtual string GetTempPath() { }
-        public virtual bool HasExtension(System.ReadOnlySpan<char> path) { }
-        public virtual bool HasExtension([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] string? path) { }
-        public virtual bool IsPathFullyQualified(System.ReadOnlySpan<char> path) { }
-        public virtual bool IsPathFullyQualified(string path) { }
-        public virtual bool IsPathRooted(System.ReadOnlySpan<char> path) { }
-        public virtual bool IsPathRooted(string? path) { }
-        public virtual string Join(params string?[] paths) { }
-        public virtual string Join(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2) { }
-        public virtual string Join(string? path1, string? path2) { }
-        public virtual string Join(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.ReadOnlySpan<char> path3) { }
-        public virtual string Join(string? path1, string? path2, string? path3) { }
-        public virtual string Join(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.ReadOnlySpan<char> path3, System.ReadOnlySpan<char> path4) { }
-        public virtual string Join(string? path1, string? path2, string? path3, string? path4) { }
-        public virtual System.ReadOnlySpan<char> TrimEndingDirectorySeparator(System.ReadOnlySpan<char> path) { }
-        public virtual string TrimEndingDirectorySeparator(string path) { }
-        public virtual bool TryJoin(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.Span<char> destination, out int charsWritten) { }
-        public virtual bool TryJoin(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.ReadOnlySpan<char> path3, System.Span<char> destination, out int charsWritten) { }
-    }
     public sealed class RandomWrapper : Testably.Abstractions.RandomSystem.IRandom
     {
         public RandomWrapper(System.Random instance) { }
diff --git a/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_netstandard2.0.txt b/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_netstandard2.0.txt
index e0a620412..63209c27b 100644
--- a/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_netstandard2.0.txt
+++ b/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_netstandard2.0.txt
@@ -16,39 +16,6 @@ namespace Testably.Abstractions.Helpers
         void StoreMetadata<T>(string key, T? value);
         bool TryGetWrappedInstance<T>([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out T? wrappedInstance);
     }
-    [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-    [System.Obsolete]
-    public abstract class PathSystemBase : System.IO.Abstractions.IFileSystemEntity, System.IO.Abstractions.IPath
-    {
-        protected PathSystemBase(System.IO.Abstractions.IFileSystem fileSystem) { }
-        public virtual char AltDirectorySeparatorChar { get; }
-        public virtual char DirectorySeparatorChar { get; }
-        public System.IO.Abstractions.IFileSystem FileSystem { get; }
-        public virtual char PathSeparator { get; }
-        public virtual char VolumeSeparatorChar { get; }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? ChangeExtension(string? path, string? extension) { }
-        public virtual string Combine(params string[] paths) { }
-        public virtual string Combine(string path1, string path2) { }
-        public virtual string Combine(string path1, string path2, string path3) { }
-        public virtual string Combine(string path1, string path2, string path3, string path4) { }
-        public virtual string? GetDirectoryName(string? path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetExtension(string? path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetFileName(string? path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetFileNameWithoutExtension(string? path) { }
-        public virtual string GetFullPath(string path) { }
-        public virtual char[] GetInvalidFileNameChars() { }
-        public virtual char[] GetInvalidPathChars() { }
-        public virtual string? GetPathRoot(string? path) { }
-        public virtual string GetRandomFileName() { }
-        public virtual string GetTempFileName() { }
-        public virtual string GetTempPath() { }
-        public virtual bool HasExtension([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] string? path) { }
-        public virtual bool IsPathRooted(string? path) { }
-    }
     public sealed class RandomWrapper : Testably.Abstractions.RandomSystem.IRandom
     {
         public RandomWrapper(System.Random instance) { }
diff --git a/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_netstandard2.1.txt b/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_netstandard2.1.txt
index 76fd92a8c..48122e24d 100644
--- a/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_netstandard2.1.txt
+++ b/Tests/Api/Testably.Abstractions.Api.Tests/Expected/Testably.Abstractions.Interface_netstandard2.1.txt
@@ -24,56 +24,6 @@ namespace Testably.Abstractions.Helpers
         void StoreMetadata<T>(string key, T? value);
         bool TryGetWrappedInstance<T>([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out T? wrappedInstance);
     }
-    [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-    [System.Obsolete("Will be removed in a future version!")]
-    public abstract class PathSystemBase : System.IO.Abstractions.IFileSystemEntity, System.IO.Abstractions.IPath
-    {
-        protected PathSystemBase(System.IO.Abstractions.IFileSystem fileSystem) { }
-        public virtual char AltDirectorySeparatorChar { get; }
-        public virtual char DirectorySeparatorChar { get; }
-        public System.IO.Abstractions.IFileSystem FileSystem { get; }
-        public virtual char PathSeparator { get; }
-        public virtual char VolumeSeparatorChar { get; }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? ChangeExtension(string? path, string? extension) { }
-        public virtual string Combine(params string[] paths) { }
-        public virtual string Combine(string path1, string path2) { }
-        public virtual string Combine(string path1, string path2, string path3) { }
-        public virtual string Combine(string path1, string path2, string path3, string path4) { }
-        public virtual System.ReadOnlySpan<char> GetDirectoryName(System.ReadOnlySpan<char> path) { }
-        public virtual string? GetDirectoryName(string? path) { }
-        public virtual System.ReadOnlySpan<char> GetExtension(System.ReadOnlySpan<char> path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetExtension(string? path) { }
-        public virtual System.ReadOnlySpan<char> GetFileName(System.ReadOnlySpan<char> path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetFileName(string? path) { }
-        public virtual System.ReadOnlySpan<char> GetFileNameWithoutExtension(System.ReadOnlySpan<char> path) { }
-        [return: System.Diagnostics.CodeAnalysis.NotNullIfNotNull("path")]
-        public virtual string? GetFileNameWithoutExtension(string? path) { }
-        public virtual string GetFullPath(string path) { }
-        public virtual string GetFullPath(string path, string basePath) { }
-        public virtual char[] GetInvalidFileNameChars() { }
-        public virtual char[] GetInvalidPathChars() { }
-        public virtual System.ReadOnlySpan<char> GetPathRoot(System.ReadOnlySpan<char> path) { }
-        public virtual string? GetPathRoot(string? path) { }
-        public virtual string GetRandomFileName() { }
-        public virtual string GetRelativePath(string relativeTo, string path) { }
-        [System.Obsolete("Insecure temporary file creation methods should not be used. Use `Path.Combine(Pa" +
-            "th.GetTempPath(), Path.GetRandomFileName())` instead.")]
-        public virtual string GetTempFileName() { }
-        public virtual string GetTempPath() { }
-        public virtual bool HasExtension(System.ReadOnlySpan<char> path) { }
-        public virtual bool HasExtension([System.Diagnostics.CodeAnalysis.NotNullWhen(true)] string? path) { }
-        public virtual bool IsPathFullyQualified(System.ReadOnlySpan<char> path) { }
-        public virtual bool IsPathFullyQualified(string path) { }
-        public virtual bool IsPathRooted(System.ReadOnlySpan<char> path) { }
-        public virtual bool IsPathRooted(string? path) { }
-        public virtual string Join(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2) { }
-        public virtual string Join(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.ReadOnlySpan<char> path3) { }
-        public virtual bool TryJoin(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.Span<char> destination, out int charsWritten) { }
-        public virtual bool TryJoin(System.ReadOnlySpan<char> path1, System.ReadOnlySpan<char> path2, System.ReadOnlySpan<char> path3, System.Span<char> destination, out int charsWritten) { }
-    }
     public sealed class RandomWrapper : Testably.Abstractions.RandomSystem.IRandom
     {
         public RandomWrapper(System.Random instance) { }