diff --git a/db_go18.go b/context.go
similarity index 99%
rename from db_go18.go
rename to context.go
index 72cb390..e24f103 100644
--- a/db_go18.go
+++ b/context.go
@@ -1,5 +1,3 @@
-//go:build go1.8
-
 package txdb
 
 import (
diff --git a/db_before_go18.go b/db_before_go18.go
deleted file mode 100644
index 291e240..0000000
--- a/db_before_go18.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !go1.8
-
-package txdb
-
-import (
-	"database/sql"
-	"database/sql/driver"
-)
-
-func buildRows(r *sql.Rows) (driver.Rows, error) {
-	rows := &rows{}
-	err := rows.read(r)
-	return rows, err
-}