diff --git a/src/Billing/BillOrder.cs b/src/Billing/BillOrder.cs
index 4a3b51f..b5eccc6 100644
--- a/src/Billing/BillOrder.cs
+++ b/src/Billing/BillOrder.cs
@@ -7,12 +7,10 @@
 {
     public class BillOrder : IHandleMessages<OrderPlaced>
     {
-        public async Task Handle(OrderPlaced message, IMessageHandlerContext context)
+        public Task Handle(OrderPlaced message, IMessageHandlerContext context)
         {
-            await context.Publish(new OrderBilled
-            {
-                OrderId = message.OrderId
-            });
+            // Do some work here
+            return Task.CompletedTask;
         }
     }
 }
\ No newline at end of file

diff --git a/src/Billing/BillOrder.cs b/src/Billing/BillOrder.cs
index 4a3b51f..b5eccc6 100644
--- a/src/Billing/BillOrder.cs
+++ b/src/Billing/BillOrder.cs
@@ -7,12 +7,10 @@
 {
     public class BillOrder : IHandleMessages<OrderPlaced>
     {
-        public async Task Handle(OrderPlaced message, IMessageHandlerContext context)
+        public Task Handle(OrderPlaced message, IMessageHandlerContext context)
         {
-            await context.Publish(new OrderBilled
-            {
-                OrderId = message.OrderId
-            });
+            // Do some work here
+            return Task.CompletedTask;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Shipping/CreateShippingLabelHandler.cs b/src/Shipping/CreateShippingLabelHandler.cs
index 28ec917..e9203ef 100644
--- a/src/Shipping/CreateShippingLabelHandler.cs
+++ b/src/Shipping/CreateShippingLabelHandler.cs
@@ -7,7 +7,7 @@
 
 namespace Shipping
 {
-    public class CreateShippingLabelHandler :IHandleMessages<OrderBilled>
+    public class CreateShippingLabelHandler :IHandleMessages<OrderPlaced>
     {
         private readonly ShippingDbContext _dbContext;
 
@@ -16,19 +16,10 @@
             _dbContext = dbContext;
         }
 
-        public async Task Handle(OrderBilled message, IMessageHandlerContext context)
+        public Task Handle(OrderPlaced message, IMessageHandlerContext context)
         {
-            await _dbContext.ShippingLabels.AddAsync(new ShippingLabel
-            {
-                OrderId = message.OrderId,
-                OrderDate = DateTime.UtcNow
-            });
-            await _dbContext.SaveChangesAsync();
-
-            await context.Publish<ShippingLabelCreated>(created =>
-            {
-                created.OrderId = message.OrderId;
-            });
+            // Do some work here
+            return Task.CompletedTask;
         }
     }
 }
\ No newline at end of file