diff --git a/.golangci.yml b/.golangci.yml
index 7a45e156e89..3f0c56026da 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -211,9 +211,6 @@ linters-settings:
         # this is idiocy, promotes less readable code. Don't enable.
         - name: var-declaration
           disabled: true
-        # enable after cleanup
-        - name: redefines-builtin-id
-          disabled: true
         # "no nested structs are allowed" - don't enable, doesn't make sense
         - name: nested-structs
           disabled: true
diff --git a/cmd/agent/app/configmanager/grpc/manager_test.go b/cmd/agent/app/configmanager/grpc/manager_test.go
index fa484d25c34..1e422d013f9 100644
--- a/cmd/agent/app/configmanager/grpc/manager_test.go
+++ b/cmd/agent/app/configmanager/grpc/manager_test.go
@@ -5,7 +5,6 @@ package grpc
 
 import (
 	"context"
-	"io"
 	"net"
 	"testing"
 
@@ -18,16 +17,12 @@ import (
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 )
 
-func close(t *testing.T, c io.Closer) {
-	require.NoError(t, c.Close())
-}
-
 func TestSamplingManager_GetSamplingStrategy(t *testing.T) {
 	s, addr := initializeGRPCTestServer(t, func(s *grpc.Server) {
 		api_v2.RegisterSamplingManagerServer(s, &mockSamplingHandler{})
 	})
 	conn, err := grpc.NewClient(addr.String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
-	defer close(t, conn)
+	t.Cleanup(func() { require.NoError(t, conn.Close()) })
 	require.NoError(t, err)
 	defer s.GracefulStop()
 	manager := NewConfigManager(conn)
@@ -38,7 +33,7 @@ func TestSamplingManager_GetSamplingStrategy(t *testing.T) {
 
 func TestSamplingManager_GetSamplingStrategy_error(t *testing.T) {
 	conn, err := grpc.NewClient("foo", grpc.WithTransportCredentials(insecure.NewCredentials()))
-	defer close(t, conn)
+	t.Cleanup(func() { require.NoError(t, conn.Close()) })
 	require.NoError(t, err)
 	manager := NewConfigManager(conn)
 	resp, err := manager.GetSamplingStrategy(context.Background(), "any")
diff --git a/plugin/sampling/strategyprovider/static/provider.go b/plugin/sampling/strategyprovider/static/provider.go
index 9bdb612152e..f02a4031a16 100644
--- a/plugin/sampling/strategyprovider/static/provider.go
+++ b/plugin/sampling/strategyprovider/static/provider.go
@@ -375,7 +375,7 @@ func deepCopy(s *api_v2.SamplingStrategyResponse) *api_v2.SamplingStrategyRespon
 	enc := gob.NewEncoder(&buf)
 	dec := gob.NewDecoder(&buf)
 	enc.Encode(*s)
-	var copy api_v2.SamplingStrategyResponse
-	dec.Decode(&copy)
-	return &copy
+	var copyValue api_v2.SamplingStrategyResponse
+	dec.Decode(&copyValue)
+	return &copyValue
 }