diff --git a/GitVersion.yml b/GitVersion.yml
index 48f440b04..e7a9a244a 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,5 +1,5 @@
 assembly-versioning-scheme: Major
-next-version: 8.0
+next-version: 9.0
 branches:
   develop:
     tag: beta
diff --git a/src/Tests/ApprovalFiles/APIApprovals.ApproveAzureServiceBusTransport.approved.txt b/src/Tests/ApprovalFiles/APIApprovals.ApproveAzureServiceBusTransport.approved.txt
index 299545f36..2d5e48f7c 100644
--- a/src/Tests/ApprovalFiles/APIApprovals.ApproveAzureServiceBusTransport.approved.txt
+++ b/src/Tests/ApprovalFiles/APIApprovals.ApproveAzureServiceBusTransport.approved.txt
@@ -22,26 +22,11 @@ namespace NServiceBus
     {
         public static NServiceBus.AzureServiceBusEndpointOrientedTopologySettings RegisterPublisher(this NServiceBus.AzureServiceBusEndpointOrientedTopologySettings topologySettings, System.Type type, string publisherName) { }
         public static NServiceBus.AzureServiceBusEndpointOrientedTopologySettings RegisterPublisher(this NServiceBus.AzureServiceBusEndpointOrientedTopologySettings topologySettings, System.Reflection.Assembly assembly, string publisherName) { }
-        [System.ObsoleteAttribute("Internal contract. The member currently throws a NotImplementedException. Will be" +
-            " removed in version 9.0.0.", true)]
-        public static NServiceBus.AzureServiceBusTopologySettings<NServiceBus.EndpointOrientedTopology> RegisterPublisher(this NServiceBus.AzureServiceBusTopologySettings<NServiceBus.EndpointOrientedTopology> topologySettings, System.Type type, string publisherName) { }
-        [System.ObsoleteAttribute("Internal contract. The member currently throws a NotImplementedException. Will be" +
-            " removed in version 9.0.0.", true)]
-        public static NServiceBus.AzureServiceBusTopologySettings<NServiceBus.EndpointOrientedTopology> RegisterPublisher(this NServiceBus.AzureServiceBusTopologySettings<NServiceBus.EndpointOrientedTopology> topologySettings, System.Reflection.Assembly assembly, string publisherName) { }
     }
     public class AzureServiceBusForwardingTopologySettings : NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport> { }
     public class static AzureServiceBusForwardingTopologySettingsExtensions
     {
         public static NServiceBus.AzureServiceBusForwardingTopologySettings BundlePrefix(this NServiceBus.AzureServiceBusForwardingTopologySettings topologySettings, string prefix) { }
-        [System.ObsoleteAttribute("Internal contract. The member currently throws a NotImplementedException. Will be" +
-            " removed in version 9.0.0.", true)]
-        public static NServiceBus.AzureServiceBusTopologySettings<NServiceBus.ForwardingTopology> BundlePrefix(this NServiceBus.AzureServiceBusTopologySettings<NServiceBus.ForwardingTopology> topologySettings, string prefix) { }
-        [System.ObsoleteAttribute("Internal contract. The member currently throws a NotImplementedException. Will be" +
-            " removed in version 9.0.0.", true)]
-        public static NServiceBus.AzureServiceBusTopologySettings<NServiceBus.ForwardingTopology> NumberOfEntitiesInBundle(this NServiceBus.AzureServiceBusTopologySettings<NServiceBus.ForwardingTopology> topologySettings, int number) { }
-        [System.ObsoleteAttribute("Internal contract. The member currently throws a NotImplementedException. Will be" +
-            " removed in version 9.0.0.", true)]
-        public static NServiceBus.AzureServiceBusForwardingTopologySettings NumberOfEntitiesInBundle(this NServiceBus.AzureServiceBusForwardingTopologySettings topologySettings, int number) { }
     }
     public class static AzureServiceBusHierarchyCompositionSettingsExtensions
     {
@@ -98,27 +83,13 @@ namespace NServiceBus
         public NServiceBus.AzureServiceBusQueueSettings AutoDeleteOnIdle(System.TimeSpan autoDeleteOnIdle) { }
         public NServiceBus.AzureServiceBusQueueSettings DefaultMessageTimeToLive(System.TimeSpan defaultMessageTimeToLive) { }
         public NServiceBus.AzureServiceBusQueueSettings DescriptionCustomizer(System.Action<Microsoft.ServiceBus.Messaging.QueueDescription> customizer) { }
-        [System.ObsoleteAttribute("Replaced with new API. Use `DescriptionCustomizer(Action<QueueDescription>)` inst" +
-            "ead. The member currently throws a NotImplementedException. Will be removed in v" +
-            "ersion 9.0.0.", true)]
-        public NServiceBus.AzureServiceBusQueueSettings DescriptionFactory(System.Func<string, string, NServiceBus.Settings.ReadOnlySettings, Microsoft.ServiceBus.Messaging.QueueDescription> factory) { }
         public NServiceBus.AzureServiceBusQueueSettings DuplicateDetectionHistoryTimeWindow(System.TimeSpan duplicateDetectionHistoryTimeWindow) { }
         public NServiceBus.AzureServiceBusQueueSettings EnableBatchedOperations(bool enableBatchedOperations) { }
         public NServiceBus.AzureServiceBusQueueSettings EnableDeadLetteringOnMessageExpiration(bool enableDeadLetteringOnMessageExpiration) { }
-        [System.ObsoleteAttribute("Replaced with new API. Use `DescriptionCustomizer(Action<QueueDescription>)` inst" +
-            "ead. The member currently throws a NotImplementedException. Will be removed in v" +
-            "ersion 9.0.0.", true)]
-        public NServiceBus.AzureServiceBusQueueSettings EnableExpress(bool enableExpress) { }
-        [System.ObsoleteAttribute("Replaced with new API. Use `DescriptionCustomizer(Action<QueueDescription>)` inst" +
-            "ead. The member currently throws a NotImplementedException. Will be removed in v" +
-            "ersion 9.0.0.", true)]
-        public NServiceBus.AzureServiceBusQueueSettings EnableExpress(System.Func<string, bool> condition, bool enableExpress) { }
         public NServiceBus.AzureServiceBusQueueSettings EnablePartitioning(bool enablePartitioning) { }
         public NServiceBus.AzureServiceBusQueueSettings ForwardDeadLetteredMessagesTo(string forwardDeadLetteredMessagesTo) { }
         public NServiceBus.AzureServiceBusQueueSettings ForwardDeadLetteredMessagesTo(System.Func<string, bool> condition, string forwardDeadLetteredMessagesTo) { }
         public NServiceBus.AzureServiceBusQueueSettings LockDuration(System.TimeSpan duration) { }
-        [System.ObsoleteAttribute(@"MaxDeliveryCount is automatically set to the maximum and not required. Overriding is not recommended, but possible using AzureServiceBusQueueSettings.DescriptionCustomizer(). The member currently throws a NotImplementedException. Will be removed in version 9.0.0.", true)]
-        public NServiceBus.AzureServiceBusQueueSettings MaxDeliveryCount(int maxDeliveryCount) { }
         public NServiceBus.AzureServiceBusQueueSettings MaxSizeInMegabytes(NServiceBus.SizeInMegabytes maxSizeInMegabytes) { }
         public NServiceBus.AzureServiceBusQueueSettings RequiresDuplicateDetection(bool requiresDuplicateDetection) { }
         public NServiceBus.AzureServiceBusQueueSettings SupportOrdering(bool supportOrdering) { }
@@ -150,50 +121,26 @@ namespace NServiceBus
         public NServiceBus.AzureServiceBusSubscriptionSettings AutoDeleteOnIdle(System.TimeSpan autoDeleteOnIdle) { }
         public NServiceBus.AzureServiceBusSubscriptionSettings DefaultMessageTimeToLive(System.TimeSpan expiryTimespan) { }
         public NServiceBus.AzureServiceBusSubscriptionSettings DescriptionCustomizer(System.Action<Microsoft.ServiceBus.Messaging.SubscriptionDescription> factory) { }
-        [System.ObsoleteAttribute("Replaced with new API. Use `DescriptionCustomizer(Action<SubscriptionDescription>" +
-            ")` instead. The member currently throws a NotImplementedException. Will be remov" +
-            "ed in version 9.0.0.", true)]
-        public NServiceBus.AzureServiceBusSubscriptionSettings DescriptionFactory(System.Func<string, string, NServiceBus.Settings.ReadOnlySettings, Microsoft.ServiceBus.Messaging.SubscriptionDescription> factory) { }
         public NServiceBus.AzureServiceBusSubscriptionSettings EnableBatchedOperations(bool enableBatchedOperations) { }
         public NServiceBus.AzureServiceBusSubscriptionSettings EnableDeadLetteringOnFilterEvaluationExceptions(bool enableDeadLetteringOnFilterEvaluationExceptions) { }
         public NServiceBus.AzureServiceBusSubscriptionSettings EnableDeadLetteringOnMessageExpiration(bool enableDeadLetteringOnMessageExpiration) { }
         public NServiceBus.AzureServiceBusSubscriptionSettings ForwardDeadLetteredMessagesTo(string forwardDeadLetteredMessagesTo) { }
         public NServiceBus.AzureServiceBusSubscriptionSettings ForwardDeadLetteredMessagesTo(System.Func<string, bool> condition, string forwardDeadLetteredMessagesTo) { }
         public NServiceBus.AzureServiceBusSubscriptionSettings LockDuration(System.TimeSpan lockDuration) { }
-        [System.ObsoleteAttribute(@"MaxDeliveryCount is automatically set to the maximum and not required. Overriding is not recommended, but possible using AzureServiceBusQueueSettings.DescriptionCustomizer(). The member currently throws a NotImplementedException. Will be removed in version 9.0.0.", true)]
-        public NServiceBus.AzureServiceBusSubscriptionSettings MaxDeliveryCount(int maxDeliveryCount) { }
     }
     public class AzureServiceBusTopicSettings : NServiceBus.Configuration.AdvancedExtensibility.ExposeSettings
     {
         public NServiceBus.AzureServiceBusTopicSettings AutoDeleteOnIdle(System.TimeSpan autoDeleteOnIdle) { }
         public NServiceBus.AzureServiceBusTopicSettings DefaultMessageTimeToLive(System.TimeSpan timeToLive) { }
         public NServiceBus.AzureServiceBusTopicSettings DescriptionCustomizer(System.Action<Microsoft.ServiceBus.Messaging.TopicDescription> factory) { }
-        [System.ObsoleteAttribute("Replaced with new API. Use `DescriptionCustomizer(Action<TopicDescription>)` inst" +
-            "ead. The member currently throws a NotImplementedException. Will be removed in v" +
-            "ersion 9.0.0.", true)]
-        public NServiceBus.AzureServiceBusTopicSettings DescriptionFactory(System.Func<string, string, NServiceBus.Settings.ReadOnlySettings, Microsoft.ServiceBus.Messaging.TopicDescription> factory) { }
         public NServiceBus.AzureServiceBusTopicSettings DuplicateDetectionHistoryTimeWindow(System.TimeSpan duplicateDetectionHistoryTimeWindow) { }
         public NServiceBus.AzureServiceBusTopicSettings EnableBatchedOperations(bool enableBatchedOperations) { }
-        [System.ObsoleteAttribute("Replaced with new API. Use `DescriptionCustomizer(Action<TopicDescription>)` inst" +
-            "ead. The member currently throws a NotImplementedException. Will be removed in v" +
-            "ersion 9.0.0.", true)]
-        public NServiceBus.AzureServiceBusTopicSettings EnableExpress(bool enableExpress) { }
-        [System.ObsoleteAttribute("Replaced with new API. Use `DescriptionCustomizer(Action<TopicDescription>)` inst" +
-            "ead. The member currently throws a NotImplementedException. Will be removed in v" +
-            "ersion 9.0.0.", true)]
-        public NServiceBus.AzureServiceBusTopicSettings EnableExpress(System.Func<string, bool> condition, bool enableExpress) { }
         public NServiceBus.AzureServiceBusTopicSettings EnableFilteringMessagesBeforePublishing(bool enableFilteringMessagesBeforePublishing) { }
         public NServiceBus.AzureServiceBusTopicSettings EnablePartitioning(bool enablePartitioning) { }
         public NServiceBus.AzureServiceBusTopicSettings MaxSizeInMegabytes(NServiceBus.SizeInMegabytes maxSizeInMegabytes) { }
         public NServiceBus.AzureServiceBusTopicSettings RequiresDuplicateDetection(bool requiresDuplicateDetection) { }
         public NServiceBus.AzureServiceBusTopicSettings SupportOrdering(bool supported) { }
     }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class AzureServiceBusTopologySettings<T> : NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport>
-        where T : NServiceBus.Transport.AzureServiceBus.ITopology
-    {
-        public AzureServiceBusTopologySettings(NServiceBus.Settings.SettingsHolder settings) { }
-    }
     public class AzureServiceBusTransport : NServiceBus.Transport.TransportDefinition
     {
         public AzureServiceBusTransport() { }
@@ -221,32 +168,9 @@ namespace NServiceBus
         public static NServiceBus.AzureServiceBusSubscriptionSettings Subscriptions(this NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport> transportExtensions) { }
         public static NServiceBus.AzureServiceBusTopicSettings Topics(this NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport> transportExtensions) { }
         public static void TransportType(this NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport> transportExtensions, Microsoft.ServiceBus.Messaging.TransportType transportType) { }
-        [System.ObsoleteAttribute("Internal contract. The member currently throws a NotImplementedException. Will be" +
-            " removed in version 9.0.0.", true)]
-        public static void UseBrokeredMessageToIncomingMessageConverter<T>(this NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport> transportExtensions)
-            where T : NServiceBus.Transport.AzureServiceBus.IConvertBrokeredMessagesToIncomingMessages { }
         public static NServiceBus.AzureServiceBusEndpointOrientedTopologySettings UseEndpointOrientedTopology(this NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport> transportExtensions) { }
         public static NServiceBus.AzureServiceBusForwardingTopologySettings UseForwardingTopology(this NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport> transportExtensions) { }
         public static void UseNamespaceAliasesInsteadOfConnectionStrings(this NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport> transportExtensions) { }
-        [System.ObsoleteAttribute("Internal contract. The member currently throws a NotImplementedException. Will be" +
-            " removed in version 9.0.0.", true)]
-        public static void UseOutgoingMessageToBrokeredMessageConverter<T>(this NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport> transportExtensions)
-            where T : NServiceBus.Transport.AzureServiceBus.IConvertOutgoingMessagesToBrokeredMessages { }
-        [System.ObsoleteAttribute("Internal contract. Use `transport.UseForwardingTopology() or transport.UseEndpoin" +
-            "tOrientedTopology()` instead. The member currently throws a NotImplementedExcept" +
-            "ion. Will be removed in version 9.0.0.", true)]
-        public static NServiceBus.AzureServiceBusTopologySettings<T> UseTopology<T>(this NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport> transportExtensions)
-            where T : NServiceBus.Transport.AzureServiceBus.ITopology, new () { }
-        [System.ObsoleteAttribute("Internal contract. Use `transport.UseForwardingTopology() or transport.UseEndpoin" +
-            "tOrientedTopology()` instead. The member currently throws a NotImplementedExcept" +
-            "ion. Will be removed in version 9.0.0.", true)]
-        public static NServiceBus.AzureServiceBusTopologySettings<T> UseTopology<T>(this NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport> transportExtensions, System.Func<T> factory)
-            where T : NServiceBus.Transport.AzureServiceBus.ITopology { }
-        [System.ObsoleteAttribute("Internal contract. Use `transport.UseForwardingTopology() or transport.UseEndpoin" +
-            "tOrientedTopology()` instead. The member currently throws a NotImplementedExcept" +
-            "ion. Will be removed in version 9.0.0.", true)]
-        public static NServiceBus.AzureServiceBusTopologySettings<T> UseTopology<T>(this NServiceBus.TransportExtensions<NServiceBus.AzureServiceBusTransport> transportExtensions, T topology)
-            where T : NServiceBus.Transport.AzureServiceBus.ITopology { }
     }
     public class CoreIndividualization : NServiceBus.Transport.AzureServiceBus.IIndividualizationStrategy
     {
@@ -256,11 +180,6 @@ namespace NServiceBus
     {
         public string Individualize(string endpointName) { }
     }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class EndpointOrientedTopology : NServiceBus.Transport.AzureServiceBus.ITopology
-    {
-        public EndpointOrientedTopology() { }
-    }
     public enum EntityType
     {
         Queue = 0,
@@ -279,11 +198,6 @@ namespace NServiceBus
         public FlatComposition() { }
         public string GetEntityPath(string entityName, NServiceBus.EntityType entityType) { }
     }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class ForwardingTopology : NServiceBus.Transport.AzureServiceBus.ITopology
-    {
-        public ForwardingTopology() { }
-    }
     public class HierarchyComposition : NServiceBus.Transport.AzureServiceBus.ICompositionStrategy
     {
         public string GetEntityPath(string entityName, NServiceBus.EntityType entityType) { }
@@ -318,82 +232,15 @@ namespace NServiceBus
 }
 namespace NServiceBus.Transport.AzureServiceBus
 {
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class Batch
-    {
-        public Batch() { }
-    }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class BatchedOperation
-    {
-        public BatchedOperation() { }
-    }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class BrokeredMessageReceiveContext : NServiceBus.Transport.AzureServiceBus.ReceiveContext
-    {
-        public BrokeredMessageReceiveContext() { }
-    }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class ConnectionString
-    {
-        public ConnectionString() { }
-    }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class EntityInfo
-    {
-        public EntityInfo() { }
-    }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class EntityRelationShipInfo
-    {
-        public EntityRelationShipInfo() { }
-    }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public enum EntityRelationShipType { }
     public enum FailOverMode
     {
         Primary = 0,
         Secondary = 1,
     }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IBatcher { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IBrokerSideSubscriptionFilter { }
-    [System.ObsoleteAttribute("Deprecated and no longer required. Will be removed in version 9.0.0.", true)]
-    public interface ICacheSendingNamespaces
-    {
-        [System.ObsoleteAttribute("Deprecated and no longer required. Will be removed in version 9.0.0.", true)]
-        bool SendingNamespacesCanBeCached { get; }
-    }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IClientEntity { }
-    [System.ObsoleteAttribute("Internal unutilized contract that shouldn\'t be exposed. Will be removed in versio" +
-        "n 9.0.0.", true)]
-    public interface IClientSideSubscriptionFilter { }
     public interface ICompositionStrategy
     {
         string GetEntityPath(string entityName, NServiceBus.EntityType entityType);
     }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IConvertBrokeredMessagesToIncomingMessages { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IConvertOutgoingMessagesToBrokeredMessages { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface ICreateAzureServiceBusQueues { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface ICreateAzureServiceBusSubscriptions { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface ICreateAzureServiceBusTopics { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface ICreateMessageReceivers { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface ICreateMessageSenders { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface ICreateMessagingFactories { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface ICreateNamespaceManagers { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface ICreateTopology { }
     public interface IHandleOversizedBrokeredMessages
     {
         System.Threading.Tasks.Task Handle(Microsoft.ServiceBus.Messaging.BrokeredMessage brokeredMessage);
@@ -402,52 +249,15 @@ namespace NServiceBus.Transport.AzureServiceBus
     {
         string Individualize(string endpointName);
     }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IManageMessageReceiverLifeCycle { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IManageMessageSenderLifeCycle { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IManageMessagingFactoryLifeCycle { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IManageNamespaceManagerLifeCycle { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IMessageReceiver : NServiceBus.Transport.AzureServiceBus.IClientEntity { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IMessageSender : NServiceBus.Transport.AzureServiceBus.IClientEntity { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IMessagingFactory : NServiceBus.Transport.AzureServiceBus.IClientEntity { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface INamespaceManager { }
     public interface INamespacePartitioningStrategy
     {
         bool SendingNamespacesCanBeCached { get; }
         System.Collections.Generic.IEnumerable<NServiceBus.Transport.AzureServiceBus.RuntimeNamespaceInfo> GetNamespaces(NServiceBus.Transport.AzureServiceBus.PartitioningIntent partitioningIntent);
     }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class IncomingMessageDetails
-    {
-        public IncomingMessageDetails() { }
-    }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface INotifyIncomingMessages { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IOperateTopology { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IRegisterTransportParts { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IResolveTransportParts { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface IRouteOutgoingBatches { }
     public interface ISanitizationStrategy
     {
         string Sanitize(string entityPathOrName, NServiceBus.EntityType entityType);
     }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface ITopology { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface ITopologySectionManager { }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public interface ITransportPartsContainer : NServiceBus.Transport.AzureServiceBus.IRegisterTransportParts, NServiceBus.Transport.AzureServiceBus.IResolveTransportParts { }
     public class MessageTooLargeException : System.Exception
     {
         public MessageTooLargeException() { }
@@ -468,20 +278,12 @@ namespace NServiceBus.Transport.AzureServiceBus
         public NamespaceInfo(string alias, string connectionString, NServiceBus.Transport.AzureServiceBus.NamespacePurpose purpose = 1) { }
         public string Alias { get; }
         public string Connection { get; }
-        [System.ObsoleteAttribute("Internal contract. The member currently throws a NotImplementedException. Will be" +
-            " removed in version 9.0.0.", true)]
-        public NServiceBus.Transport.AzureServiceBus.ConnectionString ConnectionString { get; }
         public NServiceBus.Transport.AzureServiceBus.NamespacePurpose Purpose { get; }
         public System.Collections.Generic.HashSet<string> RegisteredEndpoints { get; }
         public bool Equals(NServiceBus.Transport.AzureServiceBus.NamespaceInfo other) { }
         public override bool Equals(object obj) { }
         public override int GetHashCode() { }
     }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class NamespaceManagerAdapter : NServiceBus.Transport.AzureServiceBus.INamespaceManager
-    {
-        public NamespaceManagerAdapter() { }
-    }
     public enum NamespaceMode
     {
         Active = 0,
@@ -498,16 +300,6 @@ namespace NServiceBus.Transport.AzureServiceBus
         Sending = 1,
         Creating = 2,
     }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public abstract class ReceiveContext
-    {
-        protected ReceiveContext() { }
-    }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class RoutingOptions
-    {
-        public RoutingOptions() { }
-    }
     public class RuntimeNamespaceInfo : System.IEquatable<NServiceBus.Transport.AzureServiceBus.RuntimeNamespaceInfo>
     {
         public RuntimeNamespaceInfo(string alias, string connectionString, NServiceBus.Transport.AzureServiceBus.NamespacePurpose purpose = 1, NServiceBus.Transport.AzureServiceBus.NamespaceMode mode = 0) { }
@@ -518,16 +310,6 @@ namespace NServiceBus.Transport.AzureServiceBus
         public override bool Equals(object obj) { }
         public override int GetHashCode() { }
     }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class SubscriptionInfo : NServiceBus.Transport.AzureServiceBus.EntityInfo
-    {
-        public SubscriptionInfo() { }
-    }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class SubscriptionMetadata
-    {
-        public SubscriptionMetadata() { }
-    }
     public enum SupportedBrokeredMessageBodyTypes
     {
         ByteArray = 0,
@@ -538,11 +320,6 @@ namespace NServiceBus.Transport.AzureServiceBus
         public ThrowOnOversizedBrokeredMessages() { }
         public System.Threading.Tasks.Task Handle(Microsoft.ServiceBus.Messaging.BrokeredMessage brokeredMessage) { }
     }
-    [System.ObsoleteAttribute("Internal contract. Will be removed in version 9.0.0.", true)]
-    public class TopologySection
-    {
-        public TopologySection() { }
-    }
     public class TransactionContainsTooManyMessages : System.Exception
     {
         public TransactionContainsTooManyMessages() { }
diff --git a/src/Transport/Config/ExtensionMethods/AzureServiceBusForwardingTopologySettingsExtensions.cs b/src/Transport/Config/ExtensionMethods/AzureServiceBusForwardingTopologySettingsExtensions.cs
index 84fb93d84..315260f77 100644
--- a/src/Transport/Config/ExtensionMethods/AzureServiceBusForwardingTopologySettingsExtensions.cs
+++ b/src/Transport/Config/ExtensionMethods/AzureServiceBusForwardingTopologySettingsExtensions.cs
@@ -6,7 +6,7 @@ namespace NServiceBus
     /// <summary>
     /// Settings for the forwarding topology
     /// </summary>
-    public static partial class AzureServiceBusForwardingTopologySettingsExtensions
+    public static class AzureServiceBusForwardingTopologySettingsExtensions
     {
         /// <summary>
         /// Allows to set the bundle prefix
diff --git a/src/Transport/Config/ExtensionMethods/AzureServiceBusTransportExtensions.cs b/src/Transport/Config/ExtensionMethods/AzureServiceBusTransportExtensions.cs
index 82af3e29a..7b3aa40be 100644
--- a/src/Transport/Config/ExtensionMethods/AzureServiceBusTransportExtensions.cs
+++ b/src/Transport/Config/ExtensionMethods/AzureServiceBusTransportExtensions.cs
@@ -8,10 +8,10 @@ namespace NServiceBus
     /// <summary>
     /// Azure Service Bus transport extensions API.
     /// </summary>
-    public static partial class AzureServiceBusTransportExtensions
+    public static class AzureServiceBusTransportExtensions
     {
         /// <summary>
-        /// Configures Azure Service Bus to use <see cref="ForwardingTopology"/> topology.
+        /// Configures Azure Service Bus to use Forwarding topology.
         /// </summary>
         public static AzureServiceBusForwardingTopologySettings UseForwardingTopology(this TransportExtensions<AzureServiceBusTransport> transportExtensions)
         {
diff --git a/src/Transport/Config/ExtensionPoints/AzureServiceBusEndpointOrientedTopologySettings.cs b/src/Transport/Config/ExtensionPoints/AzureServiceBusEndpointOrientedTopologySettings.cs
index a9896d765..92eef2b0a 100644
--- a/src/Transport/Config/ExtensionPoints/AzureServiceBusEndpointOrientedTopologySettings.cs
+++ b/src/Transport/Config/ExtensionPoints/AzureServiceBusEndpointOrientedTopologySettings.cs
@@ -2,7 +2,7 @@
 {
     using Settings;
 
-    /// <summary><see cref="EndpointOrientedTopology"/> specific settings.</summary>
+    /// <summary>Endpoint-Oriented topology specific settings.</summary>
     public class AzureServiceBusEndpointOrientedTopologySettings : TransportExtensions<AzureServiceBusTransport>
     {
         internal AzureServiceBusEndpointOrientedTopologySettings(SettingsHolder settings) : base(settings)
diff --git a/src/Transport/Config/ExtensionPoints/AzureServiceBusEndpointOrientedTopologySettingsExtensions.cs b/src/Transport/Config/ExtensionPoints/AzureServiceBusEndpointOrientedTopologySettingsExtensions.cs
index 7428b62d0..5ffec2e99 100644
--- a/src/Transport/Config/ExtensionPoints/AzureServiceBusEndpointOrientedTopologySettingsExtensions.cs
+++ b/src/Transport/Config/ExtensionPoints/AzureServiceBusEndpointOrientedTopologySettingsExtensions.cs
@@ -7,8 +7,8 @@
     using Settings;
     using Transport.AzureServiceBus;
 
-    /// <summary><see cref="EndpointOrientedTopology"/> specific settings.</summary>
-    public static partial class AzureServiceBusEndpointOrientedTopologySettingsExtensions
+    /// <summary>Endpoint-Oriented topology specific settings.</summary>
+    public static class AzureServiceBusEndpointOrientedTopologySettingsExtensions
     {
         /// <summary>Register publisher endpoint name for a give event type.</summary>
         public static AzureServiceBusEndpointOrientedTopologySettings RegisterPublisher(this AzureServiceBusEndpointOrientedTopologySettings topologySettings, Type type, string publisherName)
diff --git a/src/Transport/Config/ExtensionPoints/AzureServiceBusForwardingTopologySettings.cs b/src/Transport/Config/ExtensionPoints/AzureServiceBusForwardingTopologySettings.cs
index d90e47350..6be31512a 100644
--- a/src/Transport/Config/ExtensionPoints/AzureServiceBusForwardingTopologySettings.cs
+++ b/src/Transport/Config/ExtensionPoints/AzureServiceBusForwardingTopologySettings.cs
@@ -2,7 +2,7 @@
 {
     using Settings;
 
-    /// <summary><see cref="ForwardingTopology"/> specific settings.</summary>
+    /// <summary>Forwarding topology specific settings.</summary>
     public class AzureServiceBusForwardingTopologySettings : TransportExtensions<AzureServiceBusTransport>
     {
         internal AzureServiceBusForwardingTopologySettings(SettingsHolder settings) : base(settings)
diff --git a/src/Transport/Config/ExtensionPoints/AzureServiceBusQueueSettings.cs b/src/Transport/Config/ExtensionPoints/AzureServiceBusQueueSettings.cs
index cfccb5e40..e9cd96a8c 100644
--- a/src/Transport/Config/ExtensionPoints/AzureServiceBusQueueSettings.cs
+++ b/src/Transport/Config/ExtensionPoints/AzureServiceBusQueueSettings.cs
@@ -9,7 +9,7 @@
     /// <summary>
     /// Queue configuration settings.
     /// </summary>
-    public partial class AzureServiceBusQueueSettings : ExposeSettings
+    public class AzureServiceBusQueueSettings : ExposeSettings
     {
         internal AzureServiceBusQueueSettings(SettingsHolder settings) : base(settings)
         {
diff --git a/src/Transport/Config/ExtensionPoints/AzureServiceBusSanitizationSettings.cs b/src/Transport/Config/ExtensionPoints/AzureServiceBusSanitizationSettings.cs
index c35e01dcb..1f5e756a5 100644
--- a/src/Transport/Config/ExtensionPoints/AzureServiceBusSanitizationSettings.cs
+++ b/src/Transport/Config/ExtensionPoints/AzureServiceBusSanitizationSettings.cs
@@ -58,8 +58,7 @@ public AzureServiceBusSanitizationSettings UseRulePathMaximumLength(int rulePath
         /// <summary>
         /// Strategy to use for sanitization of entity paths/names.
         /// <remarks>
-        /// Default is <see cref="ThrowOnFailedValidation" />. For backward compatibility with
-        /// <see cref="EndpointOrientedTopology" /> use <see cref="ValidateAndHashIfNeeded" />.
+        /// Default is <see cref="ThrowOnFailedValidation" />. For backward compatibility with Endpoint-Oriented topology use <see cref="ValidateAndHashIfNeeded" />.
         /// </remarks>
         /// </summary>
         public AzureServiceBusSanitizationExtensionPoint<T> UseStrategy<T>() where T : ISanitizationStrategy
diff --git a/src/Transport/Config/ExtensionPoints/AzureServiceBusSubscriptionSettings.cs b/src/Transport/Config/ExtensionPoints/AzureServiceBusSubscriptionSettings.cs
index 2367751e1..9eac8849a 100644
--- a/src/Transport/Config/ExtensionPoints/AzureServiceBusSubscriptionSettings.cs
+++ b/src/Transport/Config/ExtensionPoints/AzureServiceBusSubscriptionSettings.cs
@@ -9,7 +9,7 @@ namespace NServiceBus
     /// <summary>
     /// Subscriptions configuration settings.
     /// </summary>
-    public partial class AzureServiceBusSubscriptionSettings : ExposeSettings
+    public class AzureServiceBusSubscriptionSettings : ExposeSettings
     {
         internal AzureServiceBusSubscriptionSettings(SettingsHolder settings) : base(settings)
         {
diff --git a/src/Transport/Config/ExtensionPoints/AzureServiceBusTopicSettings.cs b/src/Transport/Config/ExtensionPoints/AzureServiceBusTopicSettings.cs
index 2c7149820..2f3c4c8e0 100644
--- a/src/Transport/Config/ExtensionPoints/AzureServiceBusTopicSettings.cs
+++ b/src/Transport/Config/ExtensionPoints/AzureServiceBusTopicSettings.cs
@@ -9,7 +9,7 @@
     /// <summary>
     /// Topics configuration settings.
     /// </summary>
-    public partial class AzureServiceBusTopicSettings : ExposeSettings
+    public class AzureServiceBusTopicSettings : ExposeSettings
     {
         internal AzureServiceBusTopicSettings(SettingsHolder settings) : base(settings)
         {
@@ -83,7 +83,7 @@ public AzureServiceBusTopicSettings EnableFilteringMessagesBeforePublishing(bool
 
         /// <summary>
         /// <remarks> Default is false.</remarks>
-        /// <remarks>When using <see cref="ForwardingTopology" />, partitioning cannot be enabled.</remarks>
+        /// <remarks>When using Forwarding topology, partitioning cannot be enabled.</remarks>
         /// </summary>
         public AzureServiceBusTopicSettings EnablePartitioning(bool enablePartitioning)
         {
diff --git a/src/Transport/Topology/MetaModel/NamespaceInfo.cs b/src/Transport/Topology/MetaModel/NamespaceInfo.cs
index c33ed6e29..d2244c8dc 100644
--- a/src/Transport/Topology/MetaModel/NamespaceInfo.cs
+++ b/src/Transport/Topology/MetaModel/NamespaceInfo.cs
@@ -4,7 +4,7 @@
     using System.Collections.Generic;
 
     /// <summary></summary>
-    public partial class NamespaceInfo : IEquatable<NamespaceInfo>
+    public class NamespaceInfo : IEquatable<NamespaceInfo>
     {
         /// <summary></summary>
         public NamespaceInfo(string alias, string connectionString, NamespacePurpose purpose = NamespacePurpose.Partitioning)
diff --git a/src/Transport/obsoletes.cs b/src/Transport/obsoletes.cs
index 17ea8f600..4de831d09 100644
--- a/src/Transport/obsoletes.cs
+++ b/src/Transport/obsoletes.cs
@@ -1,12 +1,6 @@
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 namespace NServiceBus
 {
-    using System;
-    using System.Reflection;
-    using Microsoft.ServiceBus.Messaging;
-    using Settings;
-    using Transport.AzureServiceBus;
-
     static class ObsoleteMessages
     {
         public const string InternalizedContract = "Internal contract.";
@@ -14,416 +8,5 @@ static class ObsoleteMessages
         public const string DeprecatedAndNoLongerRequired = "Deprecated and no longer required.";
         public const string MaxDeliveryCountDeprecatedInFavorOfRecoverabilityAndImmediateRetries = "MaxDeliveryCount is automatically set to the maximum and not required. Overriding is not recommended, but possible using AzureServiceBusQueueSettings.DescriptionCustomizer().";
     }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class ForwardingTopology : ITopology
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class EndpointOrientedTopology : ITopology
-    {
-    }
-
-    public static partial class AzureServiceBusTransportExtensions
-    {
-        [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public static void UseOutgoingMessageToBrokeredMessageConverter<T>(this TransportExtensions<AzureServiceBusTransport> transportExtensions) where T : IConvertOutgoingMessagesToBrokeredMessages
-        {
-            throw new NotImplementedException();
-        }
-
-        [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public static void UseBrokeredMessageToIncomingMessageConverter<T>(this TransportExtensions<AzureServiceBusTransport> transportExtensions) where T : IConvertBrokeredMessagesToIncomingMessages
-        {
-            throw new NotImplementedException();
-        }
-
-        [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0", ReplacementTypeOrMember = "transport.UseForwardingTopology() or transport.UseEndpointOrientedTopology()")]
-        public static AzureServiceBusTopologySettings<T> UseTopology<T>(this TransportExtensions<AzureServiceBusTransport> transportExtensions) where T : ITopology, new()
-        {
-            throw new NotImplementedException();
-        }
-
-        [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0", ReplacementTypeOrMember = "transport.UseForwardingTopology() or transport.UseEndpointOrientedTopology()")]
-        public static AzureServiceBusTopologySettings<T> UseTopology<T>(this TransportExtensions<AzureServiceBusTransport> transportExtensions, Func<T> factory) where T : ITopology
-        {
-            throw new NotImplementedException();
-        }
-
-        [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0", ReplacementTypeOrMember = "transport.UseForwardingTopology() or transport.UseEndpointOrientedTopology()")]
-        public static AzureServiceBusTopologySettings<T> UseTopology<T>(this TransportExtensions<AzureServiceBusTransport> transportExtensions, T topology) where T : ITopology
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public static partial class AzureServiceBusEndpointOrientedTopologySettingsExtensions
-    {
-        [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public static AzureServiceBusTopologySettings<EndpointOrientedTopology> RegisterPublisher(this AzureServiceBusTopologySettings<EndpointOrientedTopology> topologySettings, Type type, string publisherName)
-        {
-            throw new NotImplementedException();
-        }
-
-        [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public static AzureServiceBusTopologySettings<EndpointOrientedTopology> RegisterPublisher(this AzureServiceBusTopologySettings<EndpointOrientedTopology> topologySettings, Assembly assembly, string publisherName)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public static partial class AzureServiceBusForwardingTopologySettingsExtensions
-    {
-        [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public static AzureServiceBusTopologySettings<ForwardingTopology> NumberOfEntitiesInBundle(this AzureServiceBusTopologySettings<ForwardingTopology> topologySettings, int number)
-        {
-            throw new NotImplementedException();
-        }
-
-        [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public static AzureServiceBusTopologySettings<ForwardingTopology> BundlePrefix(this AzureServiceBusTopologySettings<ForwardingTopology> topologySettings, string prefix)
-        {
-            throw new NotImplementedException();
-        }
-
-        [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public static AzureServiceBusForwardingTopologySettings NumberOfEntitiesInBundle(this AzureServiceBusForwardingTopologySettings topologySettings, int number)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class AzureServiceBusTopologySettings<T> : TransportExtensions<AzureServiceBusTransport> where T : ITopology
-    {
-        public AzureServiceBusTopologySettings(SettingsHolder settings) : base(settings)
-        {
-        }
-    }
-
-    public partial class AzureServiceBusQueueSettings
-    {
-        [ObsoleteEx(Message = ObsoleteMessages.ReplaceWithNewAPI, ReplacementTypeOrMember = "DescriptionCustomizer(Action<QueueDescription>)", TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public AzureServiceBusQueueSettings DescriptionFactory(Func<string, string, ReadOnlySettings, QueueDescription> factory)
-        {
-            throw new NotImplementedException();
-        }
-
-
-        /// <summary>
-        /// <remarks> Default is false.</remarks>
-        /// </summary>
-        [ObsoleteEx(Message = ObsoleteMessages.ReplaceWithNewAPI, ReplacementTypeOrMember = "DescriptionCustomizer(Action<QueueDescription>)", TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public AzureServiceBusQueueSettings EnableExpress(bool enableExpress)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// <remarks> Default is false.</remarks>
-        /// </summary>
-        [ObsoleteEx(Message = ObsoleteMessages.ReplaceWithNewAPI, ReplacementTypeOrMember = "DescriptionCustomizer(Action<QueueDescription>)", TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public AzureServiceBusQueueSettings EnableExpress(Func<string, bool> condition, bool enableExpress)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// <remarks> Default is 10.</remarks>
-        /// </summary>
-        [ObsoleteEx(Message = ObsoleteMessages.MaxDeliveryCountDeprecatedInFavorOfRecoverabilityAndImmediateRetries, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public AzureServiceBusQueueSettings MaxDeliveryCount(int maxDeliveryCount)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public partial class AzureServiceBusTopicSettings
-    {
-        [ObsoleteEx(Message = ObsoleteMessages.ReplaceWithNewAPI, ReplacementTypeOrMember = "DescriptionCustomizer(Action<TopicDescription>)", TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public AzureServiceBusTopicSettings DescriptionFactory(Func<string, string, ReadOnlySettings, TopicDescription> factory)
-        {
-            throw new NotImplementedException();
-        }
-
-
-        /// <summary>
-        /// <remarks> Default is false.</remarks>
-        /// </summary>
-        [ObsoleteEx(Message = ObsoleteMessages.ReplaceWithNewAPI, ReplacementTypeOrMember = "DescriptionCustomizer(Action<TopicDescription>)", TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public AzureServiceBusTopicSettings EnableExpress(bool enableExpress)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// <remarks> Default is false.</remarks>
-        /// </summary>
-        [ObsoleteEx(Message = ObsoleteMessages.ReplaceWithNewAPI, ReplacementTypeOrMember = "DescriptionCustomizer(Action<TopicDescription>)", TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public AzureServiceBusTopicSettings EnableExpress(Func<string, bool> condition, bool enableExpress)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public partial class AzureServiceBusSubscriptionSettings
-    {
-        [ObsoleteEx(Message = ObsoleteMessages.ReplaceWithNewAPI, ReplacementTypeOrMember = "DescriptionCustomizer(Action<SubscriptionDescription>)", TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public AzureServiceBusSubscriptionSettings DescriptionFactory(Func<string, string, ReadOnlySettings, SubscriptionDescription> factory)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// <remarks> Default is 10.</remarks>
-        /// </summary>
-        [ObsoleteEx(Message = ObsoleteMessages.MaxDeliveryCountDeprecatedInFavorOfRecoverabilityAndImmediateRetries, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public AzureServiceBusSubscriptionSettings MaxDeliveryCount(int maxDeliveryCount)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
-
-namespace NServiceBus.Transport.AzureServiceBus
-{
-    using System;
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface ITopology
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface INamespaceManager
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface ICreateAzureServiceBusQueues
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface ICreateAzureServiceBusTopics
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IManageNamespaceManagerLifeCycle
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface ICreateAzureServiceBusSubscriptions
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface ICreateNamespaceManagers
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface ITopologySectionManager
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface ICreateMessagingFactories
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IManageMessagingFactoryLifeCycle
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface ICreateMessageSenders
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IBatcher
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IConvertOutgoingMessagesToBrokeredMessages
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IConvertBrokeredMessagesToIncomingMessages
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IClientEntity
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IManageMessageReceiverLifeCycle
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IMessageReceiver : IClientEntity
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IMessagingFactory : IClientEntity
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IMessageSender : IClientEntity
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IManageMessageSenderLifeCycle
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface INotifyIncomingMessages
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IRouteOutgoingBatches
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface ICreateTopology
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface ICreateMessageReceivers
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IOperateTopology
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IRegisterTransportParts
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IResolveTransportParts
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface ITransportPartsContainer : IRegisterTransportParts, IResolveTransportParts
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IBrokerSideSubscriptionFilter
-    {
-    }
-
-    [ObsoleteEx(Message = "Internal unutilized contract that shouldn't be exposed.", TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface IClientSideSubscriptionFilter
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class RoutingOptions
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class SubscriptionMetadata
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class NamespaceManagerAdapter : INamespaceManager
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class EntityInfo
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class IncomingMessageDetails
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public abstract class ReceiveContext
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class BrokeredMessageReceiveContext : ReceiveContext
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class EntityRelationShipInfo
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public enum EntityRelationShipType
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class TopologySection
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class Batch
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class BatchedOperation
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class SubscriptionInfo : EntityInfo
-    {
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public class ConnectionString
-    {
-    }
-
-    public partial class NamespaceInfo
-    {
-        [ObsoleteEx(Message = ObsoleteMessages.InternalizedContract, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        public ConnectionString ConnectionString
-        {
-            get { throw new NotImplementedException(); }
-        }
-    }
-
-    [ObsoleteEx(Message = ObsoleteMessages.DeprecatedAndNoLongerRequired, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-    public interface ICacheSendingNamespaces
-    {
-        [ObsoleteEx(Message = ObsoleteMessages.DeprecatedAndNoLongerRequired, TreatAsErrorFromVersion = "8.0", RemoveInVersion = "9.0")]
-        bool SendingNamespacesCanBeCached { get; }
-    }
 }
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
\ No newline at end of file