diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 3a54544ce7..ef8f2a2441 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -1395,7 +1395,6 @@ func setEtherbase(ctx *cli.Context, cfg *ethconfig.Config) {
 	}
 
 	cfg.Miner.Etherbase = common.BytesToAddress(b)
-
 }
 
 func SetP2PConfig(ctx *cli.Context, cfg *p2p.Config) {
diff --git a/consensus/beacon/consensus.go b/consensus/beacon/consensus.go
index 31d562b149..c3c0ded84d 100644
--- a/consensus/beacon/consensus.go
+++ b/consensus/beacon/consensus.go
@@ -75,6 +75,7 @@ func New(ethone consensus.Engine) *Beacon {
 // isPostMerge reports whether the given block number is assumed to be post-merge.
 // Here we check the MergeNetsplitBlock to allow configuring networks with a PoW or
 // PoA chain for unit testing purposes.
+// nolint : unused
 func isPostMerge(config *params.ChainConfig, blockNum uint64, timestamp uint64) bool {
 	mergedAtGenesis := config.TerminalTotalDifficulty != nil && config.TerminalTotalDifficulty.Sign() == 0
 	return mergedAtGenesis ||
diff --git a/eth/filters/test_backend.go b/eth/filters/test_backend.go
index bf9a9f8110..404d8035c2 100644
--- a/eth/filters/test_backend.go
+++ b/eth/filters/test_backend.go
@@ -14,6 +14,7 @@ import (
 	rpc "github.com/ethereum/go-ethereum/rpc"
 )
 
+// nolint : unused
 type TestBackend struct {
 	DB              ethdb.Database
 	sections        uint64
diff --git a/miner/worker.go b/miner/worker.go
index 5d4e36bed9..83dec33cae 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -1344,9 +1344,12 @@ func (w *worker) fillTransactions(interrupt *atomic.Int32, env *environment) err
 		filter.BlobFee = uint256.MustFromBig(eip4844.CalcBlobFee(w.chainConfig, env.header))
 	}
 
-	var (
-		localPlainTxs, remotePlainTxs, localBlobTxs, remoteBlobTxs map[common.Address][]*txpool.LazyTransaction
-	)
+	// bor: kept for reference, can remove later
+	/*
+		var (
+			localPlainTxs, remotePlainTxs, localBlobTxs, remoteBlobTxs map[common.Address][]*txpool.LazyTransaction
+		)
+	*/
 
 	filter.OnlyPlainTxs, filter.OnlyBlobTxs = true, false
 	pendingPlainTxs := w.eth.TxPool().Pending(filter)
@@ -1374,8 +1377,9 @@ func (w *worker) fillTransactions(interrupt *atomic.Int32, env *environment) err
 		plainTxs := newTransactionsByPriceAndNonce(env.signer, prioPlainTxs, env.header.BaseFee)
 		blobTxs := newTransactionsByPriceAndNonce(env.signer, prioBlobTxs, env.header.BaseFee)
 
-		plainTxs = newTransactionsByPriceAndNonce(env.signer, localPlainTxs, env.header.BaseFee)
-		blobTxs = newTransactionsByPriceAndNonce(env.signer, localBlobTxs, env.header.BaseFee)
+		// bor: kept for reference, can remove later
+		// plainTxs = newTransactionsByPriceAndNonce(env.signer, localPlainTxs, env.header.BaseFee)
+		// blobTxs = newTransactionsByPriceAndNonce(env.signer, localBlobTxs, env.header.BaseFee)
 
 		if err := w.commitTransactions(env, plainTxs, blobTxs, interrupt, new(uint256.Int)); err != nil {
 			return err
@@ -1385,8 +1389,9 @@ func (w *worker) fillTransactions(interrupt *atomic.Int32, env *environment) err
 		plainTxs := newTransactionsByPriceAndNonce(env.signer, normalPlainTxs, env.header.BaseFee)
 		blobTxs := newTransactionsByPriceAndNonce(env.signer, normalBlobTxs, env.header.BaseFee)
 
-		plainTxs = newTransactionsByPriceAndNonce(env.signer, remotePlainTxs, env.header.BaseFee)
-		blobTxs = newTransactionsByPriceAndNonce(env.signer, remoteBlobTxs, env.header.BaseFee)
+		// bor: kept for reference, can remove later
+		// plainTxs = newTransactionsByPriceAndNonce(env.signer, remotePlainTxs, env.header.BaseFee)
+		// blobTxs = newTransactionsByPriceAndNonce(env.signer, remoteBlobTxs, env.header.BaseFee)
 
 		if err := w.commitTransactions(env, plainTxs, blobTxs, interrupt, new(uint256.Int)); err != nil {
 			return err