diff --git a/src/core/metrics.h b/src/core/metrics.h
index 566f45a58f..9582fefaf9 100644
--- a/src/core/metrics.h
+++ b/src/core/metrics.h
@@ -155,7 +155,6 @@ class MetricsDict {
   MetricsDict(const util::AgentInfo* agent_info) : xml_(NULL), agent_info_(agent_info) {
     const char* xml_name = getenv("ROCP_METRICS");
     if (xml_name != NULL) {
-      //std::cout << "ROCProfiler: importing '" << xml_name << "':" << std::endl;
       xml_ = xml::Xml::Create(xml_name);
       if (xml_ == NULL) EXC_RAISING(HSA_STATUS_ERROR, "metrics .xml open error '" << xml_name << "'");
       xml_->AddConst("top.const.metric", "MAX_WAVE_SIZE", agent_info->max_wave_size);
@@ -187,8 +186,6 @@ class MetricsDict {
   void ImportMetrics(const util::AgentInfo* agent_info, const std::string& scope) {
     auto metrics_list = xml_->GetNodes("top." + scope + ".metric");
     if (!metrics_list.empty()) {
-      //std::cout << "  " << metrics_list.size() << " " << scope << " metrics found" << std::endl;
-
       for (auto node : metrics_list) {
         const std::string name = node->opts["name"];
         const std::string expr_str = node->opts["expr"];
@@ -245,13 +242,6 @@ class MetricsDict {
       metric = new BaseMetric(name, counter);
       ret.first->second = metric;
     } else EXC_RAISING(HSA_STATUS_ERROR, "metric redefined '" << name << "'");
-#if 0
-    if (alias != name) {
-      if (cache_.find(alias) != cache_.end()) EXC_RAISING(HSA_STATUS_ERROR, "metric alias/name interference '" << alias << "'");
-      const auto ret = aliases_.insert({alias, name});
-      if (!ret.second) EXC_RAISING(HSA_STATUS_ERROR, "metric alias redefined '" << alias << "'");
-    }
-#endif
     return metric;
   }
 
@@ -265,13 +255,6 @@ class MetricsDict {
     return metric;
   }
 
-#if 0
-  std::string UnAlias(const std::string& name) const {
-    auto it = aliases_.find(name);
-    return (it != aliases_.end()) ? it->second : name;
-  }
-#endif
-
   void Print() {
     for (auto& v : cache_) {
       const Metric* metric = v.second;
@@ -287,9 +270,6 @@ class MetricsDict {
   xml::Xml* xml_;
   const util::AgentInfo* agent_info_;
   cache_t cache_;
-#if 0
-  std::map<std::string, std::string> aliases_;
-#endif
 
   static map_t* map_;
   static mutex_t mutex_;
diff --git a/test/tool/gfx_metrics.xml b/test/tool/gfx_metrics.xml
index ce949f851e..899ca85e72 100644
--- a/test/tool/gfx_metrics.xml
+++ b/test/tool/gfx_metrics.xml
@@ -2,9 +2,7 @@
   <metric name=GRBM_COUNT block=GRBM event=0 ></metric>
   <metric name=GRBM_GUI_ACTIVE block=GRBM event=2 ></metric>
 
-  <metric name=SQ_CYCLES block=SQ event=2 ></metric>
   <metric name=SQ_WAVES block=SQ event=4 ></metric>
-  <metric name=SQ_ITEMS block=SQ event=14 ></metric>
   <metric name=SQ_INSTS_VALU block=SQ event=26 ></metric>
   <metric name=SQ_INSTS_VMEM_WR block=SQ event=27 ></metric>
   <metric name=SQ_INSTS_VMEM_RD block=SQ event=28 ></metric>
@@ -14,28 +12,20 @@
   <metric name=SQ_INSTS_FLAT_LDS_ONLY block=SQ event=33 ></metric>
   <metric name=SQ_INSTS_LDS block=SQ event=34 ></metric>
   <metric name=SQ_INSTS_GDS block=SQ event=35 ></metric>
-  <metric name=SQ_WAVE_READY block=SQ event=47 ></metric>
 
   <metric name=SQ_WAIT_INST_LDS block=SQ event=61 descr="Number of wave-cycles spent waiting for LDS instruction issue. In units of 4 cycles. (per-simd, nondeterministic)"></metric>
   <metric name=SQ_ACTIVE_INST_VALU block=SQ event=69 descr="Number of cycles the SQ instruction arbiter is working on a VALU instruction. (per-simd, nondeterministic)"></metric>
   <metric name=SQ_INST_CYCLES_SALU block=SQ event=86 descr="Number of cycles needed to execute non-memory read scalar operations. (per-simd, emulated)"></metric>
   <metric name=SQ_THREAD_CYCLES_VALU block=SQ event=89 descr="Number of thread-cycles used to execute VALU operations (similar to INST_CYCLES_VALU but multiplied by # of active threads). (per-simd)"></metric>
-  <metric name=SQ_THREAD_CYCLES_VALU_MAX block=SQ event=90 descr="Maximum number of thread-cycles VALU operations that could have been executed given the instruction mix (similar to INST_CYCLES_VALU but multiplied by # of active threads). (per-simd, emulated)"></metric>
   <metric name=SQ_LDS_BANK_CONFLICT block=SQ event=97 descr="Number of cycles LDS is stalled by bank conflicts. (emulated)"></metric>
 
   <metric name=TA_TA_BUSY block=TA event=15 ></metric>
   <metric name=TA_FLAT_READ_WAVEFRONTS block=TA event=101 ></metric>
   <metric name=TA_FLAT_WRITE_WAVEFRONTS block=TA event=102 ></metric>
 
-  <metric name=TCC_CYCLE block=TCC event=1 ></metric>
-  <metric name=TCC_REQ block=TCC event=3 ></metric>
   <metric name=TCC_HIT block=TCC event=18 ></metric>
   <metric name=TCC_MISS block=TCC event=19 ></metric>
-  <metric name=TCC_WRITEBACK block=TCC event=22 ></metric>
-  <metric name=TCC_EA_WRREQ block=TCC event=26 ></metric>
-  <metric name=TCC_EA_WRREQ_64B block=TCC event=27 ></metric>
-  <metric name=TCC_EA_WRREQ_STALL block=TCC event=30 ></metric>
-  <metric name=TCC_MC_RDREQ block=TCC event=35 ></metric>
+  <metric name="TCC_MC_RDREQ" block=TCC event=35 ></metric>
   <metric name="TCC_MC_WRREQ" block=TCC event=26 descr="Number of 32-byte transactions going over the TC_MC_wrreq interface. Atomics may travel over the same interface and are generally classified as write requests."></metric>
   <metric name="TCC_MC_WRREQ_STALL" block=TCC event=28 descr="Number of cycles a write request was stalled."></metric>
 
@@ -46,9 +36,7 @@
   <metric name=GRBM_COUNT block=GRBM event=0 ></metric>
   <metric name=GRBM_GUI_ACTIVE block=GRBM event=2 ></metric>
 
-  <metric name=SQ_CYCLES block=SQ event=2 ></metric>
   <metric name=SQ_WAVES block=SQ event=4 ></metric>
-  <metric name=SQ_ITEMS block=SQ event=14 ></metric>
   <metric name=SQ_INSTS_VALU block=SQ event=26 ></metric>
   <metric name=SQ_INSTS_VMEM_WR block=SQ event=27 ></metric>
   <metric name=SQ_INSTS_VMEM_RD block=SQ event=28 ></metric>
@@ -58,24 +46,19 @@
   <metric name=SQ_INSTS_FLAT_LDS_ONLY block=SQ event=33 ></metric>
   <metric name=SQ_INSTS_LDS block=SQ event=34 ></metric>
   <metric name=SQ_INSTS_GDS block=SQ event=35 ></metric>
-  <metric name=SQ_WAVE_READY block=SQ event=47 ></metric>
 
   <metric name=SQ_WAIT_INST_LDS block=SQ event=63 descr="Number of wave-cycles spent waiting for LDS instruction issue. In units of 4 cycles. (per-simd, nondeterministic)"></metric>
   <metric name=SQ_ACTIVE_INST_VALU block=SQ event=71 descr="regspec 71? Number of cycles the SQ instruction arbiter is working on a VALU instruction. (per-simd, nondeterministic)"></metric>
   <metric name=SQ_INST_CYCLES_SALU block=SQ event=84 descr="Number of cycles needed to execute non-memory read scalar operations. (per-simd, emulated)"></metric>
   <metric name=SQ_THREAD_CYCLES_VALU block=SQ event=85 descr="Number of thread-cycles used to execute VALU operations (similar to INST_CYCLES_VALU but multiplied by # of active threads). (per-simd)"></metric>
-  <metric name=SQ_THREAD_CYCLES_VALU_MAX block=SQ event=86 descr="Maximum number of thread-cycles VALU operations that could have been executed given the instruction mix (similar to INST_CYCLES_VALU but multiplied by # of active threads). (per-simd, emulated)"></metric>
   <metric name=SQ_LDS_BANK_CONFLICT block=SQ event=93 descr="Number of cycles LDS is stalled by bank conflicts. (emulated)"></metric>
 
   <metric name=TA_TA_BUSY block=TA event=15 ></metric>
   <metric name=TA_FLAT_READ_WAVEFRONTS block=TA event=101 ></metric>
   <metric name=TA_FLAT_WRITE_WAVEFRONTS block=TA event=102 ></metric>
 
-  <metric name=TCC_CYCLE block=TCC event=1 ></metric>
-  <metric name=TCC_REQ block=TCC event=3 ></metric>
   <metric name=TCC_HIT block=TCC event=20 ></metric>
   <metric name=TCC_MISS block=TCC event=22 ></metric>
-  <metric name=TCC_WRITEBACK block=TCC event=25 ></metric>
   <metric name=TCC_EA_WRREQ block=TCC event=29 ></metric>
   <metric name=TCC_EA_WRREQ_64B block=TCC event=30 ></metric>
   <metric name=TCC_EA_WRREQ_STALL block=TCC event=33 ></metric>
diff --git a/test/tool/input.xml b/test/tool/input.xml
index cd22e03e50..b49513cfa9 100644
--- a/test/tool/input.xml
+++ b/test/tool/input.xml
@@ -10,7 +10,7 @@
 
 # List of metrics
 <metric
-  name=SQ:4,SQ_CYCLES,SQ_WAVES,SQ_INSTS_SMEM,SQ_INSTS_VALU,TA_FLAT_WRITE_WAVEFRONTS[0],TA_FLAT_WRITE_WAVEFRONTS[1],GPUBusy,VALUBusy,SALUBusy,MemUnitBusy,SFetchInsts,FetchSize,VWriteInsts,WriteSize
+  name=SQ:4,SQ_WAVES,SQ_INSTS_SMEM,SQ_INSTS_VALU,TA_FLAT_WRITE_WAVEFRONTS[0],TA_FLAT_WRITE_WAVEFRONTS[1],GPUBusy,VALUBusy,SALUBusy,MemUnitBusy,SFetchInsts,FetchSize,VWriteInsts,WriteSize
 ></metric>
 
 # SQTT trace with parameters