diff --git a/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs b/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs
index 8a4bbc2f5c..5e78d1f66f 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs
@@ -48,11 +48,6 @@ namespace Ryujinx.HLE.HOS.Services.Nv
             _owner = null;
         }
 
-        static INvDrvServices()
-        {
-            // TODO: dynamically generate _channelRegistry with attribute
-        }
-
         private int Open(ServiceCtx context, string path)
         {
             if (context.Process == _owner)
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvDeviceAttribute.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvDeviceAttribute.cs
deleted file mode 100644
index fadf6fe6bf..0000000000
--- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvDeviceAttribute.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices
-{
-    class NvDeviceAttribute : Attribute
-    {
-        public readonly string Path;
-
-        public NvDeviceAttribute(string path) => Path = path;
-    }
-}
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuFileDevice.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuFileDevice.cs
index fd970ace31..34fb1d4281 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuFileDevice.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostAsGpu/NvHostAsGpuFileDevice.cs
@@ -316,7 +316,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostAsGpu
 
         public override void Close()
         {
-            // TODO
+
         }
 
         public static AddressSpaceContext GetAddressSpaceContext(KProcess process)
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/NvHostChannelFileDevice.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/NvHostChannelFileDevice.cs
index 49a4190109..1e2060c0b6 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/NvHostChannelFileDevice.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostChannel/NvHostChannelFileDevice.cs
@@ -345,7 +345,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostChannel
 
         public override void Close()
         {
-            // TODO
+
         }
     }
 }
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrl/NvHostCtrlFileDevice.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrl/NvHostCtrlFileDevice.cs
index f872a64ec1..72f9d91e5a 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrl/NvHostCtrlFileDevice.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrl/NvHostCtrlFileDevice.cs
@@ -374,7 +374,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrl
 
         public override void Close()
         {
-            // TODO
+
         }
     }
 }
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/NvHostCtrlGpuFileDevice.cs b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/NvHostCtrlGpuFileDevice.cs
index 42ceccde9d..fac2f9394a 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/NvHostCtrlGpuFileDevice.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvHostCtrlGpu/NvHostCtrlGpuFileDevice.cs
@@ -78,7 +78,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvHostCtrlGpu
 
         public override void Close()
         {
-            // TODO
+
         }
 
         private NvInternalResult ZcullGetCtxSize(ref ZcullGetCtxSizeArguments arguments)