diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
index daed188799..5633d6e7c0 100644
--- a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
+++ b/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
@@ -231,10 +231,6 @@ public Integer applyDirect(final String[] args) {
 
         NBIO.addGlobalIncludes(options.wantsIncludes());
 
-        // TODO: metrics
-//        ActivityMetrics.setHdrDigits(options.getHdrDigits());
-//        ActivityMetrics.setLabelValidator(options.getAnnotateLabelSpec());
-
         if (options.wantsBasicHelp()) {
             System.out.println(this.loadHelpFile("basic.md"));
             return NBCLI.EXIT_OK;
@@ -355,7 +351,6 @@ public Integer applyDirect(final String[] args) {
                 .build()
         );
 
-        // TODO: metrics
 //        if ((null != reportPromPushTo) || (null != reportGraphiteTo) || (null != options.wantsReportCsvTo())) {
 //            final MetricReporters reporters = MetricReporters.getInstance();
 //            reporters.addRegistry("workloads", ActivityMetrics.getMetricRegistry());
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java
index 88d0515840..6efc8788cb 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java
@@ -422,7 +422,7 @@ public ExecutionResult call() throws Exception {
                 this.exception = e;
             } finally {
                 stoppedAt = System.currentTimeMillis();
-                unregisterMetrics();
+                // TODO: close out metrics outputs on component tree if needed
                 activity.shutdownActivity();
                 activity.closeAutoCloseables();
                 ExecutionResult result = new ExecutionResult(startedAt, stoppedAt, "", exception);
@@ -464,12 +464,6 @@ private void registerMetrics() {
         this.activity.create().gauge("threads",() -> (double) this.motors.size());
     }
 
-    private void unregisterMetrics() {
-        // TODO: metrics
-//        ActivityMetrics.unregister(this.threadsGauge);
-        this.threadsGauge = null;
-    }
-
     private boolean shutdownExecutorService(int secondsToWait) {
 
         activitylogger.debug(() -> "Shutting down motor executor for (" + activity.getAlias() + ")");
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ActivitiesController.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ActivitiesController.java
index 0ad5be5755..d1b6e7f9bd 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ActivitiesController.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/context/ActivitiesController.java
@@ -424,7 +424,6 @@ public List<ActivityDef> getActivityDefs() {
     }
 
     public void reportMetrics() {
-        // TODO: metrics
 //        ActivityMetrics.reportTo(System.out);
     }
 
diff --git a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/wrappers/RelevancyMeasures.java b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/wrappers/RelevancyMeasures.java
index 1a3a86d09b..f14f40cee8 100644
--- a/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/wrappers/RelevancyMeasures.java
+++ b/nb-api/src/main/java/io/nosqlbench/api/engine/metrics/wrappers/RelevancyMeasures.java
@@ -57,7 +57,6 @@ public RelevancyMeasures addFunction(RelevancyFunction... f) {
         for (RelevancyFunction function : f) {
             this.functions.add(function);
             function.prependLabels(this);
-            // TODO: metrics
             // DoubleSummaryGauge gauge = ActivityMetrics.summaryGauge(function, function.getUniqueName());
             // this.gauges.add(gauge);
         }
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/ScriptExampleTests.java b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/ScriptExampleTests.java
index 41b9fd47ad..2065cb2c79 100644
--- a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/ScriptExampleTests.java
+++ b/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/ScriptExampleTests.java
@@ -85,6 +85,7 @@ public static ScenarioResult runScenario(String scriptname, String... params) {
         return scenarioResult;
     }
 
+    @Disabled
     @BeforeAll
     public static void logit() {
         System.out.println("Running ASYNC version of Script Integration Tests.");