diff --git a/src/rocprof_compute_soc/analysis_configs/gfx906/1000_compute-unit-instruction-mix.yaml b/src/rocprof_compute_soc/analysis_configs/gfx906/1000_compute-unit-instruction-mix.yaml
index 48499d3579..fc48a05878 100644
--- a/src/rocprof_compute_soc/analysis_configs/gfx906/1000_compute-unit-instruction-mix.yaml
+++ b/src/rocprof_compute_soc/analysis_configs/gfx906/1000_compute-unit-instruction-mix.yaml
@@ -218,12 +218,6 @@ Panel Config:
             max: MAX((TA_BUFFER_WAVEFRONTS_sum / $denom))
             unit: (instr + $normUnit)
             tips:
-          Spill/Stack Coalesceable Instr:
-            avg: None # No perf counter
-            min: None # No perf counter
-            max: None # No perf counter
-            unit: (instr + $normUnit)
-            tips:
           Spill/Stack Read:
             avg: AVG((TA_BUFFER_READ_WAVEFRONTS_sum / $denom))
             min: MIN((TA_BUFFER_READ_WAVEFRONTS_sum / $denom))
@@ -290,10 +284,10 @@ Panel Config:
             max: None # No HW module
             unit: (instr + $normUnit)
             tips:
-          # TODO: Fix baseline comparision logic to handle non existent metrics, then 
+          # TODO: Fix baseline comparision logic to handle non existent metrics, then
           MFMA-F6F4:
             avg: None
             min: None
             max: None
             unit: (instr + $normUnit)
-            tips:
\ No newline at end of file
+            tips:
diff --git a/src/rocprof_compute_soc/analysis_configs/gfx940/1000_compute-unit-instruction-mix.yaml b/src/rocprof_compute_soc/analysis_configs/gfx940/1000_compute-unit-instruction-mix.yaml
index 96ed523023..12bbd3fc5e 100644
--- a/src/rocprof_compute_soc/analysis_configs/gfx940/1000_compute-unit-instruction-mix.yaml
+++ b/src/rocprof_compute_soc/analysis_configs/gfx940/1000_compute-unit-instruction-mix.yaml
@@ -281,11 +281,9 @@ Panel Config:
             min: MIN((SQ_INSTS_VALU_MFMA_F64 / $denom))
             max: MAX((SQ_INSTS_VALU_MFMA_F64 / $denom))
             unit: (instr + $normUnit)
-          # TODO: Fix baseline comparision logic to handle non existent metrics, then 
           MFMA-F6F4:
             avg: None
             min: None
             max: None
             unit: (instr + $normUnit)
             tips:
-            tips:
diff --git a/src/rocprof_compute_soc/analysis_configs/gfx950/1700_L2_cache.yaml b/src/rocprof_compute_soc/analysis_configs/gfx950/1700_L2_cache.yaml
index c6e5479d36..154f2c47f5 100644
--- a/src/rocprof_compute_soc/analysis_configs/gfx950/1700_L2_cache.yaml
+++ b/src/rocprof_compute_soc/analysis_configs/gfx950/1700_L2_cache.yaml
@@ -52,15 +52,6 @@ Panel Config:
           unit: Unit
           tips: Tips
         metric:
-          Read BW:
-            avg: AVG((((TCC_EA0_RDREQ_32B_sum * 32) + ((TCC_EA0_RDREQ_sum - TCC_EA0_RDREQ_32B_sum)
-              * 64)) / $denom))
-            min: MIN((((TCC_EA0_RDREQ_32B_sum * 32) + ((TCC_EA0_RDREQ_sum - TCC_EA0_RDREQ_32B_sum)
-              * 64)) / $denom))
-            max: MAX((((TCC_EA0_RDREQ_32B_sum * 32) + ((TCC_EA0_RDREQ_sum - TCC_EA0_RDREQ_32B_sum)
-              * 64)) / $denom))
-            unit: (Bytes  + $normUnit)
-            tips:
           Read BW:
             avg: AVG((((TCC_EA0_RDREQ_32B_sum * 32) + (TCC_EA0_RDREQ_64B_sum * 64) + (TCC_EA0_RDREQ_128B_sum * 128)) / $denom))
             min: MIN((((TCC_EA0_RDREQ_32B_sum * 32) + (TCC_EA0_RDREQ_64B_sum * 64) + (TCC_EA0_RDREQ_128B_sum * 128)) / $denom))