diff --git a/babylonclient/babyloncontroller.go b/babylonclient/babyloncontroller.go
index 83f38ae..50c4378 100644
--- a/babylonclient/babyloncontroller.go
+++ b/babylonclient/babyloncontroller.go
@@ -904,7 +904,6 @@ func (bc *BabylonController) QueryBtcLightClientTip() (*btclctypes.BTCHeaderInfo
 }
 
 func (bc *BabylonController) ActivateDelegation(
-	_ context.Context,
 	stakingTxHash chainhash.Hash,
 	proof *btcctypes.BTCSpvProof) (*pv.RelayerTxResponse, error) {
 	msg := &btcstypes.MsgAddBTCDelegationInclusionProof{
diff --git a/itest/e2e_test.go b/itest/e2e_test.go
index d446092..7fd123f 100644
--- a/itest/e2e_test.go
+++ b/itest/e2e_test.go
@@ -1313,7 +1313,6 @@ func TestSendingStakingTransactionWithPreApproval(t *testing.T) {
 	tm.mineNEmptyBlocks(t, params.ConfirmationTimeBlocks, true)
 
 	_, err = tm.BabylonClient.ActivateDelegation(
-		context.Background(),
 		*txHash,
 		proof,
 	)
diff --git a/staker/stakerapp.go b/staker/stakerapp.go
index 9409421..0f455a3 100644
--- a/staker/stakerapp.go
+++ b/staker/stakerapp.go
@@ -261,8 +261,7 @@ func (app *App) Start() error {
 		// although staker without node is not very useful
 
 		app.logger.Infof("Connecting to node backend: %s", app.config.BtcNodeBackendConfig.Nodetype)
-		err := app.notifier.Start()
-		if err != nil {
+		if err := app.notifier.Start(); err != nil {
 			startErr = err
 			return
 		}
@@ -276,9 +275,7 @@ func (app *App) Start() error {
 			return
 		}
 
-		err = app.feeEstimator.Start()
-
-		if err != nil {
+		if err = app.feeEstimator.Start(); err != nil {
 			startErr = err
 			return
 		}
diff --git a/stakerservice/service.go b/stakerservice/service.go
index a9b2358..913f43e 100644
--- a/stakerservice/service.go
+++ b/stakerservice/service.go
@@ -588,8 +588,8 @@ func (s *StakerService) RunUntilShutdown(ctx context.Context) error {
 		return fmt.Errorf(format, args...)
 	}
 
-	err := s.staker.Start()
-	if err != nil {
+	//nolint:contextcheck
+	if err := s.staker.Start(); err != nil {
 		return mkErr("error starting staker: %w", err)
 	}