diff --git a/mRemoteNG/Tools/WindowsRegistry/IRegistry.cs b/mRemoteNG/Tools/WindowsRegistry/IRegistry.cs
index a6e69061..77b0c799 100644
--- a/mRemoteNG/Tools/WindowsRegistry/IRegistry.cs
+++ b/mRemoteNG/Tools/WindowsRegistry/IRegistry.cs
@@ -1,5 +1,4 @@
 using Microsoft.Win32;
-using System;
 using System.Collections.Generic;
 using System.Runtime.Versioning;
 
diff --git a/mRemoteNG/Tools/WindowsRegistry/IRegistryWrite.cs b/mRemoteNG/Tools/WindowsRegistry/IRegistryWrite.cs
index 0e46e449..0d938532 100644
--- a/mRemoteNG/Tools/WindowsRegistry/IRegistryWrite.cs
+++ b/mRemoteNG/Tools/WindowsRegistry/IRegistryWrite.cs
@@ -1,5 +1,4 @@
 using Microsoft.Win32;
-using System;
 using System.Runtime.Versioning;
 
 namespace mRemoteNG.Tools.WindowsRegistry
diff --git a/mRemoteNG/Tools/WindowsRegistry/WindowsRegistry.cs b/mRemoteNG/Tools/WindowsRegistry/WindowsRegistry.cs
index 53025028..f0dc353a 100644
--- a/mRemoteNG/Tools/WindowsRegistry/WindowsRegistry.cs
+++ b/mRemoteNG/Tools/WindowsRegistry/WindowsRegistry.cs
@@ -1,7 +1,4 @@
-using Amazon.EC2.Model;
-using Google.Protobuf.WellKnownTypes;
-using Microsoft.Win32;
-using MySqlX.XDevAPI.Common;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -12,7 +9,7 @@ using System.Security;
 namespace mRemoteNG.Tools.WindowsRegistry
 {
     /// <summary>
-    /// This class implements the IRegistryRead and IRegistryWrite interfaces and provides methods for interacting with the Windows Registry.
+    /// This class interacting with the Windows Registry.
     /// </summary>
     [SupportedOSPlatform("windows")]
     public class WindowsRegistry : IRegistry, IRegistryRead, IRegistryWrite
diff --git a/mRemoteNG/Tools/WindowsRegistry/WindowsRegistryKey.cs b/mRemoteNG/Tools/WindowsRegistry/WindowsRegistryKey.cs
index cc06b688..474cd026 100644
--- a/mRemoteNG/Tools/WindowsRegistry/WindowsRegistryKey.cs
+++ b/mRemoteNG/Tools/WindowsRegistry/WindowsRegistryKey.cs
@@ -111,12 +111,10 @@ namespace mRemoteNG.Tools.WindowsRegistry
         /// - The registry value type is set
         /// - The key path is set
         /// - The value name is set
-        /// - The value data is set
         /// </summary>
         /// <returns>Returns true if the key is write-ready, otherwise false.</returns>
         public bool IsKeyWritable() {
             return (IsHiveSet() && IsValueKindSet() && IsPathSet() && IsNameSet());
-            //return (IsHiveSet() && IsValueKindSet() && IsPathSet() && IsNameSet() && IsValueSet());
         }
         #endregion
 
diff --git a/mRemoteNGTests/Tools/Registry/WindowsRegistryTests.cs b/mRemoteNGTests/Tools/Registry/WindowsRegistryTests.cs
index 67d7a6f5..7007de7a 100644
--- a/mRemoteNGTests/Tools/Registry/WindowsRegistryTests.cs
+++ b/mRemoteNGTests/Tools/Registry/WindowsRegistryTests.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Win32;
 using mRemoteNG.Tools.WindowsRegistry;
-using MySqlX.XDevAPI.Common;
-using NSubstitute.ExceptionExtensions;
 using NUnit.Framework;
 
 namespace mRemoteNGTests.Tools.Registry