diff --git a/src/iss/arch/riscv_hart_m_p.h b/src/iss/arch/riscv_hart_m_p.h
index c0d5805..0652bd6 100644
--- a/src/iss/arch/riscv_hart_m_p.h
+++ b/src/iss/arch/riscv_hart_m_p.h
@@ -419,10 +419,10 @@ riscv_hart_m_p::riscv_hart_m_p(feature_config cfg)
csr_wr_cb[mxnti] = &this_class::write_csr_reg;
csr_rd_cb[mintstatus] = &this_class::read_csr_reg;
csr_wr_cb[mintstatus] = &this_class::write_null;
- csr_rd_cb[mscratchcsw] = &this_class::read_csr_reg;
- csr_wr_cb[mscratchcsw] = &this_class::write_csr_reg;
- csr_rd_cb[mscratchcswl] = &this_class::read_csr_reg;
- csr_wr_cb[mscratchcswl] = &this_class::write_csr_reg;
+// csr_rd_cb[mscratchcsw] = &this_class::read_csr_reg;
+// csr_wr_cb[mscratchcsw] = &this_class::write_csr_reg;
+// csr_rd_cb[mscratchcswl] = &this_class::read_csr_reg;
+// csr_wr_cb[mscratchcswl] = &this_class::write_csr_reg;
csr_rd_cb[mintthresh] = &this_class::read_csr_reg;
csr_wr_cb[mintthresh] = &this_class::write_intthresh;
diff --git a/src/iss/arch/riscv_hart_mu_p.h b/src/iss/arch/riscv_hart_mu_p.h
index d4032c3..1ca4f96 100644
--- a/src/iss/arch/riscv_hart_mu_p.h
+++ b/src/iss/arch/riscv_hart_mu_p.h
@@ -466,10 +466,10 @@ riscv_hart_mu_p::riscv_hart_mu_p(feature_config cfg)
csr_wr_cb[mxnti] = &this_class::write_csr_reg;
csr_rd_cb[mintstatus] = &this_class::read_csr_reg;
csr_wr_cb[mintstatus] = &this_class::write_null;
- csr_rd_cb[mscratchcsw] = &this_class::read_csr_reg;
- csr_wr_cb[mscratchcsw] = &this_class::write_csr_reg;
- csr_rd_cb[mscratchcswl] = &this_class::read_csr_reg;
- csr_wr_cb[mscratchcswl] = &this_class::write_csr_reg;
+// csr_rd_cb[mscratchcsw] = &this_class::read_csr_reg;
+// csr_wr_cb[mscratchcsw] = &this_class::write_csr_reg;
+// csr_rd_cb[mscratchcswl] = &this_class::read_csr_reg;
+// csr_wr_cb[mscratchcswl] = &this_class::write_csr_reg;
csr_rd_cb[mintthresh] = &this_class::read_csr_reg;
csr_wr_cb[mintthresh] = &this_class::write_intthresh;