diff --git a/src/Arcus.Messaging.Abstractions/MessageHandling/MessageHandler.cs b/src/Arcus.Messaging.Abstractions/MessageHandling/MessageHandler.cs
index 84e72981..8153c770 100644
--- a/src/Arcus.Messaging.Abstractions/MessageHandling/MessageHandler.cs
+++ b/src/Arcus.Messaging.Abstractions/MessageHandling/MessageHandler.cs
@@ -214,22 +214,6 @@ public Type GetMessageHandlerType()
             return _messageHandlerInstanceType;
         }
 
-        /// <summary>
-        /// Determines if the given <typeparamref name="TMessageContext"/> matches the generic parameter of this message handler.
-        /// </summary>
-        /// <param name="messageContext">The messaging context information that holds information about the currently processing message.</param>
-        /// <returns>
-        ///     [true] if the registered <typeparamref name="TMessageContext"/> predicate holds; [false] otherwise.
-        /// </returns>
-        /// <typeparam name="TMessageContext">The type of the message context.</typeparam>
-        [Obsolete("Use the " + nameof(CanProcessMessageBasedOnContext) + " specific message context overload instead")]
-        public bool CanProcessMessage<TMessageContext>(TMessageContext messageContext)
-            where TMessageContext : MessageContext
-        {
-            bool canProcessMessageBasedOnContext = CanProcessMessageBasedOnContext(messageContext);
-            return canProcessMessageBasedOnContext;
-        }
-
         /// <summary>
         /// Determines if the given <typeparamref name="TMessageContext"/> matches the generic parameter of this message handler.
         /// </summary>
diff --git a/src/Arcus.Messaging.Abstractions/Telemetry/ObsoleteMessageCorrelationInfoEnricher.cs b/src/Arcus.Messaging.Abstractions/Telemetry/ObsoleteMessageCorrelationInfoEnricher.cs
deleted file mode 100644
index 494b661c..00000000
--- a/src/Arcus.Messaging.Abstractions/Telemetry/ObsoleteMessageCorrelationInfoEnricher.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using Arcus.Messaging.Abstractions;
-using Arcus.Observability.Correlation;
-using Arcus.Observability.Telemetry.Serilog.Enrichers;
-using Serilog.Core;
-using Serilog.Events;
-
-// ReSharper disable once CheckNamespace - made deprecated.
-namespace Arcus.Messaging.Pumps.Abstractions.Telemetry
-{
-    /// <summary>
-    /// Logger enrichment of the <see cref="MessageCorrelationInfo" /> model.
-    /// </summary>
-    [Obsolete("Use the message correlation enricher in a different namespace instead: " +  nameof(Messaging.Abstractions.Telemetry.MessageCorrelationInfoEnricher) + " without 'Pumps'")]
-    public class MessageCorrelationInfoEnricher : CorrelationInfoEnricher<MessageCorrelationInfo>
-    {
-        private const string CycleId = "CycleId";
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="T:Arcus.Observability.Telemetry.Serilog.Enrichers.CorrelationInfoEnricher`1" /> class.
-        /// </summary>
-        /// <param name="correlationInfoAccessor">The accessor implementation for the custom <see cref="T:Arcus.Observability.Correlation.CorrelationInfo" /> model.</param>
-        public MessageCorrelationInfoEnricher(ICorrelationInfoAccessor<MessageCorrelationInfo> correlationInfoAccessor) 
-            : base(correlationInfoAccessor)
-        {
-        }
-
-        /// <summary>
-        /// Enrich the <paramref name="logEvent" /> with the given <paramref name="correlationInfo" /> model.
-        /// </summary>
-        /// <param name="logEvent">The log event to enrich with correlation information.</param>
-        /// <param name="propertyFactory">The log property factory to create log properties with correlation information.</param>
-        /// <param name="correlationInfo">The correlation model that contains the current correlation information.</param>
-        protected override void EnrichCorrelationInfo(
-            LogEvent logEvent,
-            ILogEventPropertyFactory propertyFactory,
-            MessageCorrelationInfo correlationInfo)
-        {
-            base.EnrichCorrelationInfo(logEvent, propertyFactory, correlationInfo);
-
-            if (!String.IsNullOrEmpty(correlationInfo.CycleId))
-            {
-                LogEventProperty property = propertyFactory.CreateProperty(CycleId, correlationInfo.CycleId);
-                logEvent.AddPropertyIfAbsent(property);
-            }
-        }
-    }
-}
diff --git a/src/Arcus.Messaging.ServiceBus.Core/Extensions/ObjectExtensions.cs b/src/Arcus.Messaging.ServiceBus.Core/Extensions/ObjectExtensions.cs
deleted file mode 100644
index 7bd34ffa..00000000
--- a/src/Arcus.Messaging.ServiceBus.Core/Extensions/ObjectExtensions.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Text;
-using Arcus.Messaging.Abstractions;
-using Azure.Messaging.ServiceBus;
-using GuardNet;
-using Newtonsoft.Json;
-
-// ReSharper disable once CheckNamespace
-namespace Microsoft.Azure.ServiceBus
-{
-    /// <summary>
-    /// Extensions on message bodies to more easily create <see cref="ServiceBusMessage"/>s from them.
-    /// </summary>
-    public static class ObjectExtensions
-    {
-        private const string JsonContentType = "application/json";
-
-        /// <summary>
-        ///     Creates an Azure Service Bus Message for a message body
-        /// </summary>
-        /// <param name="messageBody">Body of the Service Bus message to process</param>
-        /// <param name="operationId">Unique identifier that spans one operation end-to-end</param>
-        /// <param name="transactionId">Unique identifier that spans one or more operations and are considered a transaction/session</param>
-        /// <param name="encoding">Encoding to use during serialization. Defaults to UTF8</param>
-        /// <exception cref="ArgumentNullException">Thrown when the <paramref name="messageBody"/> is <c>null</c>.</exception>
-        /// <returns>an <see cref="ServiceBusMessage"/>.</returns>
-        [Obsolete("Use the " + nameof(ServiceBusMessageBuilder) + " instead to create " + nameof(ServiceBusMessage) + " instances")]
-        public static ServiceBusMessage AsServiceBusMessage(this object messageBody, string operationId = null, string transactionId = null, Encoding encoding = null)
-        { 
-            Guard.NotNull(messageBody, nameof(messageBody), "Requires a message body to create an Azure Service Bus message this message body");
-
-            encoding = encoding ?? Encoding.UTF8;
-
-            string serializedMessageBody = JsonConvert.SerializeObject(messageBody);
-            byte[] rawMessage = encoding.GetBytes(serializedMessageBody);
-           
-            var serviceBusMessage = new ServiceBusMessage(rawMessage)
-            {
-                ApplicationProperties =
-                {
-                    { PropertyNames.ContentType, JsonContentType },
-                    { PropertyNames.Encoding, encoding.WebName }
-                }
-            };
-            
-            if (operationId != null)
-            {
-                serviceBusMessage.CorrelationId = operationId;
-            }
-
-            if (string.IsNullOrWhiteSpace(transactionId) == false)
-            {
-                serviceBusMessage.ApplicationProperties.Add(PropertyNames.TransactionId, transactionId);
-            }
-
-            return serviceBusMessage;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePumpDockerTests.cs b/src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePumpDockerTests.cs
index c0ae957d..1b464eda 100644
--- a/src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePumpDockerTests.cs
+++ b/src/Arcus.Messaging.Tests.Integration/MessagePump/ServiceBusMessagePumpDockerTests.cs
@@ -35,6 +35,7 @@ public async Task ServiceBusTopicMessagePump_PublishServiceBusMessage_MessageSuc
             // Arrange
             var traceParent = TraceParent.Generate();
             Order order = OrderGenerator.Generate();
+
             var orderMessage = new ServiceBusMessage(BinaryData.FromObjectAsJson(order))
                 .WithDiagnosticId(traceParent);
 
diff --git a/src/Arcus.Messaging.Tests.Unit/MessageHandling/MessageHandlerTests.cs b/src/Arcus.Messaging.Tests.Unit/MessageHandling/MessageHandlerTests.cs
index 431030cd..74b0a084 100644
--- a/src/Arcus.Messaging.Tests.Unit/MessageHandling/MessageHandlerTests.cs
+++ b/src/Arcus.Messaging.Tests.Unit/MessageHandling/MessageHandlerTests.cs
@@ -216,7 +216,7 @@ public void CustomMessageHandlerConstructor_WithContextFilterObsolete_SubtractsR
             Assert.NotNull(messageHandler);
 
             var context = TestMessageContext.Generate();
-            Assert.Equal(matchesContext, messageHandler.CanProcessMessage(messageContext: context));
+            Assert.Equal(matchesContext, messageHandler.CanProcessMessageBasedOnContext(messageContext: context));
         }
 
         [Theory]
@@ -264,7 +264,7 @@ public void CustomMessageHandlerFactory_WithDefaultContextFilterObsolete_Subtrac
             Assert.NotNull(messageHandler);
 
             var context = new MessageContext("message-id", new Dictionary<string, object>());
-            Assert.Equal(matchesContext, messageHandler.CanProcessMessage(messageContext: context));
+            Assert.Equal(matchesContext, messageHandler.CanProcessMessageBasedOnContext(messageContext: context));
         }
 
         [Fact]
diff --git a/src/Arcus.Messaging.Tests.Unit/ServiceBus/ObjectExtensionsTests.cs b/src/Arcus.Messaging.Tests.Unit/ServiceBus/ObjectExtensionsTests.cs
index 3ad3204f..bd3683b9 100644
--- a/src/Arcus.Messaging.Tests.Unit/ServiceBus/ObjectExtensionsTests.cs
+++ b/src/Arcus.Messaging.Tests.Unit/ServiceBus/ObjectExtensionsTests.cs
@@ -25,7 +25,7 @@ public void WrapInServiceBusMessage_BasicWithoutOptions_ReturnsValidServiceBusMe
             Order messagePayload = OrderGenerator.Generate();
 
             // Act
-            ServiceBusMessage serviceBusMessage = messagePayload.AsServiceBusMessage();
+            ServiceBusMessage serviceBusMessage = ServiceBusMessageBuilder.CreateForBody(messagePayload).Build();
 
             // Assert
             Assert.NotNull(serviceBusMessage);
@@ -47,7 +47,9 @@ public void WrapInServiceBusMessage_BasicWithOperationId_ReturnsValidServiceBusM
             var operationId = Guid.NewGuid().ToString();
 
             // Act
-            ServiceBusMessage serviceBusMessage = messagePayload.AsServiceBusMessage(operationId: operationId);
+            var serviceBusMessageBuilder = ServiceBusMessageBuilder.CreateForBody(messagePayload);
+            serviceBusMessageBuilder.WithOperationId(operationId);
+            ServiceBusMessage serviceBusMessage = serviceBusMessageBuilder.Build();
 
             // Assert
             Assert.NotNull(serviceBusMessage);
@@ -69,7 +71,9 @@ public void WrapInServiceBusMessage_BasicWithTransactionId_ReturnsValidServiceBu
             var expectedTransactionId = Guid.NewGuid().ToString();
 
             // Act
-            ServiceBusMessage serviceBusMessage = messagePayload.AsServiceBusMessage(transactionId: expectedTransactionId);
+            var serviceBusMessageBuilder = ServiceBusMessageBuilder.CreateForBody(messagePayload);
+            serviceBusMessageBuilder.WithTransactionId(transactionId: expectedTransactionId);
+            ServiceBusMessage serviceBusMessage = serviceBusMessageBuilder.Build();
 
             // Assert
             Assert.NotNull(serviceBusMessage);
@@ -92,7 +96,8 @@ public void WrapInServiceBusMessage_BasicWithEncoding_ReturnsValidServiceBusMess
             Encoding expectedEncoding = Encoding.ASCII;
 
             // Act
-            ServiceBusMessage serviceBusMessage = originalMessagePayload.AsServiceBusMessage(encoding: expectedEncoding);
+            var serviceBusMessageBuilder = ServiceBusMessageBuilder.CreateForBody(originalMessagePayload, encoding: expectedEncoding);
+            ServiceBusMessage serviceBusMessage = serviceBusMessageBuilder.Build();
 
             // Assert
             Assert.NotNull(serviceBusMessage);