client-nowasm_test.go                          | 1 -
 iplist/packed.go                               | 1 -
 issue211_test.go                               | 1 -
 storage/bolt-piece-completion.go               | 1 -
 storage/bolt-piece.go                          | 1 -
 storage/bolt.go                                | 1 -
 storage/default-dir-piece-completion-sqlite.go | 1 -
 storage/mmap.go                                | 1 -
 storage/sqlite-piece-completion.go             | 1 -
 storage/sqlite/direct.go                       | 1 -
 storage/sqlite/sqlite-storage_test.go          | 1 -
 torrent_mmap_test.go                           | 1 -
 utp_libutp.go                                  | 3 +--

diff --git a/client-nowasm_test.go b/client-nowasm_test.go
index 62c5a1dbbf83b8210d4bd4fcac724c0cdeabe677..7725f71ee2bf3d2a85f51ef31e3ad89cb70820aa 100644
--- a/client-nowasm_test.go
+++ b/client-nowasm_test.go
@@ -1,5 +1,4 @@
 //go:build !wasm
-// +build !wasm
 
 package torrent
 
diff --git a/iplist/packed.go b/iplist/packed.go
index 5ae1faea2b88a4cde89804d4e58b4dbbfe691442..62f51db72e84d1582547a3d85e002a18645dc935 100644
--- a/iplist/packed.go
+++ b/iplist/packed.go
@@ -1,5 +1,4 @@
 //go:build !wasm
-// +build !wasm
 
 package iplist
 
diff --git a/issue211_test.go b/issue211_test.go
index 5d93d1f24650e7252045d69a49d96006c45f7d0c..e9b9f0f37620b4a153ed0c56f17333bf81cb658c 100644
--- a/issue211_test.go
+++ b/issue211_test.go
@@ -1,5 +1,4 @@
 //go:build !wasm
-// +build !wasm
 
 package torrent
 
diff --git a/storage/bolt-piece-completion.go b/storage/bolt-piece-completion.go
index 43417f20c476b1f116f01542b0ce8906752952af..fcf3143b5f359850d2a0e24c8934ae1781e2d853 100644
--- a/storage/bolt-piece-completion.go
+++ b/storage/bolt-piece-completion.go
@@ -1,5 +1,4 @@
 //go:build !noboltdb && !wasm
-// +build !noboltdb,!wasm
 
 package storage
 
diff --git a/storage/bolt-piece.go b/storage/bolt-piece.go
index 12916ee5714e5f062c3eea0d78556151dd11b384..644dc88cb87f5af9e69faf1f791256e15bbd4d23 100644
--- a/storage/bolt-piece.go
+++ b/storage/bolt-piece.go
@@ -1,5 +1,4 @@
 //go:build !noboltdb && !wasm
-// +build !noboltdb,!wasm
 
 package storage
 
diff --git a/storage/bolt.go b/storage/bolt.go
index 4473b8415f79a6c92376b97a82c1c603f5266464..6885c8650464b6775a4784ef7a44a1c2c223a0f0 100644
--- a/storage/bolt.go
+++ b/storage/bolt.go
@@ -1,5 +1,4 @@
 //go:build !noboltdb && !wasm
-// +build !noboltdb,!wasm
 
 package storage
 
diff --git a/storage/default-dir-piece-completion-sqlite.go b/storage/default-dir-piece-completion-sqlite.go
index beb992fc7708b58c8b1eb3691179f31f9b236fb5..412abaebbb0b315e3e09baae34157c0659f67eb1 100644
--- a/storage/default-dir-piece-completion-sqlite.go
+++ b/storage/default-dir-piece-completion-sqlite.go
@@ -1,5 +1,4 @@
 //go:build cgo && !nosqlite
-// +build cgo,!nosqlite
 
 package storage
 
diff --git a/storage/mmap.go b/storage/mmap.go
index 9c9e84710137f73a662c2def304316badaea0470..db96d2c2af1ef7934e0fb35fe8583335c5da974f 100644
--- a/storage/mmap.go
+++ b/storage/mmap.go
@@ -1,5 +1,4 @@
 //go:build !wasm
-// +build !wasm
 
 package storage
 
diff --git a/storage/sqlite-piece-completion.go b/storage/sqlite-piece-completion.go
index 5f31e41377f0fcb79e2accc59cb9dc57ad99bdb0..1ae0984ff15704372dcc8f92ccca7c0e4b88018a 100644
--- a/storage/sqlite-piece-completion.go
+++ b/storage/sqlite-piece-completion.go
@@ -1,5 +1,4 @@
 //go:build cgo && !nosqlite
-// +build cgo,!nosqlite
 
 package storage
 
diff --git a/storage/sqlite/direct.go b/storage/sqlite/direct.go
index 4fda7d0cbef6f21bc52d82a61d09571a223aa981..e74cc9600c97702f362c9472842358e650760d2b 100644
--- a/storage/sqlite/direct.go
+++ b/storage/sqlite/direct.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package sqliteStorage
 
diff --git a/storage/sqlite/sqlite-storage_test.go b/storage/sqlite/sqlite-storage_test.go
index 43c743e39423afddf0f4bfb836b2b19a0936b850..dc869a6e0151f64ec9afe4d583275f9def598a4b 100644
--- a/storage/sqlite/sqlite-storage_test.go
+++ b/storage/sqlite/sqlite-storage_test.go
@@ -1,5 +1,4 @@
 //go:build cgo
-// +build cgo
 
 package sqliteStorage
 
diff --git a/torrent_mmap_test.go b/torrent_mmap_test.go
index 811430957561ddef861ca6407781a3757eba5d8e..c09932dc5ae67c3c15561c9c4d94640b03384b9b 100644
--- a/torrent_mmap_test.go
+++ b/torrent_mmap_test.go
@@ -1,5 +1,4 @@
 //go:build !wasm
-// +build !wasm
 
 package torrent
 
diff --git a/utp_libutp.go b/utp_libutp.go
index 1e8fa6738fc8165067ab4aa7007038417dbadb0b..cbb0d69a396298becaee98374631efef4c050dfd 100644
--- a/utp_libutp.go
+++ b/utp_libutp.go
@@ -1,10 +1,9 @@
 //go:build cgo && !disable_libutp
-// +build cgo,!disable_libutp
 
 package torrent
 
 import (
-	"github.com/anacrolix/go-libutp"
+	utp "github.com/anacrolix/go-libutp"
 )
 
 func NewUtpSocket(network, addr string, fc firewallCallback) (utpSocket, error) {