diff --git a/src/Testing/CoreTests/Configuration/auditing_determination.cs b/src/Testing/CoreTests/Configuration/auditing_determination.cs
index 428ec4b9a..71f65758b 100644
--- a/src/Testing/CoreTests/Configuration/auditing_determination.cs
+++ b/src/Testing/CoreTests/Configuration/auditing_determination.cs
@@ -88,43 +88,13 @@ public void use_audit_member_named_id_and_disambiguate()
         with(opts => opts.Policies.LogMessageStarting(LogLevel.Information));
         
         var chain = chainFor<AuditedMessage2>();
-        chain.SourceCode.ShouldContain("Log(Microsoft.Extensions.Logging.LogLevel.Information, \"$Starting to process {_inputType.FullNameInCode()} ({{EnvelopeId}} with Id: {Id}, AccountIdentifier: {AccountId}\", context.Envelope.Id, auditedMessage2.Id, auditedMessage2.AccountId);");
+        
+        
+        
+        chain.SourceCode.ShouldContain("\"Starting to process CoreTests.Configuration.AuditedMessage2 ({EnvelopeId} with Id: {Id}, AccountIdentifier: {AccountId}\"");
         
 /*
-    [global::System.CodeDom.Compiler.GeneratedCode("JasperFx", "1.0.0")]
-   public sealed class AuditedMessage2Handler46886595 : Wolverine.Runtime.Handlers.MessageHandler
-   {
-       private readonly Microsoft.Extensions.Logging.ILogger<CoreTests.Configuration.AuditedMessage2> _loggerForMessage;
-
-       public AuditedMessage2Handler46886595(Microsoft.Extensions.Logging.ILogger<CoreTests.Configuration.AuditedMessage2> loggerForMessage)
-       {
-           _loggerForMessage = loggerForMessage;
-       }
-
-
-
-       public override System.Threading.Tasks.Task HandleAsync(Wolverine.Runtime.MessageContext context, System.Threading.CancellationToken cancellation)
-       {
-           // The actual message body
-           var auditedMessage2 = (CoreTests.Configuration.AuditedMessage2)context.Envelope.Message;
-
-           // Application-specific Open Telemetry auditing
-           System.Diagnostics.Activity.Current?.SetTag("id", auditedMessage2.Id);
-           System.Diagnostics.Activity.Current?.SetTag("account.id", auditedMessage2.AccountId);
-           // Application specific auditing
-           ((Microsoft.Extensions.Logging.ILogger)_loggerForMessage).Log(Microsoft.Extensions.Logging.LogLevel.Information, "$Starting to process {_inputType.FullNameInCode()} ({{EnvelopeId}} with Id: {Id}, AccountIdentifier: {AccountId}", context.Envelope.Id, auditedMessage2.Id, auditedMessage2.AccountId);
-           System.Diagnostics.Activity.Current?.SetTag("message.handler", "CoreTests.Configuration.AuditedHandler");
-           var auditedHandler = new CoreTests.Configuration.AuditedHandler();
-           
-           // The actual message execution
-           auditedHandler.Handle(auditedMessage2);
-
-           return System.Threading.Tasks.Task.CompletedTask;
-       }
-
-   }
-
-
+((Microsoft.Extensions.Logging.ILogger)_loggerForMessage).Log(Microsoft.Extensions.Logging.LogLevel.Information, "Starting to process CoreTests.Configuration.AuditedMessage2 ({EnvelopeId} with Id: {Id}, AccountIdentifier: {AccountId}", context.Envelope.Id, auditedMessage2.Id, auditedMessage2.AccountId);
  */
     }
 }
diff --git a/src/Wolverine/Runtime/MessageContext.cs b/src/Wolverine/Runtime/MessageContext.cs
index 100f39ae5..1bbb4f223 100644
--- a/src/Wolverine/Runtime/MessageContext.cs
+++ b/src/Wolverine/Runtime/MessageContext.cs
@@ -553,7 +553,8 @@ internal void ClearState()
         }
 
         _hasFlushed = false;
-
+        
+        _sent?.Clear();
         _outstanding.Clear();
         Scheduled.Clear();
         Envelope = null;