diff --git a/importsrv/server_test.go b/importsrv/server_test.go
index 037da92ca..5050d9a11 100644
--- a/importsrv/server_test.go
+++ b/importsrv/server_test.go
@@ -257,38 +257,3 @@ func test(in []*metricpb.Metric, out []samplers.TestMetric, msg string) func(*te
 		)
 	}
 }
-
-//func TestOptions_WithTraceClient(t *testing.T) {
-//	c, err := trace.NewClient(trace.DefaultVeneurAddress)
-//	if err != nil {
-//		t.Fatalf("failed to initialize a trace client: %v", err)
-//	}
-//
-//	s := New([]MetricIngester{}, WithTraceClient(c))
-//	assert.Equal(t, c, s.opts.traceClient, "WithTraceClient didn't correctly "+
-//		"set the trace client")
-//}
-//
-//func BenchmarkImportServerSendMetrics(b *testing.B) {
-//	rand.Seed(time.Now().Unix())
-//
-//	metrics := metrictest.RandomForwardMetrics(10000)
-//	for _, inputSize := range []int{10, 100, 1000, 10000} {
-//		ingesters := make([]MetricIngester, 100)
-//		for i := range ingesters {
-//			ingester := newNoopChannelMetricIngester()
-//			ingester.start()
-//			defer ingester.stop()
-//			ingesters[i] = ingester
-//		}
-//		s := New(ingesters)
-//		ctx := context.Background()
-//		input := &forwardrpc.MetricList{Metrics: metrics[:inputSize]}
-//
-//		b.Run(fmt.Sprintf("InputSize=%d", inputSize), func(b *testing.B) {
-//			for i := 0; i < b.N; i++ {
-//				s.SendMetrics(ctx, input)
-//			}
-//		})
-//	}
-//}
diff --git a/metricingester/obs.go b/metricingester/obs.go
index b4347d061..0ccff519b 100644
--- a/metricingester/obs.go
+++ b/metricingester/obs.go
@@ -2,6 +2,7 @@ package metricingester
 
 import (
 	"context"
+	"strconv"
 
 	"github.com/opentracing/opentracing-go"
 	"github.com/sirupsen/logrus"
@@ -11,8 +12,8 @@ import (
 func traceLogger(log *logrus.Logger, ctx context.Context) *logrus.Entry {
 	if span, ok := opentracing.SpanFromContext(ctx).(*trace.Span); ok {
 		return log.
-			WithField("trace_id", span.TraceID).
-			WithField("span_id", span.SpanID)
+			WithField("trace_id", strconv.FormatInt(span.TraceID, 16)).
+			WithField("span_id", strconv.FormatInt(span.SpanID, 16))
 	}
 	return log.WithField("trace_id", "<UNKNOWN>")
 }
diff --git a/metricingester/sinkflusher.go b/metricingester/sinkflusher.go
index d4daa90a7..956349fb6 100644
--- a/metricingester/sinkflusher.go
+++ b/metricingester/sinkflusher.go
@@ -52,7 +52,6 @@ func (s sinkFlusher) Flush(ctx context.Context, envelope samplerEnvelope) {
 
 	tags := map[string]string{"part": "post"}
 	for _, sinkInstance := range s.sinks {
-		// TODO(clin): Add back ms once we finalize the ms client pull request.
 		go func(sink Sink) {
 			samples := &ssf.Samples{}
 			defer metrics.Report(s.tc, samples)