diff --git a/statediff/builder_test.go b/statediff/builder_test.go
index b5790248a..3e386575a 100644
--- a/statediff/builder_test.go
+++ b/statediff/builder_test.go
@@ -702,7 +702,7 @@ func TestBuilder(t *testing.T) {
 		if err != nil {
 			t.Error(err)
 		}
-		expectedStateDiffRlp, err := rlp.EncodeToBytes(&test.expected)
+		expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected)
 		if err != nil {
 			t.Error(err)
 		}
@@ -965,7 +965,7 @@ func TestBuilderWithIntermediateNodes(t *testing.T) {
 		if err != nil {
 			t.Error(err)
 		}
-		expectedStateDiffRlp, err := rlp.EncodeToBytes(&test.expected)
+		expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected)
 		if err != nil {
 			t.Error(err)
 		}
@@ -1155,7 +1155,7 @@ func TestBuilderWithWatchedAddressList(t *testing.T) {
 		if err != nil {
 			t.Error(err)
 		}
-		expectedStateDiffRlp, err := rlp.EncodeToBytes(&test.expected)
+		expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected)
 		if err != nil {
 			t.Error(err)
 		}
@@ -1385,7 +1385,7 @@ func TestBuilderWithRemovedAccountAndStorage(t *testing.T) {
 		if err != nil {
 			t.Error(err)
 		}
-		expectedStateDiffRlp, err := rlp.EncodeToBytes(&test.expected)
+		expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected)
 		if err != nil {
 			t.Error(err)
 		}
@@ -1989,7 +1989,7 @@ func TestBuilderWithRemovedNonWatchedAccount(t *testing.T) {
 			t.Error(err)
 		}
 
-		expectedStateDiffRlp, err := rlp.EncodeToBytes(&test.expected)
+		expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected)
 		if err != nil {
 			t.Error(err)
 		}
@@ -2159,7 +2159,7 @@ func TestBuilderWithRemovedWatchedAccount(t *testing.T) {
 			t.Error(err)
 		}
 
-		expectedStateDiffRlp, err := rlp.EncodeToBytes(&test.expected)
+		expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected)
 		if err != nil {
 			t.Error(err)
 		}
@@ -2391,7 +2391,7 @@ func TestBuilderWithMovedAccount(t *testing.T) {
 		if err != nil {
 			t.Error(err)
 		}
-		expectedStateDiffRlp, err := rlp.EncodeToBytes(&test.expected)
+		expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected)
 		if err != nil {
 			t.Error(err)
 		}
@@ -2527,7 +2527,7 @@ func TestBuilderWithMovedAccountOnlyLeafs(t *testing.T) {
 		if err != nil {
 			t.Error(err)
 		}
-		expectedStateDiffRlp, err := rlp.EncodeToBytes(&test.expected)
+		expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected)
 		if err != nil {
 			t.Error(err)
 		}
@@ -2758,7 +2758,7 @@ func TestBuildStateTrie(t *testing.T) {
 		if err != nil {
 			t.Error(err)
 		}
-		expectedStateTrieRlp, err := rlp.EncodeToBytes(&test.expected)
+		expectedStateTrieRlp, err := rlp.EncodeToBytes(test.expected)
 		if err != nil {
 			t.Error(err)
 		}
diff --git a/statediff/indexer/ipld/eth_header.go b/statediff/indexer/ipld/eth_header.go
index 5cd28a46e..9bc307277 100644
--- a/statediff/indexer/ipld/eth_header.go
+++ b/statediff/indexer/ipld/eth_header.go
@@ -46,7 +46,7 @@ var _ node.Node = (*EthHeader)(nil)
 
 // NewEthHeader converts a *types.Header into an EthHeader IPLD node
 func NewEthHeader(header *types.Header) (*EthHeader, error) {
-	headerRLP, err := rlp.EncodeToBytes(&header)
+	headerRLP, err := rlp.EncodeToBytes(header)
 	if err != nil {
 		return nil, err
 	}
diff --git a/statediff/mainnet_tests/builder_test.go b/statediff/mainnet_tests/builder_test.go
index da755010d..c487304f9 100644
--- a/statediff/mainnet_tests/builder_test.go
+++ b/statediff/mainnet_tests/builder_test.go
@@ -420,7 +420,7 @@ func init() {
 	}
 	db = rawdb.NewMemoryDatabase()
 	genesisBlock = core.DefaultGenesisBlock().MustCommit(db)
-	genBy, err := rlp.EncodeToBytes(&genesisBlock)
+	genBy, err := rlp.EncodeToBytes(genesisBlock)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -671,7 +671,7 @@ func TestBuilderOnMainnetBlocks(t *testing.T) {
 		if err != nil {
 			t.Error(err)
 		}
-		receivedStateDiffRlp, err := rlp.EncodeToBytes(&diff)
+		receivedStateDiffRlp, err := rlp.EncodeToBytes(diff)
 		if err != nil {
 			t.Error(err)
 		}
diff --git a/statediff/service_test.go b/statediff/service_test.go
index abd5f2cf1..c3060601d 100644
--- a/statediff/service_test.go
+++ b/statediff/service_test.go
@@ -235,7 +235,7 @@ func testErrorInStateDiffAt(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	expectedBlockRlp, err := rlp.EncodeToBytes(&testBlock1)
+	expectedBlockRlp, err := rlp.EncodeToBytes(testBlock1)
 	if err != nil {
 		t.Error(err)
 	}
@@ -269,7 +269,7 @@ func testErrorInStateDiffAt(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	stateDiffPayloadRlp, err := rlp.EncodeToBytes(&stateDiffPayload)
+	stateDiffPayloadRlp, err := rlp.EncodeToBytes(stateDiffPayload)
 	if err != nil {
 		t.Error(err)
 	}
diff --git a/statediff/test_helpers/mocks/service_test.go b/statediff/test_helpers/mocks/service_test.go
index 2736bfd08..fa073393a 100644
--- a/statediff/test_helpers/mocks/service_test.go
+++ b/statediff/test_helpers/mocks/service_test.go
@@ -97,7 +97,7 @@ func testSubscriptionAPI(t *testing.T) {
 	defer chain.Stop()
 	block0 = test_helpers.Genesis
 	block1 = blocks[0]
-	expectedBlockRlp, _ := rlp.EncodeToBytes(&block1)
+	expectedBlockRlp, _ := rlp.EncodeToBytes(block1)
 	mockReceipt := &types.Receipt{
 		BlockNumber: block1.Number(),
 		BlockHash:   block1.Hash(),
@@ -189,7 +189,7 @@ func testHTTPAPI(t *testing.T) {
 	defer chain.Stop()
 	block0 = test_helpers.Genesis
 	block1 = blocks[0]
-	expectedBlockRlp, _ := rlp.EncodeToBytes(&block1)
+	expectedBlockRlp, _ := rlp.EncodeToBytes(block1)
 	mockReceipt := &types.Receipt{
 		BlockNumber: block1.Number(),
 		BlockHash:   block1.Hash(),