diff --git a/config_metrics.go b/config_metrics.go
deleted file mode 100644
index 3275a78f..00000000
--- a/config_metrics.go
+++ /dev/null
@@ -1,16 +0,0 @@
-//  Copyright (c) 2015 Couchbase, Inc.
-//  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
-//  except in compliance with the License. You may obtain a copy of the License at
-//    http://www.apache.org/licenses/LICENSE-2.0
-//  Unless required by applicable law or agreed to in writing, software distributed under the
-//  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-//  either express or implied. See the License for the specific language governing permissions
-//  and limitations under the License.
-
-// +build debug
-
-package bleve
-
-import (
-	_ "github.com/blevesearch/bleve/index/store/metrics"
-)
diff --git a/index/store/metrics/metrics.go b/index/store/metrics/metrics.go
index 9b460af3..7651a848 100644
--- a/index/store/metrics/metrics.go
+++ b/index/store/metrics/metrics.go
@@ -9,8 +9,6 @@
 //  express or implied. See the License for the specific language
 //  governing permissions and limitations under the License.
 
-// +build debug
-
 // Package metrics provides a bleve.store.KVStore implementation that
 // wraps another, real KVStore implementation, and uses go-metrics to
 // track runtime performance metrics.
diff --git a/index/store/metrics/metrics_test.go b/index/store/metrics/metrics_test.go
index 957aa9a6..4c94fbfe 100644
--- a/index/store/metrics/metrics_test.go
+++ b/index/store/metrics/metrics_test.go
@@ -10,8 +10,6 @@
 //  express or implied. See the License for the specific language
 //  governing permissions and limitations under the License.
 
-// +build debug
-
 package metrics
 
 import (