diff --git a/opcodes/04_SETHEX.v b/opcodes/04_SETHEX.v
index bebdc15..be9f7f5 100644
--- a/opcodes/04_SETHEX.v
+++ b/opcodes/04_SETHEX.v
@@ -6,10 +6,8 @@
 
 `include "decstates.v"
 
-//`DEC_SETHEX: 
 begin
     hex_dec <= `MODE_HEX;
-//    execute_cycle <= 0;
     decstate <= `DEC_START;
 `ifdef SIM
     $display("%05h SETHEX", inst_start_PC);
diff --git a/opcodes/05_SETDEC.v b/opcodes/05_SETDEC.v
index 2c2b59a..b5076ab 100644
--- a/opcodes/05_SETDEC.v
+++ b/opcodes/05_SETDEC.v
@@ -7,9 +7,8 @@
 
 `include "decstates.v"
 
-`DEC_SETDEC: begin
+begin
     hex_dec <= `MODE_DEC;
-    execute_cycle <= 0;
     decstate <= `DEC_START;
 `ifdef SIM
     $display("%05h SETDEC", inst_start_PC);
diff --git a/opcodes/0x.v b/opcodes/0x.v
index 8b3e873..4544409 100644
--- a/opcodes/0x.v
+++ b/opcodes/0x.v
@@ -8,17 +8,10 @@
 	case (nibble)
 	4'h3:
 `include "opcodes/03_RTNCC.v"
-		// execute_cycle <= 1;
-		// decstate <= `DEC_RTNCC;
-	4'h4: begin 
+	4'h4:
 `include "opcodes/04_SETHEX.v"
-		// execute_cycle <= 1;
-		// decstate <= `DEC_SETHEX;
-	end
-	4'h5: begin
-		execute_cycle <= 1;
-		decstate <= `DEC_SETDEC;
-	end
+	4'h5:
+`include "opcodes/05_SETDEC.v"
 	default: begin
         $display("ERROR : DEC_0X");
         decode_error <= 1;
diff --git a/saturn_core.v b/saturn_core.v
index c9e65cb..458ae2e 100644
--- a/saturn_core.v
+++ b/saturn_core.v
@@ -327,9 +327,6 @@ always @(posedge dec_strobe) begin
 		endcase
 	end
 `include "opcodes/0x.v"
-// `include "opcodes/03_RTNCC.v"
-//`include "opcodes/04_SETHEX.v"
-`include "opcodes/05_SETDEC.v"
 `include "opcodes/2n_P_EQ_n.v"
 `include "opcodes/3n[x...]_LC.v"
 `include "opcodes/6xxx_GOTO.v"