diff --git a/DeflateCompressionTest/DeflateCompressionTest.csproj b/DeflateCompressionTest/DeflateCompressionTest.csproj
index 6f7ac68..8a2a44b 100644
--- a/DeflateCompressionTest/DeflateCompressionTest.csproj
+++ b/DeflateCompressionTest/DeflateCompressionTest.csproj
@@ -1,21 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/Directory.Build.props b/Directory.Build.props
index 3162396..23ea691 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -18,10 +18,11 @@
     <NoWarn>$(NoWarn);1701;1702;1705;1591</NoWarn>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <LangVersion>latest</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <!-- Shared Package Versions -->
diff --git a/NuGet.Config b/NuGet.Config
new file mode 100644
index 0000000..0dc2659
--- /dev/null
+++ b/NuGet.Config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<packageSources>
+		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+	</packageSources>
+</configuration>
\ No newline at end of file
diff --git a/Orleans.Persistence.Redis.E2E/Consts.cs b/Orleans.Persistence.Redis.E2E/Consts.cs
index 4943505..c0860be 100644
--- a/Orleans.Persistence.Redis.E2E/Consts.cs
+++ b/Orleans.Persistence.Redis.E2E/Consts.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Orleans.Persistence.Redis.E2E
+namespace Orleans.Persistence.Redis.E2E
 {
 	public static class Consts
 	{
diff --git a/Orleans.Persistence.Redis.E2E/JsonSerializationTests.cs b/Orleans.Persistence.Redis.E2E/JsonSerializationTests.cs
index e96917b..a7b4582 100644
--- a/Orleans.Persistence.Redis.E2E/JsonSerializationTests.cs
+++ b/Orleans.Persistence.Redis.E2E/JsonSerializationTests.cs
@@ -1,11 +1,6 @@
-using System;
-using Microsoft.Extensions.Configuration;
-using Orleans.Hosting;
+using Microsoft.Extensions.Configuration;
 using Orleans.Streams;
 using Orleans.TestingHost;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace Orleans.Persistence.Redis.E2E
diff --git a/Orleans.Persistence.Redis.E2E/MessagePackTests.cs b/Orleans.Persistence.Redis.E2E/MessagePackTests.cs
index ada6d91..6e6bc50 100644
--- a/Orleans.Persistence.Redis.E2E/MessagePackTests.cs
+++ b/Orleans.Persistence.Redis.E2E/MessagePackTests.cs
@@ -1,11 +1,7 @@
 using Microsoft.Extensions.Configuration;
-using Orleans.Hosting;
-using Orleans.Persistence.Redis.Config;
 using Orleans.Persistence.Redis.Serialization;
 using Orleans.Streams;
 using Orleans.TestingHost;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace Orleans.Persistence.Redis.E2E
diff --git a/Orleans.Persistence.Redis.E2E/Orleans.Persistence.Redis.E2E.csproj b/Orleans.Persistence.Redis.E2E/Orleans.Persistence.Redis.E2E.csproj
index cc7440d..e561441 100644
--- a/Orleans.Persistence.Redis.E2E/Orleans.Persistence.Redis.E2E.csproj
+++ b/Orleans.Persistence.Redis.E2E/Orleans.Persistence.Redis.E2E.csproj
@@ -1,14 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
diff --git a/Orleans.Persistence.Redis.E2E/RedisSegmentTests/RedisSegmentTests.cs b/Orleans.Persistence.Redis.E2E/RedisSegmentTests/RedisSegmentTests.cs
index 06af140..e845703 100644
--- a/Orleans.Persistence.Redis.E2E/RedisSegmentTests/RedisSegmentTests.cs
+++ b/Orleans.Persistence.Redis.E2E/RedisSegmentTests/RedisSegmentTests.cs
@@ -1,10 +1,6 @@
 using Orleans.TestingHost;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -75,9 +71,7 @@ public RedisOrleansSerializerCompressedSegmentedTest(ITestOutputHelper output) :
 
 		[Fact]
 		public async Task Test()
-		{
-			await PerformTest("SerializerCompressedSegmentedTest");
-		}
+			=> await PerformTest("SerializerCompressedSegmentedTest");
 	}
 
 	public class SiloBuilderConfiguratorOrleansSerializerDeflateCompressionSegmentedTest : RedisSegmentTests<SiloConfigurator.SiloBuilderConfiguratorOrleansSerializerDeflateCompressionSegmented>
diff --git a/Orleans.Persistence.Redis.E2E/RedisSegmentTests/SegmentModels.cs b/Orleans.Persistence.Redis.E2E/RedisSegmentTests/SegmentModels.cs
index 5380674..5b7f6c3 100644
--- a/Orleans.Persistence.Redis.E2E/RedisSegmentTests/SegmentModels.cs
+++ b/Orleans.Persistence.Redis.E2E/RedisSegmentTests/SegmentModels.cs
@@ -1,6 +1,4 @@
-using System.Threading;
-using Orleans.Providers;
-using System.Threading.Tasks;
+using Orleans.Providers;
 
 namespace Orleans.Persistence.Redis.E2E.RedisSegmentTests
 {
diff --git a/Orleans.Persistence.Redis.E2E/RedisSegmentTests/SiloConfigurator/Configurations.cs b/Orleans.Persistence.Redis.E2E/RedisSegmentTests/SiloConfigurator/Configurations.cs
index 275607a..8dfa4b5 100644
--- a/Orleans.Persistence.Redis.E2E/RedisSegmentTests/SiloConfigurator/Configurations.cs
+++ b/Orleans.Persistence.Redis.E2E/RedisSegmentTests/SiloConfigurator/Configurations.cs
@@ -1,9 +1,7 @@
 using Humanizer;
 using Microsoft.Extensions.Configuration;
-using Orleans.Hosting;
 using Orleans.Persistence.Redis.Serialization;
 using Orleans.TestingHost;
-using System.Collections.Generic;
 
 namespace Orleans.Persistence.Redis.E2E.RedisSegmentTests.SiloConfigurator
 {
diff --git a/Orleans.Persistence.Redis.E2E/RedisTests.cs b/Orleans.Persistence.Redis.E2E/RedisTests.cs
index 8633a94..be9fd88 100644
--- a/Orleans.Persistence.Redis.E2E/RedisTests.cs
+++ b/Orleans.Persistence.Redis.E2E/RedisTests.cs
@@ -1,5 +1,4 @@
 using Orleans.Streams;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace Orleans.Persistence.Redis.E2E
diff --git a/Orleans.Persistence.Redis.E2E/TestBase.cs b/Orleans.Persistence.Redis.E2E/TestBase.cs
index 1d78dec..e199525 100644
--- a/Orleans.Persistence.Redis.E2E/TestBase.cs
+++ b/Orleans.Persistence.Redis.E2E/TestBase.cs
@@ -1,9 +1,6 @@
 using Microsoft.Extensions.Configuration;
-using Orleans.Hosting;
 using Orleans.TestingHost;
 using StackExchange.Redis;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using Xunit;
 using static StackExchange.Redis.ConnectionMultiplexer;
 
@@ -44,15 +41,14 @@ public Task DisposeAsync()
 
 		protected static async Task FlushDb()
 		{
-			using (var connection = await ConnectAsync(new ConfigurationOptions
+			await using var connection = await ConnectAsync(new ConfigurationOptions
 			{
 				EndPoints = { "localhost" },
 				AllowAdmin = true
-			}))
-			{
-				var server = connection.GetServer("localhost:6379");
-				await server.FlushAllDatabasesAsync();
-			}
+			});
+
+			var server = connection.GetServer("localhost:6379");
+			await server.FlushAllDatabasesAsync();
 		}
 	}
 
diff --git a/Orleans.Persistence.Redis.E2E/TestGrain.cs b/Orleans.Persistence.Redis.E2E/TestGrain.cs
index 43ea121..f97c561 100644
--- a/Orleans.Persistence.Redis.E2E/TestGrain.cs
+++ b/Orleans.Persistence.Redis.E2E/TestGrain.cs
@@ -1,9 +1,5 @@
 using Orleans.Providers;
 using Orleans.Streams;
-using System;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Orleans.Persistence.Redis.E2E
 {
diff --git a/Orleans.Persistence.Redis/Compression/BrotliCompression.cs b/Orleans.Persistence.Redis/Compression/BrotliCompression.cs
index 0b88284..05133d9 100644
--- a/Orleans.Persistence.Redis/Compression/BrotliCompression.cs
+++ b/Orleans.Persistence.Redis/Compression/BrotliCompression.cs
@@ -1,5 +1,4 @@
-using System.IO;
-using System.IO.Compression;
+using System.IO.Compression;
 
 namespace Orleans.Persistence.Redis.Compression
 {
@@ -9,7 +8,7 @@ public byte[] Decompress(byte[] bytes)
 		{
 			using var memoryStream = new MemoryStream(bytes);
 			using var outputStream = new MemoryStream();
-			using (var decompressStream = new Brotli.BrotliStream(memoryStream, CompressionMode.Decompress))
+			using (var decompressStream = new BrotliStream(memoryStream, CompressionMode.Decompress))
 			{
 				decompressStream.CopyTo(outputStream);
 			}
@@ -20,7 +19,7 @@ public byte[] Decompress(byte[] bytes)
 		public byte[] Compress(byte[] bytes)
 		{
 			using var memoryStream = new MemoryStream();
-			using (var brotliStream = new Brotli.BrotliStream(memoryStream, CompressionMode.Compress))
+			using (var brotliStream = new BrotliStream(memoryStream, CompressionMode.Compress))
 			{
 				brotliStream.Write(bytes, 0, bytes.Length);
 			}
@@ -28,4 +27,4 @@ public byte[] Compress(byte[] bytes)
 			return memoryStream.ToArray();
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/Orleans.Persistence.Redis/Compression/DeflateCompression.cs b/Orleans.Persistence.Redis/Compression/DeflateCompression.cs
index abac37e..3e1a028 100644
--- a/Orleans.Persistence.Redis/Compression/DeflateCompression.cs
+++ b/Orleans.Persistence.Redis/Compression/DeflateCompression.cs
@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
+using System.IO.Compression;
 
 namespace Orleans.Persistence.Redis.Compression
 {
diff --git a/Orleans.Persistence.Redis/Compression/GZipCompression.cs b/Orleans.Persistence.Redis/Compression/GZipCompression.cs
index 09548ef..f01320e 100644
--- a/Orleans.Persistence.Redis/Compression/GZipCompression.cs
+++ b/Orleans.Persistence.Redis/Compression/GZipCompression.cs
@@ -1,5 +1,4 @@
-using System.IO;
-using System.IO.Compression;
+using System.IO.Compression;
 
 namespace Orleans.Persistence.Redis.Compression
 {
diff --git a/Orleans.Persistence.Redis/Compression/RawDeflateCompression.cs b/Orleans.Persistence.Redis/Compression/RawDeflateCompression.cs
index 07cac44..2cd2766 100644
--- a/Orleans.Persistence.Redis/Compression/RawDeflateCompression.cs
+++ b/Orleans.Persistence.Redis/Compression/RawDeflateCompression.cs
@@ -1,5 +1,4 @@
-using System.IO;
-using System.IO.Compression;
+using System.IO.Compression;
 
 namespace Orleans.Persistence.Redis.Compression
 {
diff --git a/Orleans.Persistence.Redis/Config/RedisSiloHostBuilderExtensions.cs b/Orleans.Persistence.Redis/Config/RedisSiloHostBuilderExtensions.cs
index d9f7219..c335ee8 100644
--- a/Orleans.Persistence.Redis/Config/RedisSiloHostBuilderExtensions.cs
+++ b/Orleans.Persistence.Redis/Config/RedisSiloHostBuilderExtensions.cs
@@ -13,7 +13,6 @@
 using Orleans.Runtime;
 using Orleans.Serialization;
 using Orleans.Storage;
-using System;
 using JsonSerializer = Orleans.Persistence.Redis.Serialization.JsonSerializer;
 using OrleansSerializer = Orleans.Persistence.Redis.Serialization.OrleansSerializer;
 
diff --git a/Orleans.Persistence.Redis/Config/RedisStorageOptions.cs b/Orleans.Persistence.Redis/Config/RedisStorageOptions.cs
index 75a04cb..497525e 100644
--- a/Orleans.Persistence.Redis/Config/RedisStorageOptions.cs
+++ b/Orleans.Persistence.Redis/Config/RedisStorageOptions.cs
@@ -1,9 +1,6 @@
 using Orleans.Persistence.Redis.Compression;
 using Orleans.Persistence.Redis.Serialization;
-using System;
-using System.Collections.Generic;
 using Microsoft.Extensions.Options;
-using Orleans.Hosting;
 
 namespace Orleans.Persistence.Redis.Config
 {
diff --git a/Orleans.Persistence.Redis/Core/DbConnection.cs b/Orleans.Persistence.Redis/Core/DbConnection.cs
index 6d474d6..d9cd84e 100644
--- a/Orleans.Persistence.Redis/Core/DbConnection.cs
+++ b/Orleans.Persistence.Redis/Core/DbConnection.cs
@@ -1,8 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Orleans.Persistence.Redis.Config;
 using StackExchange.Redis;
-using System;
-using System.Threading.Tasks;
 
 namespace Orleans.Persistence.Redis.Core
 {
diff --git a/Orleans.Persistence.Redis/Core/GrainStateStore.cs b/Orleans.Persistence.Redis/Core/GrainStateStore.cs
index 63d375d..f2a1e86 100644
--- a/Orleans.Persistence.Redis/Core/GrainStateStore.cs
+++ b/Orleans.Persistence.Redis/Core/GrainStateStore.cs
@@ -6,12 +6,8 @@
 using Orleans.Persistence.Redis.Utils;
 using Orleans.Storage;
 using StackExchange.Redis;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace Orleans.Persistence.Redis.Core
 {
diff --git a/Orleans.Persistence.Redis/Core/IGrainStateStore.cs b/Orleans.Persistence.Redis/Core/IGrainStateStore.cs
index ca33f7b..9f7db1f 100644
--- a/Orleans.Persistence.Redis/Core/IGrainStateStore.cs
+++ b/Orleans.Persistence.Redis/Core/IGrainStateStore.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Orleans.Persistence.Redis.Core
+namespace Orleans.Persistence.Redis.Core
 {
 	public interface IGrainStateStore
 	{
diff --git a/Orleans.Persistence.Redis/Core/RedisGrainStorage.cs b/Orleans.Persistence.Redis/Core/RedisGrainStorage.cs
index 838c5b8..136a335 100644
--- a/Orleans.Persistence.Redis/Core/RedisGrainStorage.cs
+++ b/Orleans.Persistence.Redis/Core/RedisGrainStorage.cs
@@ -2,9 +2,6 @@
 using Orleans.Persistence.Redis.Utils;
 using Orleans.Runtime;
 using Orleans.Storage;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Orleans.Persistence.Redis.Core
 {
diff --git a/Orleans.Persistence.Redis/Core/ValueStopwatch.cs b/Orleans.Persistence.Redis/Core/ValueStopwatch.cs
index c3c8ca7..7ad3ec4 100644
--- a/Orleans.Persistence.Redis/Core/ValueStopwatch.cs
+++ b/Orleans.Persistence.Redis/Core/ValueStopwatch.cs
@@ -1,6 +1,5 @@
 // ref: https://github.com/aspnet/Extensions/blob/master/src/Shared/src/ValueStopwatch/ValueStopwatch.cs
 
-using System;
 using System.Diagnostics;
 
 namespace Orleans.Persistence.Redis.Core
diff --git a/Orleans.Persistence.Redis/Orleans.Persistence.Redis.csproj b/Orleans.Persistence.Redis/Orleans.Persistence.Redis.csproj
index 9deec92..24e4d34 100644
--- a/Orleans.Persistence.Redis/Orleans.Persistence.Redis.csproj
+++ b/Orleans.Persistence.Redis/Orleans.Persistence.Redis.csproj
@@ -1,20 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
     <PackageId>Sucrose.Orleans.Persistence.Redis</PackageId>
     <Product>Sucrose.Orleans.Persistence.Redis</Product>
     <RepositoryUrl>https://github.com/jonathansant/Orleans.Persistence.Redis</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Brotli.NET" Version="2.1.1" />
-    <PackageReference Include="MessagePack" Version="2.1.143" />
+    <!--<PackageReference Include="Brotli.NET" Version="2.1.1" />-->
+    <PackageReference Include="MessagePack" Version="2.5.140" />
     <PackageReference Include="Microsoft.Orleans.Runtime" Version="7.2.2" />
     <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.2.2" />
-    <PackageReference Include="StackExchange.Redis" Version="2.2.62" />
+    <PackageReference Include="StackExchange.Redis" Version="2.7.17" />
     <PackageReference Include="System.Data.HashFunction.xxHash" Version="2.0.0" />
-    <PackageReference Include="ByteSize" Version="2.0.0" />
+    <PackageReference Include="ByteSize" Version="2.1.2" />
   </ItemGroup>
 
 </Project>
diff --git a/Orleans.Persistence.Redis/Serialization/BrotliSerializer.cs b/Orleans.Persistence.Redis/Serialization/BrotliSerializer.cs
index 5118b1f..a003981 100644
--- a/Orleans.Persistence.Redis/Serialization/BrotliSerializer.cs
+++ b/Orleans.Persistence.Redis/Serialization/BrotliSerializer.cs
@@ -1,7 +1,5 @@
 using Orleans.Serialization;
-using System.IO;
 using System.IO.Compression;
-using BrotliStream = Brotli.BrotliStream;
 
 namespace Orleans.Persistence.Redis.Serialization
 {
diff --git a/Orleans.Persistence.Redis/Serialization/DeflateSerializer.cs b/Orleans.Persistence.Redis/Serialization/DeflateSerializer.cs
index 318d72c..3560039 100644
--- a/Orleans.Persistence.Redis/Serialization/DeflateSerializer.cs
+++ b/Orleans.Persistence.Redis/Serialization/DeflateSerializer.cs
@@ -1,5 +1,4 @@
 using Orleans.Serialization;
-using System.IO;
 using System.IO.Compression;
 
 namespace Orleans.Persistence.Redis.Serialization
diff --git a/Orleans.Persistence.Redis/Serialization/ISerializer.cs b/Orleans.Persistence.Redis/Serialization/ISerializer.cs
index f4597a0..e44e582 100644
--- a/Orleans.Persistence.Redis/Serialization/ISerializer.cs
+++ b/Orleans.Persistence.Redis/Serialization/ISerializer.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Orleans.Persistence.Redis.Serialization
+namespace Orleans.Persistence.Redis.Serialization
 {
 	public interface IHumanReadableSerializer
 	{
diff --git a/Orleans.Persistence.Redis/Serialization/JsonSerializer.cs b/Orleans.Persistence.Redis/Serialization/JsonSerializer.cs
index f4ed2b3..ba3d053 100644
--- a/Orleans.Persistence.Redis/Serialization/JsonSerializer.cs
+++ b/Orleans.Persistence.Redis/Serialization/JsonSerializer.cs
@@ -1,6 +1,5 @@
 using Newtonsoft.Json;
 using Orleans.Persistence.Redis.Compression;
-using System;
 
 namespace Orleans.Persistence.Redis.Serialization
 {
diff --git a/Orleans.Persistence.Redis/Utils/ObjectExtensions.cs b/Orleans.Persistence.Redis/Utils/ObjectExtensions.cs
index fd5791d..cd80cdd 100644
--- a/Orleans.Persistence.Redis/Utils/ObjectExtensions.cs
+++ b/Orleans.Persistence.Redis/Utils/ObjectExtensions.cs
@@ -1,8 +1,6 @@
 using Newtonsoft.Json;
 using System.Data.HashFunction.xxHash;
-using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Orleans.Persistence.Redis.Utils
 {
diff --git a/Orleans.Persistence.Redis/Utils/ReflectionExtensions.cs b/Orleans.Persistence.Redis/Utils/ReflectionExtensions.cs
index 1da0f83..6271b7a 100644
--- a/Orleans.Persistence.Redis/Utils/ReflectionExtensions.cs
+++ b/Orleans.Persistence.Redis/Utils/ReflectionExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using System.Text;
 
 namespace Orleans.Persistence.Redis.Utils
diff --git a/Samples/RedisApp/Program.cs b/Samples/RedisApp/Program.cs
index 1b59ca4..1f095d0 100644
--- a/Samples/RedisApp/Program.cs
+++ b/Samples/RedisApp/Program.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using StackExchange.Redis;
+using StackExchange.Redis;
 
 namespace RedisApp
 {
diff --git a/Samples/RedisApp/RedisApp.csproj b/Samples/RedisApp/RedisApp.csproj
index e4508e1..46e2717 100644
--- a/Samples/RedisApp/RedisApp.csproj
+++ b/Samples/RedisApp/RedisApp.csproj
@@ -2,12 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="2.1.58" />
+    <PackageReference Include="StackExchange.Redis" Version="2.7.17" />
   </ItemGroup>
 
 </Project>
diff --git a/Samples/TestClient/Program.cs b/Samples/TestClient/Program.cs
index f327f01..9350026 100644
--- a/Samples/TestClient/Program.cs
+++ b/Samples/TestClient/Program.cs
@@ -1,13 +1,6 @@
-using Microsoft.Extensions.Logging;
-using Orleans;
-using Orleans.Configuration;
-using Orleans.Hosting;
+using Orleans.Configuration;
 using Orleans.Runtime;
-using System;
 using System.Net;
-using System.Reflection;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using TestGrains;
diff --git a/Samples/TestClient/TestClient.csproj b/Samples/TestClient/TestClient.csproj
index 60483d5..5599128 100644
--- a/Samples/TestClient/TestClient.csproj
+++ b/Samples/TestClient/TestClient.csproj
@@ -2,13 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.Orleans.Sdk" Version="7.2.2" />
   </ItemGroup>
 
diff --git a/Samples/TestGrains/ITestGrain.cs b/Samples/TestGrains/ITestGrain.cs
index cd326d6..1a04644 100644
--- a/Samples/TestGrains/ITestGrain.cs
+++ b/Samples/TestGrains/ITestGrain.cs
@@ -1,7 +1,4 @@
-using System.Threading.Tasks;
-using Orleans;
-
-namespace TestGrains
+namespace TestGrains
 {
 	public interface ITestGrain : IGrainWithStringKey
 	{
diff --git a/Samples/TestGrains/TestGrain.cs b/Samples/TestGrains/TestGrain.cs
index ffb1f8a..277e8f9 100644
--- a/Samples/TestGrains/TestGrain.cs
+++ b/Samples/TestGrains/TestGrain.cs
@@ -1,7 +1,4 @@
-using System.Threading;
-using Orleans;
-using Orleans.Providers;
-using System.Threading.Tasks;
+using Orleans.Providers;
 
 namespace TestGrains
 {
diff --git a/Samples/TestGrains/TestGrain2.cs b/Samples/TestGrains/TestGrain2.cs
index d2562af..4e73f2c 100644
--- a/Samples/TestGrains/TestGrain2.cs
+++ b/Samples/TestGrains/TestGrain2.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Threading;
-using Orleans;
-using Orleans.Providers;
-using System.Threading.Tasks;
+using Orleans.Providers;
 
 namespace TestGrains
 {
diff --git a/Samples/TestGrains/TestGrains.csproj b/Samples/TestGrains/TestGrains.csproj
index 05474df..6d6e072 100644
--- a/Samples/TestGrains/TestGrains.csproj
+++ b/Samples/TestGrains/TestGrains.csproj
@@ -1,8 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/Samples/TestSilo/Program.cs b/Samples/TestSilo/Program.cs
index eb0ac38..d355028 100644
--- a/Samples/TestSilo/Program.cs
+++ b/Samples/TestSilo/Program.cs
@@ -1,15 +1,6 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Orleans;
+using Microsoft.Extensions.Hosting;
 using Orleans.Configuration;
-using Orleans.Hosting;
-using Orleans.Persistence.Redis.Config;
-using System;
 using System.Net;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Hosting;
-using Orleans.Runtime;
 
 namespace TestSilo
 {
@@ -44,7 +35,7 @@ public static async Task Main(string[] args)
 					})
 					;
 			});
-				
+
 
 			var host = builder.Build();
 			await host.StartAsync();
diff --git a/Samples/TestSilo/TestSilo.csproj b/Samples/TestSilo/TestSilo.csproj
index e5d179d..ec9bb90 100644
--- a/Samples/TestSilo/TestSilo.csproj
+++ b/Samples/TestSilo/TestSilo.csproj
@@ -2,13 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.Orleans.Server" Version="7.2.2" />
   </ItemGroup>