diff --git a/.golangci.yml b/.golangci.yml
index ca86e6d5b..4cae2f76a 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -24,7 +24,6 @@ linters:
     - gochecknoinits
     - scopelint
     - stylecheck
-    - deadcode
 
 # linters-settings:
 #   govet:
diff --git a/libs/clist/clist_test.go b/libs/clist/clist_test.go
index 4ded6177a..edf013752 100644
--- a/libs/clist/clist_test.go
+++ b/libs/clist/clist_test.go
@@ -2,8 +2,6 @@ package clist
 
 import (
 	"fmt"
-	"runtime"
-	"sync/atomic"
 	"testing"
 	"time"
 
@@ -65,100 +63,100 @@ func TestSmall(t *testing.T) {
 
 }
 
-/*
-This test is quite hacky because it relies on SetFinalizer
-which isn't guaranteed to run at all.
-*/
-// nolint: megacheck
-func _TestGCFifo(t *testing.T) {
-
-	const numElements = 1000000
-	l := New()
-	gcCount := new(uint64)
-
-	// SetFinalizer doesn't work well with circular structures,
-	// so we construct a trivial non-circular structure to
-	// track.
-	type value struct {
-		Int int
-	}
-	done := make(chan struct{})
-
-	for i := 0; i < numElements; i++ {
-		v := new(value)
-		v.Int = i
-		l.PushBack(v)
-		runtime.SetFinalizer(v, func(v *value) {
-			atomic.AddUint64(gcCount, 1)
-		})
-	}
-
-	for el := l.Front(); el != nil; {
-		l.Remove(el)
-		//oldEl := el
-		el = el.Next()
-		//oldEl.DetachPrev()
-		//oldEl.DetachNext()
-	}
-
-	runtime.GC()
-	time.Sleep(time.Second * 3)
-	runtime.GC()
-	time.Sleep(time.Second * 3)
-	_ = done
-
-	if *gcCount != numElements {
-		t.Errorf("Expected gcCount to be %v, got %v", numElements,
-			*gcCount)
-	}
-}
-
-/*
-This test is quite hacky because it relies on SetFinalizer
-which isn't guaranteed to run at all.
-*/
-// nolint: megacheck
-func _TestGCRandom(t *testing.T) {
-
-	const numElements = 1000000
-	l := New()
-	gcCount := 0
-
-	// SetFinalizer doesn't work well with circular structures,
-	// so we construct a trivial non-circular structure to
-	// track.
-	type value struct {
-		Int int
-	}
-
-	for i := 0; i < numElements; i++ {
-		v := new(value)
-		v.Int = i
-		l.PushBack(v)
-		runtime.SetFinalizer(v, func(v *value) {
-			gcCount++
-		})
-	}
-
-	els := make([]*CElement, 0, numElements)
-	for el := l.Front(); el != nil; el = el.Next() {
-		els = append(els, el)
-	}
-
-	for _, i := range cmn.RandPerm(numElements) {
-		el := els[i]
-		l.Remove(el)
-		_ = el.Next()
-	}
-
-	runtime.GC()
-	time.Sleep(time.Second * 3)
-
-	if gcCount != numElements {
-		t.Errorf("Expected gcCount to be %v, got %v", numElements,
-			gcCount)
-	}
-}
+// This test is quite hacky because it relies on SetFinalizer
+// which isn't guaranteed to run at all.
+//func TestGCFifo(t *testing.T) {
+//	if runtime.GOARCH != "amd64" {
+//		t.Skipf("Skipping on non-amd64 machine")
+//	}
+
+//	const numElements = 1000000
+//	l := New()
+//	gcCount := new(uint64)
+
+//	// SetFinalizer doesn't work well with circular structures,
+//	// so we construct a trivial non-circular structure to
+//	// track.
+//	type value struct {
+//		Int int
+//	}
+//	done := make(chan struct{})
+
+//	for i := 0; i < numElements; i++ {
+//		v := new(value)
+//		v.Int = i
+//		l.PushBack(v)
+//		runtime.SetFinalizer(v, func(v *value) {
+//			atomic.AddUint64(gcCount, 1)
+//		})
+//	}
+
+//	for el := l.Front(); el != nil; {
+//		l.Remove(el)
+//		//oldEl := el
+//		el = el.Next()
+//		//oldEl.DetachPrev()
+//		//oldEl.DetachNext()
+//	}
+
+//	runtime.GC()
+//	time.Sleep(time.Second * 3)
+//	runtime.GC()
+//	time.Sleep(time.Second * 3)
+//	_ = done
+
+//	if *gcCount != numElements {
+//		t.Errorf("Expected gcCount to be %v, got %v", numElements,
+//			*gcCount)
+//	}
+//}
+
+// This test is quite hacky because it relies on SetFinalizer
+// which isn't guaranteed to run at all.
+// func TestGCRandom(t *testing.T) {
+// 	if runtime.GOARCH != "amd64" {
+// 		t.Skipf("Skipping on non-amd64 machine")
+// 	}
+
+// 	const numElements = 1000000
+// 	l := New()
+// 	gcCount := 0
+
+// 	// SetFinalizer doesn't work well with circular structures,
+// 	// so we construct a trivial non-circular structure to
+// 	// track.
+// 	type value struct {
+// 		Int int
+// 	}
+
+// 	for i := 0; i < numElements; i++ {
+// 		v := new(value)
+// 		v.Int = i
+// 		l.PushBack(v)
+// 		runtime.SetFinalizer(v, func(v *value) {
+// 			gcCount++
+// 		})
+// 	}
+
+// 	els := make([]*CElement, 0, numElements)
+// 	for el := l.Front(); el != nil; el = el.Next() {
+// 		els = append(els, el)
+// 	}
+
+// 	for _, i := range cmn.RandPerm(numElements) {
+// 		el := els[i]
+// 		l.Remove(el)
+// 		_ = el.Next()
+// 	}
+
+// 	runtime.GC()
+// 	time.Sleep(time.Second * 3)
+
+// 	if gcCount != numElements {
+// 		t.Errorf("Expected gcCount to be %v, got %v", numElements,
+// 			gcCount)
+// 	}
+// }
 
 func TestScanRightDeleteRandom(t *testing.T) {