diff --git a/mantis-common/src/main/java/io/mantisrx/common/metrics/MetricsServer.java b/mantis-common/src/main/java/io/mantisrx/common/metrics/MetricsServer.java
index 0a18dd964..fee982d3f 100644
--- a/mantis-common/src/main/java/io/mantisrx/common/metrics/MetricsServer.java
+++ b/mantis-common/src/main/java/io/mantisrx/common/metrics/MetricsServer.java
@@ -17,25 +17,19 @@
 package io.mantisrx.common.metrics;
 
 import io.mantisrx.common.metrics.measurement.MicrometerMeasurements;
-import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.Measurement;
 import io.micrometer.core.instrument.Meter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Metrics;
-import io.mantisrx.common.metrics.measurement.CounterMeasurement;
-import io.mantisrx.common.metrics.measurement.GaugeMeasurement;
-import io.mantisrx.common.metrics.measurement.Measurements;
-import io.mantisrx.common.metrics.spectator.MetricId;
 import io.mantisrx.shaded.com.fasterxml.jackson.core.JsonProcessingException;
 import io.mantisrx.shaded.com.fasterxml.jackson.databind.DeserializationFeature;
 import io.mantisrx.shaded.com.fasterxml.jackson.databind.ObjectMapper;
 import io.mantisrx.shaded.com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import io.netty.buffer.ByteBuf;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 import mantis.io.reactivex.netty.RxNetty;
 import mantis.io.reactivex.netty.pipeline.PipelineConfigurators;
@@ -69,7 +63,6 @@ public MetricsServer(int port, long publishRateInSeconds, Map<String, String> ta
 
     private Observable<MicrometerMeasurements> measurements(long timeFrequency) {
         final MeterRegistry registry = Metrics.globalRegistry;
-//        final MetricsRegistry registry = MetricsRegistry.getInstance();
         return
                 Observable.interval(0, timeFrequency, TimeUnit.SECONDS)
                         .flatMap(new Func1<Long, Observable<MicrometerMeasurements>>() {
@@ -85,20 +78,6 @@ public Observable<MicrometerMeasurements> call(Long t1) {
                                             meter.measure().toString(),
                                             tags));
                                 }
-//                                for (Metrics metrics : registry.metrics()) {
-//                                    Collection<CounterMeasurement> counters = new LinkedList<>();
-//                                    Collection<GaugeMeasurement> gauges = new LinkedList<>();
-//
-//                                    for (Entry<MetricId, Counter> counterEntry : metrics.counters().entrySet()) {
-//                                        Counter counter = counterEntry.getValue();
-//                                        counters.add(new CounterMeasurement(counterEntry.getKey().metricName(), counter.value()));
-//                                    }
-//                                    for (Entry<MetricId, Gauge> gaugeEntry : metrics.gauges().entrySet()) {
-//                                        gauges.add(new GaugeMeasurement(gaugeEntry.getKey().metricName(), gaugeEntry.getValue().doubleValue()));
-//                                    }
-//                                    measurements.add(new Measurements(metrics.getMetricGroupId().name(),
-//                                            timestamp, counters, gauges, tags));
-//                                }
                                 return Observable.from(measurements);
                             }
                         });
diff --git a/mantis-common/src/main/java/io/mantisrx/common/metrics/measurement/MicrometerMeasurements.java b/mantis-common/src/main/java/io/mantisrx/common/metrics/measurement/MicrometerMeasurements.java
index 26dd7aba4..10d3a3777 100644
--- a/mantis-common/src/main/java/io/mantisrx/common/metrics/measurement/MicrometerMeasurements.java
+++ b/mantis-common/src/main/java/io/mantisrx/common/metrics/measurement/MicrometerMeasurements.java
@@ -16,15 +16,10 @@
 
 package io.mantisrx.common.metrics.measurement;
 
-import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonUnwrapped;
-import io.micrometer.core.instrument.Measurement;
 import io.micrometer.core.instrument.Meter;
 import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonCreator;
 import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.mantisrx.shaded.com.fasterxml.jackson.annotation.JsonProperty;
-
-import io.micrometer.core.instrument.Meter;
-
 import java.util.Map;
 
 
@@ -77,7 +72,6 @@ public String getMeasurement() {
     public Map<String, String> getTags() {
         return tags;
     }
-
     @Override
     public String toString() {
         return "Measurements{" +