diff --git a/.golangci.yml b/.golangci.yml
index 3431737..33943e5 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -81,12 +81,14 @@ linters-settings:
           - $gostd
           - github.com/cockroachdb/pebble
           - github.com/google/btree
+          - github.com/syndtr/goleveldb/leveldb
       test:
         files:
           - "$test"
         allow:
           - $gostd
           - github.com/stretchr/testify
+          - github.com/syndtr/goleveldb/leveldb/opt
 
   revive:
     enable-all-rules: true
diff --git a/Makefile b/Makefile
index 2fb0603..a027556 100644
--- a/Makefile
+++ b/Makefile
@@ -15,15 +15,9 @@ all: lint test
 #? test: Run pure Go tests only
 test:
 	@echo "--> Running go test"
-	@go test $(PACKAGES) -tags goleveldb,boltdb,badgerdb
+	@go test $(PACKAGES) -tags boltdb,badgerdb
 .PHONY: test
 
-#? test-goleveldb: Run goleveldb tests
-test-goleveldb:
-	@echo "--> Running go test"
-	@go test $(PACKAGES) -tags goleveldb -v
-.PHONY: test-goleveldb
-
 #? test-cleveldb: Run cleveldb tests
 test-cleveldb:
 	@echo "--> Running go test"
@@ -62,7 +56,7 @@ test-all-with-coverage:
 		-race \
 		-coverprofile=coverage.txt \
 		-covermode=atomic \
-		-tags=goleveldb,cleveldb,boltdb,rocksdb,badgerdb\
+		-tags=cleveldb,boltdb,rocksdb,badgerdb\
 		-v
 .PHONY: test-all-with-coverage
 
diff --git a/UPGRADING.md b/UPGRADING.md
deleted file mode 100644
index 7c8bbff..0000000
--- a/UPGRADING.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Upgrading
-
-## v0.15 -> v1.0
-
-There's now a `goleveldb` build flag that must be used when using goleveldb. If
-you're using `pebbledb`, you don't need a build flag anymore.
-
-```sh
-go build -tags goleveldb
-```
diff --git a/db.go b/db.go
index 6e22f52..688e626 100644
--- a/db.go
+++ b/db.go
@@ -14,7 +14,6 @@ const (
 	//   - UNMAINTANED
 	//   - pure go
 	//   - stable
-	//   - use goleveldb build tag (go build -tags goleveldb)
 	GoLevelDBBackend BackendType = "goleveldb"
 	// CLevelDBBackend represents cleveldb (uses levigo wrapper)
 	//   - DEPRECATED
diff --git a/goleveldb.go b/goleveldb.go
index 0a08654..65161c3 100644
--- a/goleveldb.go
+++ b/goleveldb.go
@@ -1,6 +1,3 @@
-//go:build goleveldb
-// +build goleveldb
-
 package db
 
 import (
@@ -31,7 +28,7 @@ func NewGoLevelDB(name string, dir string) (*GoLevelDB, error) {
 }
 
 func NewGoLevelDBWithOpts(name string, dir string, o *opt.Options) (*GoLevelDB, error) {
-	dbPath := filepath.Join(dir, name+".db") //nolint:goconst
+	dbPath := filepath.Join(dir, name+".db")
 	db, err := leveldb.OpenFile(dbPath, o)
 	if err != nil {
 		return nil, err
@@ -129,10 +126,7 @@ func (db *GoLevelDB) DB() *leveldb.DB {
 
 // Close implements DB.
 func (db *GoLevelDB) Close() error {
-	if err := db.db.Close(); err != nil {
-		return err
-	}
-	return nil
+	return db.db.Close()
 }
 
 // Print implements DB.
@@ -198,7 +192,7 @@ func (db *GoLevelDB) ReverseIterator(start, end []byte) (Iterator, error) {
 	return newGoLevelDBIterator(itr, start, end, true), nil
 }
 
-// Compact range
+// Compact range.
 func (db *GoLevelDB) Compact(start, end []byte) error {
 	return db.db.CompactRange(util.Range{Start: start, Limit: end})
 }
diff --git a/goleveldb_batch.go b/goleveldb_batch.go
index 351e90c..4db2bd0 100644
--- a/goleveldb_batch.go
+++ b/goleveldb_batch.go
@@ -1,6 +1,3 @@
-//go:build goleveldb
-// +build goleveldb
-
 package db
 
 import (
diff --git a/goleveldb_iterator.go b/goleveldb_iterator.go
index c181c2b..6a3c445 100644
--- a/goleveldb_iterator.go
+++ b/goleveldb_iterator.go
@@ -1,6 +1,3 @@
-//go:build goleveldb
-// +build goleveldb
-
 package db
 
 import (
diff --git a/goleveldb_test.go b/goleveldb_test.go
index 4c16709..6fd2425 100644
--- a/goleveldb_test.go
+++ b/goleveldb_test.go
@@ -1,6 +1,3 @@
-//go:build goleveldb
-// +build goleveldb
-
 package db
 
 import (