diff --git a/aggregator/pkg/server.go b/aggregator/pkg/server.go
index f28fc1ef62..1a75888fa3 100644
--- a/aggregator/pkg/server.go
+++ b/aggregator/pkg/server.go
@@ -60,8 +60,6 @@ func (agg *Aggregator) ProcessOperatorSignedTaskResponseV2(signedTaskResponse *t
 		return errors.New("invalid response: nil signature")
 	}
 
-	taskIndex := uint32(0)
-
 	// The Aggregator may receive the Task Identifier after the operators.
 	// If that's the case, we won't know about the task at this point
 	// so we make GetTaskIndex retryable, waiting for some seconds,
diff --git a/contracts/src/core/BatcherPaymentService.sol b/contracts/src/core/BatcherPaymentService.sol
index 379dd03796..0df8eceb09 100644
--- a/contracts/src/core/BatcherPaymentService.sol
+++ b/contracts/src/core/BatcherPaymentService.sol
@@ -14,7 +14,7 @@ contract BatcherPaymentService is
     UUPSUpgradeable,
     BatcherPaymentServiceStorage
 {
-    // CONSTANTS = 100 Blocks * 12 second block time.
+    // Delay a user must wait between calling unlock() and being able to withdraw.
     uint256 public constant UNLOCK_BLOCK_TIME = 3600 seconds;
 
     // EVENTS