diff --git a/rtl/serv_decode.v b/rtl/serv_decode.v
index dfd4123..f5846ee 100644
--- a/rtl/serv_decode.v
+++ b/rtl/serv_decode.v
@@ -52,8 +52,6 @@ module serv_decode
    output wire 	     o_rd_csr_en,
    output wire 	     o_rd_alu_en);
 
-`include "serv_params.vh"
-
    reg [4:0] opcode;
    reg [2:0] funct3;
    reg 	      op20;
diff --git a/rtl/serv_params.vh b/rtl/serv_params.vh
deleted file mode 100644
index d28b172..0000000
--- a/rtl/serv_params.vh
+++ /dev/null
@@ -1,5 +0,0 @@
-localparam [1:0]
-  CSR_MSCRATCH = 2'b00,
-  CSR_MTVEC    = 2'b01,
-  CSR_MEPC     = 2'b10,
-  CSR_MTVAL    = 2'b11;
diff --git a/rtl/serv_rf_if.v b/rtl/serv_rf_if.v
index 2462af5..cff08bb 100644
--- a/rtl/serv_rf_if.v
+++ b/rtl/serv_rf_if.v
@@ -45,8 +45,6 @@ module serv_rf_if
    output wire 		      o_rs2);
 
 
-`include "serv_params.vh"
-
    /*
     ********** Write side ***********
     */
@@ -65,14 +63,19 @@ module serv_rf_if
    assign 	     o_wdata0 = i_trap ? mtval  : rd;
    assign	     o_wdata1 = i_trap ? i_mepc : i_csr;
 
-   //port 0 rd mtval
-   //port 1 csr mepc
-   //mepc  100010
-   //mtval 100011
-   //csr   1000xx
-   //rd    0xxxxx
-   assign o_wreg0 = i_trap ? {4'b1000,CSR_MTVAL} : {1'b0,i_rd_waddr};
-   assign o_wreg1 = i_trap ? {4'b1000,CSR_MEPC}  : {4'b1000,i_csr_addr};
+   /* Port 0 handles writes to mtval during traps and rd otherwise
+    * Port 1 handles writes to mepc during traps and csr accesses otherwise
+    *
+    * GPR registers are mapped to address 0-31 (bits 0xxxxx).
+    * Following that are four CSR registers
+    * mscratch 100000
+    * mtvec    100001
+    * mepc     100010
+    * mtval    100011
+    */
+
+   assign o_wreg0 = i_trap ? {6'b100011} : {1'b0,i_rd_waddr};
+   assign o_wreg1 = i_trap ? {6'b100010} : {4'b1000,i_csr_addr};
 
    assign       o_wen0 = i_cnt_en & (i_trap | rd_wen);
    assign       o_wen1 = i_cnt_en & (i_trap | i_csr_en);
diff --git a/serv.core b/serv.core
index 264da94..4d34e60 100644
--- a/serv.core
+++ b/serv.core
@@ -6,7 +6,6 @@ filesets:
   core:
     files:
       - "tool_verilator? (data/verilator_waiver.vlt)" : {file_type: vlt}
-      - rtl/serv_params.vh : {is_include_file : true}
       - rtl/serv_bufreg.v
       - rtl/serv_alu.v
       - rtl/serv_csr.v