diff --git a/config/config_test.go b/config/config_test.go
index 5c99b1d5..01d8ce10 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -351,8 +351,7 @@ func TestGetRelayerAccountPrivateKey_set_pk_with_global_env(t *testing.T) {
 		},
 		envSetter: func() {
 			// Overwrite the PK for the first subnet using an env var
-			varName := fmt.Sprintf("%s", accountPrivateKeyEnvVarName)
-			t.Setenv(varName, testPk2)
+			t.Setenv(accountPrivateKeyEnvVarName, testPk2)
 		},
 		expectedOverwritten: true,
 		resultVerifier: func(c Config) bool {
diff --git a/main/main.go b/main/main.go
index 2fe475df..6e5b74cc 100644
--- a/main/main.go
+++ b/main/main.go
@@ -284,7 +284,6 @@ func initMetrics() (prometheus.Gatherer, prometheus.Registerer, error) {
 	registry := prometheus.NewRegistry()
 	if err := gatherer.Register("app", registry); err != nil {
 		return nil, nil, err
-
 	}
 	return gatherer, registry, nil
 }
diff --git a/peers/external_handler.go b/peers/external_handler.go
index 718ad10f..8886d506 100644
--- a/peers/external_handler.go
+++ b/peers/external_handler.go
@@ -133,7 +133,6 @@ func (h *RelayerExternalHandler) HandleInbound(_ context.Context, inboundMessage
 
 			h.responseChans[chainID] <- inboundMessage
 		}(inboundMessage, chainID)
-
 	} else {
 		inboundMessage.OnFinishedHandling()
 	}
diff --git a/relayer/message_relayer.go b/relayer/message_relayer.go
index 4d6dc0af..9b3ded53 100644
--- a/relayer/message_relayer.go
+++ b/relayer/message_relayer.go
@@ -159,7 +159,7 @@ func (r *messageRelayer) createSignedMessage(requestID uint32) (*warp.Message, e
 	// If new peers are connected, AppRequests may fail while the handshake is in progress.
 	// In that case, AppRequests to those nodes will be retried in the next iteration of the retry loop.
 	nodeIDs := set.NewSet[ids.NodeID](len(nodeValidatorIndexMap))
-	for node, _ := range nodeValidatorIndexMap {
+	for node := range nodeValidatorIndexMap {
 		nodeIDs.Add(node)
 	}
 
@@ -426,7 +426,6 @@ func (r *messageRelayer) getCurrentCanonicalValidatorSet() ([]*warp.Validator, u
 func (r *messageRelayer) isValidSignatureResponse(
 	response message.InboundMessage,
 	pubKey *bls.PublicKey) (blsSignatureBuf, bool) {
-
 	// If the handler returned an error response, count the response and continue
 	if response.Op() == message.AppRequestFailedOp {
 		r.logger.Debug(
diff --git a/relayer/relayer.go b/relayer/relayer.go
index fb22b030..56e26318 100644
--- a/relayer/relayer.go
+++ b/relayer/relayer.go
@@ -46,7 +46,6 @@ func NewRelayer(
 	responseChan chan message.InboundMessage,
 	destinationClients map[ids.ID]vms.DestinationClient,
 ) (*Relayer, vms.Subscriber, error) {
-
 	sub := vms.NewSubscriber(logger, sourceSubnetInfo)
 
 	subnetID, err := ids.FromString(sourceSubnetInfo.SubnetID)
diff --git a/vms/evm/contract_message_test.go b/vms/evm/contract_message_test.go
index 8ee3baa8..865f1442 100644
--- a/vms/evm/contract_message_test.go
+++ b/vms/evm/contract_message_test.go
@@ -7,44 +7,12 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/logging"
-	"github.com/ava-labs/avalanchego/vms/platformvm/warp"
 	"github.com/ava-labs/awm-relayer/config"
-	warpPayload "github.com/ava-labs/subnet-evm/warp/payload"
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/mock/gomock"
 )
 
-// Used to create a valid unsigned message for testing. Should not be used directly in tests.
-func createUnsignedMessage() *warp.UnsignedMessage {
-	sourceChainID, err := ids.FromString("yH8D7ThNJkxmtkuv2jgBa4P1Rn3Qpr4pPr7QYNfcdoS6k6HWp")
-	if err != nil {
-		return nil
-	}
-	destinationChainID, err := ids.FromString("11111111111111111111111111111111LpoYY")
-	if err != nil {
-		return nil
-	}
-
-	payload, err := warpPayload.NewAddressedPayload(
-		common.HexToAddress("27aE10273D17Cd7e80de8580A51f476960626e5f"),
-		common.Hash(destinationChainID),
-		common.HexToAddress("1234123412341234123412341234123412341234"),
-		[]byte{},
-	)
-	if err != nil {
-		return nil
-	}
-
-	unsignedMsg, err := warp.NewUnsignedMessage(0, sourceChainID, payload.Bytes())
-	if err != nil {
-		return nil
-	}
-	return unsignedMsg
-}
-
 func TestUnpack(t *testing.T) {
 	ctrl := gomock.NewController(t)