diff --git a/dotnet/ComponentClassRegistry/Smbios/src/Smbios.cs b/dotnet/ComponentClassRegistry/Smbios/src/Smbios.cs
index 004fabb..a8dacc1 100644
--- a/dotnet/ComponentClassRegistry/Smbios/src/Smbios.cs
+++ b/dotnet/ComponentClassRegistry/Smbios/src/Smbios.cs
@@ -4,7 +4,7 @@
 
 namespace Smbios {
     public class Smbios {
-        public static readonly string WindowsQueryScope = @"root\\WMI";
+        public static readonly string WindowsQueryScope = $"root\\WMI";
         public static readonly string WindowsQueryString = "SELECT * FROM MSSMBios_RawSMBiosTables";
         public static readonly string LinuxPathEntryTable = "/sys/firmware/dmi/tables/smbios_entry_point";
         public static readonly string LinuxPathStructures = "/sys/firmware/dmi/tables/DMI";
@@ -167,8 +167,7 @@ private static void GetSmbiosWindows(out int majorVersion, out int minorVersion,
             }
 
             ManagementObjectCollection collection;
-            using (ManagementObjectSearcher searcher = new ManagementObjectSearcher("root\\WMI", "SELECT * FROM MSSMBios_RawSMBiosTables")) {
-                //using (ManagementObjectSearcher searcher = new(WindowsQueryScope, WindowsQueryString)) {
+            using (ManagementObjectSearcher searcher = new(WindowsQueryScope, WindowsQueryString)) {
                 collection = searcher.Get();
             }
 
diff --git a/dotnet/ComponentClassRegistry/SmbiosCli/src/Program.cs b/dotnet/ComponentClassRegistry/SmbiosCli/src/Program.cs
index 694c955..3a7a1a7 100644
--- a/dotnet/ComponentClassRegistry/SmbiosCli/src/Program.cs
+++ b/dotnet/ComponentClassRegistry/SmbiosCli/src/Program.cs
@@ -6,10 +6,6 @@
 namespace SmbiosCli;
 public class SmbiosCli {
     public static int Main(string[] args) {
-        int returnCode = (int)ClientExitCodes.SUCCESS;
-
-        Version? version = Assembly.GetExecutingAssembly().GetName().Version;
-
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) {
             // Linux requires sudo
             int result = CliOptions.IsUserPrivileged();
@@ -39,6 +35,6 @@ public static int Main(string[] args) {
             Console.WriteLine(plugin.ManifestV3.ToString());
         }
 
-        return returnCode;
+        return (int)ClientExitCodes.SUCCESS;
     }
 }
\ No newline at end of file