diff --git a/src/caliper/controllers/controllers.cpp b/src/caliper/controllers/controllers.cpp
index 844e59c5..0a8a1312 100644
--- a/src/caliper/controllers/controllers.cpp
+++ b/src/caliper/controllers/controllers.cpp
@@ -1260,90 +1260,6 @@ const char* builtin_papi_skl_option_specs = R"json(
    ]
   }
  ]
-},
-{
- "name"        : "topdown-counters.toplevel",
- "description" : "Raw counter values for Intel top-down analysis (top level)",
- "type"        : "bool",
- "category"    : "metric",
- "services"    : [ "papi" ],
- "config"      :
- {
-   "CALI_PAPI_COUNTERS":
-     "IDQ_UOPS_NOT_DELIVERED:CORE,UOPS_ISSUED:ANY,UOPS_RETIRED:RETIRE_SLOTS,INT_MISC:RECOVERY_CYCLES,CPU_CLK_UNHALTED:THREAD",
-   "CALI_PAPI_ENABLE_MULTIPLEXING": "true"
- },
- "query"  :
- [
-  { "level": "local", "select":
-   [
-    "inclusive_sum(sum#IDQ_UOPS_NOT_DELIVERED:CORE) as idq_uops_not_delivered",
-    "inclusive_sum(sum#UOPS_ISSUED:ANY) as uops_issued",
-    "inclusive_sum(sum#UOPS_RETIRED:RETIRE_SLOTS) as uops_retired_retire_slots",
-    "inclusive_sum(sum#INT_MISC:RECOVERY_CYCLES) as int_misc_recovery_cycles",
-    "inclusive_sum(sum#CPU_CLK_UNHALTED:THREAD) as cpu_clock_unhalted_thread"
-   ]
-  },
-  { "level": "cross", "select":
-   [
-    "sum(inclusive#sum#IDQ_UOPS_NOT_DELIVERED:CORE) as idq_uops_not_delivered",
-    "sum(inclusive#sum#UOPS_ISSUED:ANY) as uops_issued",
-    "sum(inclusive#sum#UOPS_RETIRED:RETIRE_SLOTS) as uops_retired_retire_slots",
-    "sum(inclusive#sum#INT_MISC:RECOVERY_CYCLES) as int_misc_recovery_cycles",
-    "sum(inclusive#sum#CPU_CLK_UNHALTED:THREAD) as cpu_clock_unhalted_thread"
-   ]
-  }
- ]
-},
-{
- "name"        : "topdown-counters.all",
- "description" : "Raw counter values for Intel top-down analysis (all levels)",
- "type"        : "bool",
- "category"    : "metric",
- "services"    : [ "papi" ],
- "config"      :
- {
-   "CALI_PAPI_COUNTERS":
-     "IDQ_UOPS_NOT_DELIVERED:CORE,UOPS_ISSUED:ANY,UOPS_RETIRED:RETIRE_SLOTS,INT_MISC:RECOVERY_CYCLES,CPU_CLK_UNHALTED:THREAD",
-   "CALI_PAPI_ENABLE_MULTIPLEXING": "true"
- },
- "query"  :
- [
-  { "level": "local", "select":
-   [
-    "inclusive_sum(sum#IDQ_UOPS_NOT_DELIVERED:CORE) as idq_uops_not_delivered",
-    "inclusive_sum(sum#UOPS_ISSUED:ANY) as uops_issued",
-    "inclusive_sum(sum#UOPS_RETIRED:RETIRE_SLOTS) as uops_retired_retire_slots",
-    "inclusive_sum(sum#INT_MISC:RECOVERY_CYCLES) as int_misc_recovery_cycles",
-    "inclusive_sum(sum#CPU_CLK_UNHALTED:THREAD) as cpu_clock_unhalted_thread",
-    "inclusive_sum(sum#IDQ_UOPS_NOT_DELIVERED:CYCLES_0_UOPS_DELIV_CORE) as idq_uops_not_delivered_cycles_0_uops_deliv_core",
-    "inclusive_sum(sum#BR_MISP_RETIRED:ALL_BRANCHES) as br_misp_retired_all_branches",
-    "inclusive_sum(sum#MACHINE_CLEARS:COUNT) as machine_clears_count",
-    "inclusive_sum(sum#CYCLE_ACTIVITY:STALLS_TOTAL) as cycle_activity_stalls_total",
-    "inclusive_sum(sum#EXE_ACTIVITY:1_PORTS_UTIL) as exe_activity_1_ports_util",
-    "inclusive_sum(sum#EXE_ACTIVITY:2_PORTS_UTIL) as exe_activity_2_ports_util",
-    "inclusive_sum(sum#UOPS_RETIRED:MACRO_FUSED) as uops_retired_macro_fused",
-    "inclusive_sum(sum#INST_RETIRED:ANY) as inst_retired_any"
-   ]
-  },
-  { "level": "cross", "select":
-   [
-    "sum(inclusive#sum#IDQ_UOPS_NOT_DELIVERED:CORE) as idq_uops_not_delivered",
-    "sum(inclusive#sum#UOPS_ISSUED:ANY) as uops_issued",
-    "sum(inclusive#sum#UOPS_RETIRED:RETIRE_SLOTS) as uops_retired_retire_slots",
-    "sum(inclusive#sum#INT_MISC:RECOVERY_CYCLES) as int_misc_recovery_cycles",
-    "sum(inclusive#sum#CPU_CLK_UNHALTED:THREAD) as cpu_clock_unhalted_thread",
-    "sum(inclusive#sum#IDQ_UOPS_NOT_DELIVERED:CYCLES_0_UOPS_DELIV_CORE) as idq_uops_not_delivered_cycles_0_uops_deliv_core",
-    "sum(inclusive#sum#BR_MISP_RETIRED:ALL_BRANCHES) as br_misp_retired_all_branches",
-    "sum(inclusive#sum#MACHINE_CLEARS:COUNT) as machine_clears_count",
-    "sum(inclusive#sum#CYCLE_ACTIVITY:STALLS_TOTAL) as cycle_activity_stalls_total",
-    "sum(inclusive#sum#EXE_ACTIVITY:1_PORTS_UTIL) as exe_activity_1_ports_util",
-    "sum(inclusive#sum#EXE_ACTIVITY:2_PORTS_UTIL) as exe_activity_2_ports_util",
-    "sum(inclusive#sum#UOPS_RETIRED:MACRO_FUSED) as uops_retired_macro_fused",
-    "sum(inclusive#sum#INST_RETIRED:ANY) as inst_retired_any"
-   ]
-  }
- ]
 }
 ]
 )json";
@@ -1420,60 +1336,6 @@ const char* builtin_papi_spr_option_specs = R"json(
      ]
     }
    ]
-  },
-  {
-   "name"        : "topdown-counters.toplevel",
-   "description" : "Raw counter values for Intel top-down analysis (top level)",
-   "type"        : "bool",
-   "category"    : "metric",
-   "services"    : [ "papi" ],
-   "config"      :
-   {
-     "CALI_PAPI_COUNTERS":
-       "perf::slots,perf::topdown-retiring"
-   },
-   "query"  :
-   [
-    { "level": "local", "select":
-     [
-      "inclusive_sum(sum#papi.slots) as slots",
-      "inclusive_sum(sum#papi.perf::topdown-retiring) as topdown_retiring"
-     ]
-    },
-    { "level": "cross", "select":
-     [
-      "sum(inclusive#sum#papi.slots) as slots",
-      "sum(inclusive#sum#papi.perf::topdown-retiring) as topdown_retiring"
-     ]
-    }
-   ]
-  },
-  {
-   "name"        : "topdown-counters.all",
-   "description" : "Raw counter values for Intel top-down analysis (all levels)",
-   "type"        : "bool",
-   "category"    : "metric",
-   "services"    : [ "papi" ],
-   "config"      :
-   {
-     "CALI_PAPI_COUNTERS":
-       "perf::slots,perf::topdown-retiring"
-   },
-   "query"  :
-   [
-    { "level": "local", "select":
-     [
-      "inclusive_sum(sum#papi.slots) as slots",
-      "inclusive_sum(sum#papi.perf::topdown-retiring) as topdown_retiring"
-     ]
-    },
-    { "level": "cross", "select":
-     [
-      "sum(inclusive#sum#papi.slots) as slots",
-      "sum(inclusive#sum#papi.perf::topdown-retiring) as topdown_retiring"
-     ]
-    }
-   ]
   }
 ]
 )json";
@@ -1549,84 +1411,6 @@ const char* builtin_papi_spr_option_specs = R"json(
      ]
     }
    ]
-  },
-  {
-   "name"        : "topdown-counters.toplevel",
-   "description" : "Raw counter values for Intel top-down analysis (top level)",
-   "type"        : "bool",
-   "category"    : "metric",
-   "services"    : [ "papi" ],
-   "config"      :
-   {
-     "CALI_PAPI_COUNTERS":
-       "perf::slots,perf::topdown-retiring,perf::topdown-bad-spec,perf::topdown-fe-bound,perf::topdown-be-bound,INT_MISC:UOP_DROPPING"
-   },
-   "query"  :
-   [
-    { "level": "local", "select":
-     [
-      "inclusive_sum(sum#papi.perf::slots) as slots",
-      "inclusive_sum(sum#papi.perf::topdown-retiring) as topdown_retiring",
-      "inclusive_sum(sum#papi.perf::topdown-bad-spec) as topdown_bad_spec",
-      "inclusive_sum(sum#papi.perf::topdown-fe-bound) as topdown_fe_bound",
-      "inclusive_sum(sum#papi.perf::topdown-be-bound) as topdown_be_bound",
-      "inclusive_sum(sum#papi.INT_MISC:UOP_DROPPING) as int_mist:uop_dropping"
-     ]
-    },
-    { "level": "cross", "select":
-     [
-      "sum(inclusive#sum#papi.perf::slots) as slots",
-      "sum(inclusive#sum#papi.perf::topdown-retiring) as topdown_retiring",
-      "sum(inclusive#sum#papi.perf::topdown-bad-spec) as topdown_bad_spec",
-      "sum(inclusive#sum#papi.perf::topdown-fe-bound) as topdown_fe_bound",
-      "sum(inclusive#sum#papi.perf::topdown-be-bound) as topdown_be_bound",
-      "sum(inclusive#sum#papi.INT_MISC:UOP_DROPPING) as int_mist:uop_dropping"
-     ]
-    }
-   ]
-  },
-  {
-   "name"        : "topdown-counters.all",
-   "description" : "Raw counter values for Intel top-down analysis (all levels)",
-   "type"        : "bool",
-   "category"    : "metric",
-   "services"    : [ "papi" ],
-   "config"      :
-   {
-     "CALI_PAPI_COUNTERS":
-       "perf::slots,perf::topdown-retiring,perf::topdown-bad-spec,perf::topdown-fe-bound,perf::topdown-be-bound,INT_MISC:UOP_DROPPING,perf_raw::r8400,perf_raw::r8500,perf_raw::r8600,perf_raw::r8700"
-   },
-   "query"  :
-   [
-    { "level": "local", "select":
-     [
-      "inclusive_sum(sum#papi.perf::slots) as slots",
-      "inclusive_sum(sum#papi.perf::topdown-retiring) as topdown_retiring",
-      "inclusive_sum(sum#papi.perf::topdown-bad-spec) as topdown_bad_spec",
-      "inclusive_sum(sum#papi.perf::topdown-fe-bound) as topdown_fe_bound",
-      "inclusive_sum(sum#papi.perf::topdown-be-bound) as topdown_be_bound",
-      "inclusive_sum(sum#papi.INT_MISC:UOP_DROPPING) as int_mist:uop_dropping",
-      "inclusive_sum(sum#papi.perf_raw::r8400) as topdown_heavy_ops",
-      "inclusive_sum(sum#papi.perf_raw::r8500) as topdown_br_mispredict",
-      "inclusive_sum(sum#papi.perf_raw::r8600) as topdown_fetch_lat",
-      "inclusive_sum(sum#papi.perf_raw::r8700) as topdown_mem_bound"
-     ]
-    },
-    { "level": "cross", "select":
-     [
-      "sum(inclusive#sum#papi.perf::slots) as slots",
-      "sum(inclusive#sum#papi.perf::topdown-retiring) as topdown_retiring",
-      "sum(inclusive#sum#papi.perf::topdown-bad-spec) as topdown_bad_spec",
-      "sum(inclusive#sum#papi.perf::topdown-fe-bound) as topdown_fe_bound",
-      "sum(inclusive#sum#papi.perf::topdown-be-bound) as topdown_be_bound",
-      "sum(inclusive#sum#papi.INT_MISC:UOP_DROPPING) as int_mist:uop_dropping",
-      "sum(inclusive#sum#papi.perf_raw::r8400) as topdown_heavy_ops",
-      "sum(inclusive#sum#papi.perf_raw::r8500) as topdown_br_mispredict",
-      "sum(inclusive#sum#papi.perf_raw::r8600) as topdown_fetch_lat",
-      "sum(inclusive#sum#papi.perf_raw::r8700) as topdown_mem_bound"
-     ]
-    }
-   ]
   }
 ]
 )json";