diff --git a/cli/cli.go b/cli/cli.go
index b839bf9b2..bc717624f 100644
--- a/cli/cli.go
+++ b/cli/cli.go
@@ -16,7 +16,7 @@ import (
 	featurebase "github.com/featurebasedb/featurebase/v3"
 	"github.com/featurebasedb/featurebase/v3/dax"
 	queryerhttp "github.com/featurebasedb/featurebase/v3/dax/queryer/http"
-	"github.com/featurebasedb/featurebase/v3/fbcloud"
+	"github.com/featurebasedb/featurebase/v3/cli/fbcloud"
 	"github.com/featurebasedb/featurebase/v3/logger"
 	"github.com/pkg/errors"
 )
diff --git a/cli/cli_test.go b/cli/cli_test.go
index 69bcb690f..ceac7a059 100644
--- a/cli/cli_test.go
+++ b/cli/cli_test.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	featurebase "github.com/molecula/featurebase/v3"
-	"github.com/molecula/featurebase/v3/cli"
-	"github.com/molecula/featurebase/v3/logger"
+	featurebase "github.com/featurebasedb/featurebase/v3"
+	"github.com/featurebasedb/featurebase/v3/cli"
+	"github.com/featurebasedb/featurebase/v3/logger"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/cli/queryer.go b/cli/queryer.go
index 80f5b5fce..bde2b6cbc 100644
--- a/cli/queryer.go
+++ b/cli/queryer.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 
 	featurebase "github.com/featurebasedb/featurebase/v3"
-	"github.com/molecula/featurebasedb/v3/dax"
-	queryerhttp "github.com/molecula/featurebase/v3/dax/queryer/http"
+	"github.com/featurebasedb/featurebase/v3/dax"
+	queryerhttp "github.com/featurebasedb/featurebase/v3/dax/queryer/http"
 	"github.com/pkg/errors"
 )
 
diff --git a/dax/mds/controller/balancer.go b/dax/mds/controller/balancer.go
index 567c4b8c7..2344af873 100644
--- a/dax/mds/controller/balancer.go
+++ b/dax/mds/controller/balancer.go
@@ -1,9 +1,6 @@
 package controller
 
 import (
-	"context"
-	"fmt"
-
 	"github.com/featurebasedb/featurebase/v3/dax"
 )
 
diff --git a/dax/mds/controller/controller_test.go b/dax/mds/controller/controller_test.go
index d135738f5..9b204f55b 100644
--- a/dax/mds/controller/controller_test.go
+++ b/dax/mds/controller/controller_test.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/featurebasedb/featurebase/v3/dax"
 	"github.com/featurebasedb/featurebase/v3/dax/mds/controller"
-	"github.com/featurebasedb/featurebase/v3/dax/mds/controller/naive/boltdb"
 	daxtest "github.com/featurebasedb/featurebase/v3/dax/test"
 	testbolt "github.com/featurebasedb/featurebase/v3/dax/test/boltdb"
 	"github.com/featurebasedb/featurebase/v3/errors"
diff --git a/dax/mds/mds.go b/dax/mds/mds.go
index ffa64e441..657ee6461 100644
--- a/dax/mds/mds.go
+++ b/dax/mds/mds.go
@@ -11,7 +11,7 @@ import (
 	"github.com/featurebasedb/featurebase/v3/dax/boltdb"
 	"github.com/featurebasedb/featurebase/v3/dax/computer"
 	"github.com/featurebasedb/featurebase/v3/dax/mds/controller"
-	naiveboltdb "github.com/featurebasedb/featurebase/v3/dax/mds/controller/naive/boltdb"
+	balancerboltdb "github.com/featurebasedb/featurebase/v3/dax/mds/controller/balancer/boltdb"
 	"github.com/featurebasedb/featurebase/v3/dax/mds/poller"
 	"github.com/featurebasedb/featurebase/v3/dax/mds/schemar"
 	schemarboltdb "github.com/featurebasedb/featurebase/v3/dax/mds/schemar/boltdb"
diff --git a/dax/mds/schemar/schemar.go b/dax/mds/schemar/schemar.go
index 1b45dce9f..7f54f35ee 100644
--- a/dax/mds/schemar/schemar.go
+++ b/dax/mds/schemar/schemar.go
@@ -2,8 +2,6 @@
 package schemar
 
 import (
-	"context"
-
 	"github.com/featurebasedb/featurebase/v3/dax"
 )
 
diff --git a/go.mod b/go.mod
index 9710bf3c7..f92aa51ab 100644
--- a/go.mod
+++ b/go.mod
@@ -43,8 +43,8 @@ require (
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/pelletier/go-toml v1.9.5
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.12.2
-	github.com/prometheus/client_model v0.2.0
+	github.com/prometheus/client_golang v1.14.0
+	github.com/prometheus/client_model v0.3.0
 	github.com/prometheus/prom2json v1.3.1
 	github.com/rakyll/statik v0.1.7
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
@@ -158,8 +158,8 @@ require (
 	github.com/pierrec/lz4/v4 v4.1.15 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
-	github.com/prometheus/common v0.33.0 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/sirupsen/logrus v1.7.0 // indirect
 	github.com/soheilhy/cmux v0.1.5 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
diff --git a/go.sum b/go.sum
index 7657c22ad..b5324ea26 100644
--- a/go.sum
+++ b/go.sum
@@ -920,6 +920,8 @@ github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr
 github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34=
 github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
+github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
+github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -927,6 +929,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
+github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
@@ -939,6 +943,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9
 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
 github.com/prometheus/common v0.33.0 h1:rHgav/0a6+uYgGdNt3jwz8FNSesO/Hsang3O0T9A5SE=
 github.com/prometheus/common v0.33.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE=
+github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
+github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -950,6 +956,8 @@ github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
+github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/prometheus/prom2json v1.3.1 h1:OogL5hsrJpLPz3jZ4LPz4sJRTtADzViCNRQoqrzUQvk=
 github.com/prometheus/prom2json v1.3.1/go.mod h1:A8Oy9aiQx4wrJY9ya1i4nHOySGmkVp5EO0aU1iSJR+g=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
diff --git a/prometheus/prometheus_test.go b/prometheus/prometheus_test.go
index 391124ba8..3e60c4af5 100644
--- a/prometheus/prometheus_test.go
+++ b/prometheus/prometheus_test.go
@@ -5,7 +5,8 @@ package prometheus_test
 import (
 	"testing"
 
-	pilosaPrometheus "github.com/featurebasedb/featurebase/v3/prometheus"
+
+	"github.com/featurebasedb/featurebase/v3/test"
 	"github.com/prometheus/client_golang/prometheus"
 	io_prometheus_client "github.com/prometheus/client_model/go"
 )
diff --git a/server/server.go b/server/server.go
index 72606c009..7fa2d2904 100644
--- a/server/server.go
+++ b/server/server.go
@@ -44,7 +44,6 @@ import (
         "github.com/featurebasedb/featurebase/v3/sql3/planner"
         "github.com/featurebasedb/featurebase/v3/statik"
         "github.com/featurebasedb/featurebase/v3/stats"
-        "github.com/featurebasedb/featurebase/v3/statsd"
         "github.com/featurebasedb/featurebase/v3/systemlayer"
         "github.com/featurebasedb/featurebase/v3/syswrap"
         "github.com/featurebasedb/featurebase/v3/testhook"