diff --git a/config/rv32gc/coverage.svh b/config/rv32gc/coverage.svh
index 4b23573e1..93be70707 100644
--- a/config/rv32gc/coverage.svh
+++ b/config/rv32gc/coverage.svh
@@ -8,10 +8,6 @@
 // Define XLEN, used in covergroups
 `define XLEN32 1
 
-// Define relevant addresses
-`define CLINT_BASE 64'h02000000
-`define ACCESS_FAULT_ADDRESS 32'h0000
-
 // Unprivileged extensions
 `include "RV32I_coverage.svh"
 `include "RV32M_coverage.svh"
@@ -41,4 +37,3 @@
 `include "ZicsrU_coverage.svh"
 `include "RV32VM_coverage.svh"
 `include "RV32VM_PMP_coverage.svh"
-`include "ExceptionM_coverage.svh"
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index 1756ec6a4..057e79898 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -8,10 +8,6 @@
 // Define XLEN, used in covergroups
 `define XLEN64 1
 
-// Define relevant addresses
-`define CLINT_BASE 64'h02000000
-`define ACCESS_FAULT_ADDRESS 64'h00000000
-
 // Unprivileged extensions
 `include "RV64I_coverage.svh"
 `include "RV64M_coverage.svh"
@@ -40,7 +36,6 @@
 `include "ZicsrM_coverage.svh"
 `include "ZicsrF_coverage.svh"
 `include "ZicsrU_coverage.svh"
-`include "ExceptionM_coverage.svh"
 // `include "RV64VM_PMP_coverage.svh"
 // `include "RV64CBO_VM_coverage.svh"
 // `include "RV64CBO_PMP_coverage.svh"