diff --git a/src/WireMock.Net/Server/FluentMockServer.cs b/src/WireMock.Net/Server/FluentMockServer.cs
index 04f46ff6..6e26e089 100644
--- a/src/WireMock.Net/Server/FluentMockServer.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.cs
@@ -25,7 +25,6 @@ namespace WireMock.Server
     /// <summary>
     /// The fluent mock server.
     /// </summary>
-    [Obsolete("Will be replaced by WireMockServer in version 2.x.x")]
     public partial class FluentMockServer : IDisposable
     {
         private const int ServerStartDelayInMs = 100;
diff --git a/src/WireMock.Net/Settings/FluentMockServerSettings.cs b/src/WireMock.Net/Settings/FluentMockServerSettings.cs
index 7c4d09bb..9d47cb98 100644
--- a/src/WireMock.Net/Settings/FluentMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/FluentMockServerSettings.cs
@@ -10,7 +10,6 @@ namespace WireMock.Settings
     /// <summary>
     /// FluentMockServerSettings
     /// </summary>
-    [Obsolete("Will be replaced by WireMockServerSettings in version 2.x.x")]
     public class FluentMockServerSettings : IFluentMockServerSettings
     {
         /// <inheritdoc cref="IFluentMockServerSettings.Port"/>
diff --git a/src/WireMock.Net/Settings/IFluentMockServerSettings.cs b/src/WireMock.Net/Settings/IFluentMockServerSettings.cs
index f33afeab..f7840d15 100644
--- a/src/WireMock.Net/Settings/IFluentMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/IFluentMockServerSettings.cs
@@ -9,7 +9,6 @@ namespace WireMock.Settings
     /// <summary>
     /// IFluentMockServerSettings
     /// </summary>
-    [Obsolete("This interface will be removed and replaced by the class WireMockServerSettings in version 2.x.x")]
     public interface IFluentMockServerSettings
     {
         /// <summary>
diff --git a/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs b/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs
index 7d2e9db8..2e173553 100644
--- a/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs
+++ b/src/WireMock.Net/Settings/IProxyAndRecordSettings.cs
@@ -1,13 +1,10 @@
-using System;
-
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace WireMock.Settings
 {
     /// <summary>
     /// IProxyAndRecordSettings
     /// </summary>
-    [Obsolete("This interface will be removed and replaced by the class ProxyAndRecordSettings in version 2.x.x")]
     public interface IProxyAndRecordSettings
     {
         /// <summary>