diff --git a/Ryujinx.Graphics.Shader/Decoders/OpCodeDepbar.cs b/Ryujinx.Graphics.Shader/Decoders/OpCodeDepbar.cs
deleted file mode 100644
index 7dc2dbd414..0000000000
--- a/Ryujinx.Graphics.Shader/Decoders/OpCodeDepbar.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Ryujinx.Graphics.Shader.Instructions;
-
-namespace Ryujinx.Graphics.Shader.Decoders
-{
-    class OpCodeDepbar : OpCode
-    {
-        public OpCodeDepbar(InstEmitter emitter, ulong address, long opCode) : base(emitter, address, opCode) {}
-    }
-}
diff --git a/Ryujinx.Graphics.Shader/Decoders/OpCodeNop.cs b/Ryujinx.Graphics.Shader/Decoders/OpCodeNop.cs
deleted file mode 100644
index 2ee7c2cebf..0000000000
--- a/Ryujinx.Graphics.Shader/Decoders/OpCodeNop.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Ryujinx.Graphics.Shader.Instructions;
-
-namespace Ryujinx.Graphics.Shader.Decoders
-{
-    class OpCodeNop : OpCode
-    {
-        public OpCodeNop(InstEmitter emitter, ulong address, long opCode) : base(emitter, address, opCode) {}
-    }
-}
diff --git a/Ryujinx.Graphics.Shader/Decoders/OpCodeTable.cs b/Ryujinx.Graphics.Shader/Decoders/OpCodeTable.cs
index 7897ce24e1..97e4a3301d 100644
--- a/Ryujinx.Graphics.Shader/Decoders/OpCodeTable.cs
+++ b/Ryujinx.Graphics.Shader/Decoders/OpCodeTable.cs
@@ -48,7 +48,7 @@ namespace Ryujinx.Graphics.Shader.Decoders
             Set("0100110001110x", InstEmit.Dadd,    typeof(OpCodeFArithCbuf));
             Set("0011100x01110x", InstEmit.Dadd,    typeof(OpCodeDArithImm));
             Set("0101110001110x", InstEmit.Dadd,    typeof(OpCodeFArithReg));
-            Set("1111000011110x", InstEmit.Depbar,  typeof(OpCodeDepbar));
+            Set("1111000011110x", InstEmit.Depbar,  typeof(OpCode));
             Set("010010110111xx", InstEmit.Dfma,    typeof(OpCodeFArithCbuf));
             Set("0011011x0111xx", InstEmit.Dfma,    typeof(OpCodeDArithImm));
             Set("010100110111xx", InstEmit.Dfma,    typeof(OpCodeFArithRegCbuf));
@@ -162,7 +162,7 @@ namespace Ryujinx.Graphics.Shader.Decoders
             Set("000000010000xx", InstEmit.Mov,     typeof(OpCodeAluImm32));
             Set("0101110010011x", InstEmit.Mov,     typeof(OpCodeAluReg));
             Set("0101000010000x", InstEmit.Mufu,    typeof(OpCodeFArith));
-            Set("1010000101100x", InstEmit.Nop,     typeof(OpCodeNop));
+            Set("1010000101100x", InstEmit.Nop,     typeof(OpCode));
             Set("1111101111100x", InstEmit.Out,     typeof(OpCode));
             Set("111000101010xx", InstEmit.Pbk,     typeof(OpCodePush));
             Set("0100110000001x", InstEmit.Popc,    typeof(OpCodeAluCbuf));