diff --git a/samples/logging/extensions-logging/Extensions.Logging_2/Sample/MyHandler.cs b/samples/logging/extensions-logging/Extensions.Logging_2/Sample/MyHandler.cs
index e1abe84085d..f570b43602a 100644
--- a/samples/logging/extensions-logging/Extensions.Logging_2/Sample/MyHandler.cs
+++ b/samples/logging/extensions-logging/Extensions.Logging_2/Sample/MyHandler.cs
@@ -1,11 +1,8 @@
-using System.Threading.Tasks;
-using NServiceBus;
-using NServiceBus.Logging;
+using NServiceBus.Logging;
 
-public class MyHandler :
-    IHandleMessages<MyMessage>
+public class MyHandler : IHandleMessages<MyMessage>
 {
-    static ILog log = LogManager.GetLogger<MyHandler>();
+    static readonly ILog log = LogManager.GetLogger<MyHandler>();
 
     public Task Handle(MyMessage message, IMessageHandlerContext context)
     {
diff --git a/samples/logging/extensions-logging/Extensions.Logging_2/Sample/MyMessage.cs b/samples/logging/extensions-logging/Extensions.Logging_2/Sample/MyMessage.cs
index 65952daa4c9..d80f5ce2509 100644
--- a/samples/logging/extensions-logging/Extensions.Logging_2/Sample/MyMessage.cs
+++ b/samples/logging/extensions-logging/Extensions.Logging_2/Sample/MyMessage.cs
@@ -1,6 +1 @@
-using NServiceBus;
-
-public class MyMessage :
-    IMessage
-{
-}
\ No newline at end of file
+public class MyMessage : IMessage;
\ No newline at end of file
diff --git a/samples/logging/extensions-logging/Extensions.Logging_2/Sample/Program.cs b/samples/logging/extensions-logging/Extensions.Logging_2/Sample/Program.cs
index 8044731fe50..9785ee02aee 100644
--- a/samples/logging/extensions-logging/Extensions.Logging_2/Sample/Program.cs
+++ b/samples/logging/extensions-logging/Extensions.Logging_2/Sample/Program.cs
@@ -1,51 +1,42 @@
-using System;
-using System.Threading.Tasks;
-using NLog.Config;
+using NLog.Config;
 using NLog.Extensions.Logging;
 using NLog.Targets;
-using NServiceBus;
 using NServiceBus.Extensions.Logging;
 
-class Program
-{
-    static async Task Main()
-    {
-        Console.Title = "ExtensionsLogging";
+Console.Title = "ExtensionsLogging";
 
-        #region NLogConfiguration
-        var config = new LoggingConfiguration();
+#region NLogConfiguration
+var config = new LoggingConfiguration();
 
-        var consoleTarget = new ColoredConsoleTarget
-        {
-            Layout = "${level}|${logger}|${message}${onexception:${newline}${exception:format=tostring}}"
-        };
-        config.AddTarget("console", consoleTarget);
-        config.LoggingRules.Add(new LoggingRule("*", NLog.LogLevel.Debug, consoleTarget));
+var consoleTarget = new ColoredConsoleTarget
+{
+    Layout = "${level}|${logger}|${message}${onexception:${newline}${exception:format=tostring}}"
+};
+config.AddTarget("console", consoleTarget);
+config.LoggingRules.Add(new LoggingRule("*", NLog.LogLevel.Debug, consoleTarget));
 
-        NLog.LogManager.Configuration = config;
+NLog.LogManager.Configuration = config;
 
-        #endregion
+#endregion
 
-        #region MicrosoftExtensionsLoggingNLog
+#region MicrosoftExtensionsLoggingNLog
 
-        Microsoft.Extensions.Logging.ILoggerFactory extensionsLoggerFactory = new NLogLoggerFactory();
+Microsoft.Extensions.Logging.ILoggerFactory extensionsLoggerFactory = new NLogLoggerFactory();
 
-        NServiceBus.Logging.ILoggerFactory nservicebusLoggerFactory = new ExtensionsLoggerFactory(loggerFactory: extensionsLoggerFactory);
+NServiceBus.Logging.ILoggerFactory nservicebusLoggerFactory = new ExtensionsLoggerFactory(loggerFactory: extensionsLoggerFactory);
 
-        NServiceBus.Logging.LogManager.UseFactory(loggerFactory: nservicebusLoggerFactory);
+NServiceBus.Logging.LogManager.UseFactory(loggerFactory: nservicebusLoggerFactory);
 
-        #endregion
+#endregion
 
-        var endpointConfiguration = new EndpointConfiguration("Samples.Logging.ExtensionsLogging");
+var endpointConfiguration = new EndpointConfiguration("Samples.Logging.ExtensionsLogging");
 
-        endpointConfiguration.UseTransport<LearningTransport>();
-        endpointConfiguration.UseSerialization<SystemJsonSerializer>();
+endpointConfiguration.UseTransport<LearningTransport>();
+endpointConfiguration.UseSerialization<SystemJsonSerializer>();
 
-        var endpointInstance = await Endpoint.Start(endpointConfiguration);
-        var myMessage = new MyMessage();
-        await endpointInstance.SendLocal(myMessage);
-        Console.WriteLine("Press any key to exit");
-        Console.ReadKey();
-        await endpointInstance.Stop();
-    }
-}
\ No newline at end of file
+var endpointInstance = await Endpoint.Start(endpointConfiguration);
+var myMessage = new MyMessage();
+await endpointInstance.SendLocal(myMessage);
+Console.WriteLine("Press any key to exit");
+Console.ReadKey();
+await endpointInstance.Stop();
diff --git a/samples/logging/extensions-logging/Extensions.Logging_2/Sample/Sample.csproj b/samples/logging/extensions-logging/Extensions.Logging_2/Sample/Sample.csproj
index 34479637a91..85de6ca103f 100644
--- a/samples/logging/extensions-logging/Extensions.Logging_2/Sample/Sample.csproj
+++ b/samples/logging/extensions-logging/Extensions.Logging_2/Sample/Sample.csproj
@@ -1,12 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFrameworks>net10.0;net9.0;net8.0;net48</TargetFrameworks>
     <OutputType>Exe</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>12.0</LangVersion>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="NServiceBus" Version="8.*" />
     <PackageReference Include="NServiceBus.Extensions.Logging" Version="2.*" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.*" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/samples/logging/extensions-logging/Extensions.Logging_3/Sample/MyHandler.cs b/samples/logging/extensions-logging/Extensions.Logging_3/Sample/MyHandler.cs
index e1abe84085d..f570b43602a 100644
--- a/samples/logging/extensions-logging/Extensions.Logging_3/Sample/MyHandler.cs
+++ b/samples/logging/extensions-logging/Extensions.Logging_3/Sample/MyHandler.cs
@@ -1,11 +1,8 @@
-using System.Threading.Tasks;
-using NServiceBus;
-using NServiceBus.Logging;
+using NServiceBus.Logging;
 
-public class MyHandler :
-    IHandleMessages<MyMessage>
+public class MyHandler : IHandleMessages<MyMessage>
 {
-    static ILog log = LogManager.GetLogger<MyHandler>();
+    static readonly ILog log = LogManager.GetLogger<MyHandler>();
 
     public Task Handle(MyMessage message, IMessageHandlerContext context)
     {
diff --git a/samples/logging/extensions-logging/Extensions.Logging_3/Sample/MyMessage.cs b/samples/logging/extensions-logging/Extensions.Logging_3/Sample/MyMessage.cs
index 65952daa4c9..d80f5ce2509 100644
--- a/samples/logging/extensions-logging/Extensions.Logging_3/Sample/MyMessage.cs
+++ b/samples/logging/extensions-logging/Extensions.Logging_3/Sample/MyMessage.cs
@@ -1,6 +1 @@
-using NServiceBus;
-
-public class MyMessage :
-    IMessage
-{
-}
\ No newline at end of file
+public class MyMessage : IMessage;
\ No newline at end of file
diff --git a/samples/logging/extensions-logging/Extensions.Logging_3/Sample/Program.cs b/samples/logging/extensions-logging/Extensions.Logging_3/Sample/Program.cs
index 8044731fe50..9785ee02aee 100644
--- a/samples/logging/extensions-logging/Extensions.Logging_3/Sample/Program.cs
+++ b/samples/logging/extensions-logging/Extensions.Logging_3/Sample/Program.cs
@@ -1,51 +1,42 @@
-using System;
-using System.Threading.Tasks;
-using NLog.Config;
+using NLog.Config;
 using NLog.Extensions.Logging;
 using NLog.Targets;
-using NServiceBus;
 using NServiceBus.Extensions.Logging;
 
-class Program
-{
-    static async Task Main()
-    {
-        Console.Title = "ExtensionsLogging";
+Console.Title = "ExtensionsLogging";
 
-        #region NLogConfiguration
-        var config = new LoggingConfiguration();
+#region NLogConfiguration
+var config = new LoggingConfiguration();
 
-        var consoleTarget = new ColoredConsoleTarget
-        {
-            Layout = "${level}|${logger}|${message}${onexception:${newline}${exception:format=tostring}}"
-        };
-        config.AddTarget("console", consoleTarget);
-        config.LoggingRules.Add(new LoggingRule("*", NLog.LogLevel.Debug, consoleTarget));
+var consoleTarget = new ColoredConsoleTarget
+{
+    Layout = "${level}|${logger}|${message}${onexception:${newline}${exception:format=tostring}}"
+};
+config.AddTarget("console", consoleTarget);
+config.LoggingRules.Add(new LoggingRule("*", NLog.LogLevel.Debug, consoleTarget));
 
-        NLog.LogManager.Configuration = config;
+NLog.LogManager.Configuration = config;
 
-        #endregion
+#endregion
 
-        #region MicrosoftExtensionsLoggingNLog
+#region MicrosoftExtensionsLoggingNLog
 
-        Microsoft.Extensions.Logging.ILoggerFactory extensionsLoggerFactory = new NLogLoggerFactory();
+Microsoft.Extensions.Logging.ILoggerFactory extensionsLoggerFactory = new NLogLoggerFactory();
 
-        NServiceBus.Logging.ILoggerFactory nservicebusLoggerFactory = new ExtensionsLoggerFactory(loggerFactory: extensionsLoggerFactory);
+NServiceBus.Logging.ILoggerFactory nservicebusLoggerFactory = new ExtensionsLoggerFactory(loggerFactory: extensionsLoggerFactory);
 
-        NServiceBus.Logging.LogManager.UseFactory(loggerFactory: nservicebusLoggerFactory);
+NServiceBus.Logging.LogManager.UseFactory(loggerFactory: nservicebusLoggerFactory);
 
-        #endregion
+#endregion
 
-        var endpointConfiguration = new EndpointConfiguration("Samples.Logging.ExtensionsLogging");
+var endpointConfiguration = new EndpointConfiguration("Samples.Logging.ExtensionsLogging");
 
-        endpointConfiguration.UseTransport<LearningTransport>();
-        endpointConfiguration.UseSerialization<SystemJsonSerializer>();
+endpointConfiguration.UseTransport<LearningTransport>();
+endpointConfiguration.UseSerialization<SystemJsonSerializer>();
 
-        var endpointInstance = await Endpoint.Start(endpointConfiguration);
-        var myMessage = new MyMessage();
-        await endpointInstance.SendLocal(myMessage);
-        Console.WriteLine("Press any key to exit");
-        Console.ReadKey();
-        await endpointInstance.Stop();
-    }
-}
\ No newline at end of file
+var endpointInstance = await Endpoint.Start(endpointConfiguration);
+var myMessage = new MyMessage();
+await endpointInstance.SendLocal(myMessage);
+Console.WriteLine("Press any key to exit");
+Console.ReadKey();
+await endpointInstance.Stop();
diff --git a/samples/logging/extensions-logging/Extensions.Logging_3/Sample/Sample.csproj b/samples/logging/extensions-logging/Extensions.Logging_3/Sample/Sample.csproj
index 3e059b0a03f..2bf96213425 100644
--- a/samples/logging/extensions-logging/Extensions.Logging_3/Sample/Sample.csproj
+++ b/samples/logging/extensions-logging/Extensions.Logging_3/Sample/Sample.csproj
@@ -1,12 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>12.0</LangVersion>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="NServiceBus" Version="9.*" />
     <PackageReference Include="NServiceBus.Extensions.Logging" Version="3.*" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.*" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/samples/logging/extensions-logging/Extensions.Logging_4/Sample/MyHandler.cs b/samples/logging/extensions-logging/Extensions.Logging_4/Sample/MyHandler.cs
index 34baa0f4d9f..f7b24eb4a52 100644
--- a/samples/logging/extensions-logging/Extensions.Logging_4/Sample/MyHandler.cs
+++ b/samples/logging/extensions-logging/Extensions.Logging_4/Sample/MyHandler.cs
@@ -1,11 +1,8 @@
-using System.Threading.Tasks;
-using NServiceBus;
-using NServiceBus.Logging;
+using NServiceBus.Logging;
 
-public class MyHandler :
-    IHandleMessages<MyMessage>
+public class MyHandler : IHandleMessages<MyMessage>
 {
-    static ILog log = LogManager.GetLogger<MyHandler>();
+    static readonly ILog log = LogManager.GetLogger<MyHandler>();
 
     public Task Handle(MyMessage message, IMessageHandlerContext context)
     {
diff --git a/samples/logging/extensions-logging/Extensions.Logging_4/Sample/MyMessage.cs b/samples/logging/extensions-logging/Extensions.Logging_4/Sample/MyMessage.cs
index 254edf5d23a..d80f5ce2509 100644
--- a/samples/logging/extensions-logging/Extensions.Logging_4/Sample/MyMessage.cs
+++ b/samples/logging/extensions-logging/Extensions.Logging_4/Sample/MyMessage.cs
@@ -1,3 +1 @@
-using NServiceBus;
-
-public class MyMessage : IMessage;
\ No newline at end of file
+public class MyMessage : IMessage;
\ No newline at end of file
diff --git a/samples/logging/extensions-logging/Extensions.Logging_4/Sample/Program.cs b/samples/logging/extensions-logging/Extensions.Logging_4/Sample/Program.cs
index 624354342b4..2460f672259 100644
--- a/samples/logging/extensions-logging/Extensions.Logging_4/Sample/Program.cs
+++ b/samples/logging/extensions-logging/Extensions.Logging_4/Sample/Program.cs
@@ -1,56 +1,42 @@
-using System;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using NLog.Config;
+using NLog.Config;
 using NLog.Extensions.Logging;
 using NLog.Targets;
-using NServiceBus;
 using NServiceBus.Extensions.Logging;
 
 Console.Title = "ExtensionsLogging";
 
-var host = Host.CreateDefaultBuilder(args)
-    .UseConsoleLifetime()
-    .UseNServiceBus(_ =>
-    {
-        #region NLogConfiguration
-        var config = new LoggingConfiguration();
+#region NLogConfiguration
+var config = new LoggingConfiguration();
 
-        var consoleTarget = new ColoredConsoleTarget
-        {
-            Layout = "${level}|${logger}|${message}${onexception:${newline}${exception:format=tostring}}"
-        };
-        config.AddTarget("console", consoleTarget);
-        config.LoggingRules.Add(new LoggingRule("*", NLog.LogLevel.Debug, consoleTarget));
+var consoleTarget = new ColoredConsoleTarget
+{
+    Layout = "${level}|${logger}|${message}${onexception:${newline}${exception:format=tostring}}"
+};
+config.AddTarget("console", consoleTarget);
+config.LoggingRules.Add(new LoggingRule("*", NLog.LogLevel.Debug, consoleTarget));
 
-        NLog.LogManager.Configuration = config;
-        #endregion
+NLog.LogManager.Configuration = config;
 
-        #region MicrosoftExtensionsLoggingNLog
-        Microsoft.Extensions.Logging.ILoggerFactory extensionsLoggerFactory = new NLogLoggerFactory();
+#endregion
 
-        NServiceBus.Logging.ILoggerFactory nservicebusLoggerFactory =
-            new ExtensionsLoggerFactory(loggerFactory: extensionsLoggerFactory);
+#region MicrosoftExtensionsLoggingNLog
 
-        NServiceBus.Logging.LogManager.UseFactory(loggerFactory: nservicebusLoggerFactory);
-        #endregion
+Microsoft.Extensions.Logging.ILoggerFactory extensionsLoggerFactory = new NLogLoggerFactory();
 
-        var endpointConfiguration = new EndpointConfiguration("Samples.Logging.ExtensionsLogging");
+NServiceBus.Logging.ILoggerFactory nservicebusLoggerFactory = new ExtensionsLoggerFactory(loggerFactory: extensionsLoggerFactory);
 
-        endpointConfiguration.UseTransport<LearningTransport>();
-        endpointConfiguration.UseSerialization<SystemJsonSerializer>();
+NServiceBus.Logging.LogManager.UseFactory(loggerFactory: nservicebusLoggerFactory);
 
-        return endpointConfiguration;
-    })
-    .Build();
+#endregion
 
-await host.StartAsync();
+var endpointConfiguration = new EndpointConfiguration("Samples.Logging.ExtensionsLogging");
 
-var endpointInstance = host.Services.GetRequiredService<IMessageSession>();
-
-await endpointInstance.SendLocal(new MyMessage());
+endpointConfiguration.UseTransport<LearningTransport>();
+endpointConfiguration.UseSerialization<SystemJsonSerializer>();
 
+var endpointInstance = await Endpoint.Start(endpointConfiguration);
+var myMessage = new MyMessage();
+await endpointInstance.SendLocal(myMessage);
 Console.WriteLine("Press any key to exit");
 Console.ReadKey();
-
-await host.StopAsync();
\ No newline at end of file
+await endpointInstance.Stop();
\ No newline at end of file
diff --git a/samples/logging/extensions-logging/Extensions.Logging_4/Sample/Sample.csproj b/samples/logging/extensions-logging/Extensions.Logging_4/Sample/Sample.csproj
index 8e27f0e84ee..1c34b490a88 100644
--- a/samples/logging/extensions-logging/Extensions.Logging_4/Sample/Sample.csproj
+++ b/samples/logging/extensions-logging/Extensions.Logging_4/Sample/Sample.csproj
@@ -1,13 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <OutputType>Exe</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>14.0</LangVersion>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="NServiceBus" Version="10.*" />
-    <PackageReference Include="NServiceBus.Extensions.Hosting" Version="4.*" />
     <PackageReference Include="NServiceBus.Extensions.Logging" Version="4.*" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="6.0.2" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="6.*" />
   </ItemGroup>
+
 </Project>
\ No newline at end of file