diff --git a/go.mod b/go.mod
index ff9ea34..e4a4343 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,5 @@
 module git.gammaspectra.live/P2Pool/sha3
 
-go 1.17
+go 1.18
 
-require golang.org/x/sys v0.8.0
+require golang.org/x/sys v0.19.0
diff --git a/go.sum b/go.sum
index c5eb700..e86bf42 100644
--- a/go.sum
+++ b/go.sum
@@ -1,2 +1,4 @@
 golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
diff --git a/hashes_generic.go b/hashes_generic.go
index c74fc20..fe8c847 100644
--- a/hashes_generic.go
+++ b/hashes_generic.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gc || purego || !s390x
-// +build !gc purego !s390x
 
 package sha3
 
diff --git a/keccakf.go b/keccakf.go
index e5faa37..ce48b1d 100644
--- a/keccakf.go
+++ b/keccakf.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !amd64 || purego || !gc
-// +build !amd64 purego !gc
 
 package sha3
 
diff --git a/keccakf_amd64.go b/keccakf_amd64.go
index 248a382..b908696 100644
--- a/keccakf_amd64.go
+++ b/keccakf_amd64.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && !purego && gc
-// +build amd64,!purego,gc
 
 package sha3
 
diff --git a/keccakf_amd64.s b/keccakf_amd64.s
index 35b4886..1f53938 100644
--- a/keccakf_amd64.s
+++ b/keccakf_amd64.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build amd64 && !purego && gc
-// +build amd64,!purego,gc
 
 // This code was translated into a form compatible with 6a from the public
 // domain sources at https://github.com/gvanas/KeccakCodePackage
diff --git a/register.go b/register.go
index 8b4453a..addfd50 100644
--- a/register.go
+++ b/register.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build go1.4
-// +build go1.4
 
 package sha3
 
diff --git a/sha3_s390x.go b/sha3_s390x.go
index 63a3edb..469e6ef 100644
--- a/sha3_s390x.go
+++ b/sha3_s390x.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc && !purego
-// +build gc,!purego
 
 package sha3
 
diff --git a/sha3_s390x.s b/sha3_s390x.s
index a0e051b..826b862 100644
--- a/sha3_s390x.s
+++ b/sha3_s390x.s
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build gc && !purego
-// +build gc,!purego
 
 #include "textflag.h"
 
diff --git a/shake_generic.go b/shake_generic.go
index 5c0710e..8d31cf5 100644
--- a/shake_generic.go
+++ b/shake_generic.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build !gc || purego || !s390x
-// +build !gc purego !s390x
 
 package sha3
 
diff --git a/xor.go b/xor.go
index 207b1ce..fd536d0 100644
--- a/xor.go
+++ b/xor.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build (!amd64 && !386 && !ppc64le) || purego
-// +build !amd64,!386,!ppc64le purego
 
 package sha3
 
diff --git a/xor_unaligned.go b/xor_unaligned.go
index 8c5801f..f61c9a3 100644
--- a/xor_unaligned.go
+++ b/xor_unaligned.go
@@ -3,8 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build (amd64 || 386 || ppc64le) && !purego
-// +build amd64 386 ppc64le
-// +build !purego
 
 package sha3