diff --git a/script/Constants.sol b/script/Constants.sol
index 6bc6b0d..66c1dd2 100644
--- a/script/Constants.sol
+++ b/script/Constants.sol
@@ -13,7 +13,6 @@ address constant _ARBITRUM_MAINNET_COUNCIL = address(0x101);
 address constant _ARBITRUM_SEPOLIA_GRAPH_TOKEN = 0x1A1af8B44fD59dd2bbEb456D1b7604c7bd340702;
 address constant _ARBITRUM_SEPOLIA_HORIZON_STAKING = 0x3F53F9f9a5d7F36dCC869f8D2F227499c411c0cf;
 address constant _ARBITRUM_SEPOLIA_EPOCH_MANAGER = 0x7975475801BEf845f10Ce7784DC69aB1e0344f11;
-address constant _ARBITRUM_SEPOLIA_GOVERNOR = 0xadE6B8EB69a49B56929C1d4F4b428d791861dB6f;
 address constant _ARBITRUM_SEPOLIA_ARBITRATOR = address(0x100);
 address constant _ARBITRUM_SEPOLIA_COUNCIL = address(0x101);
 
diff --git a/src/contracts/HorizonAccountingExtension.sol b/src/contracts/HorizonAccountingExtension.sol
index 595559b..32d0a0b 100644
--- a/src/contracts/HorizonAccountingExtension.sol
+++ b/src/contracts/HorizonAccountingExtension.sol
@@ -232,7 +232,6 @@ contract HorizonAccountingExtension is Validator, IHorizonAccountingExtension {
 
       // Check the balance in the contract
       // If not enough balance, slash some users to get enough balance
-      // TODO: How many iterations should we do?
       while (disputeBalance[_disputeId] < _rewardAmount) {
         _slash(_disputeId, MAX_USERS_TO_SLASH, maxUsersToCheck, _result, _status);
       }
@@ -407,8 +406,6 @@ contract HorizonAccountingExtension is Validator, IHorizonAccountingExtension {
       if (_slashAmount > 0) {
         // Slash the user
         HORIZON_STAKING.slash(_user, _slashAmount, _slashAmount, address(this));
-        // TODO: What if `MIN_THAWING_PERIOD` has passed, all provision tokens have been thawed
-        //       and slashing is skipped or reverts (bricking `claimEscalationReward()`)?
 
         _unbond(_user, _slashAmount);
 
diff --git a/test/integration/arbitrum/IntegrationBase.t.sol b/test/integration/arbitrum/IntegrationBase.t.sol
index a651f95..7a961ba 100644
--- a/test/integration/arbitrum/IntegrationBase.t.sol
+++ b/test/integration/arbitrum/IntegrationBase.t.sol
@@ -4,8 +4,6 @@ pragma solidity 0.8.26;
 import {IAccessController} from '@defi-wonderland/prophet-core/solidity/interfaces/access/IAccessController.sol';
 import {ValidatorLib} from '@defi-wonderland/prophet-core/solidity/libraries/ValidatorLib.sol';
 
-import {_ARBITRUM_SEPOLIA_GOVERNOR} from 'script/Constants.sol';
-
 import 'forge-std/Test.sol';
 import 'script/Deploy.s.sol';
 
@@ -19,9 +17,6 @@ contract IntegrationBase is Deploy, Test, Helpers {
   uint256 internal constant _ARBITRUM_MAINNET_FORK_BLOCK = 240_000_000;
   uint256 internal constant _ARBITRUM_SEPOLIA_FORK_BLOCK = 83_750_000;
 
-  // The Graph
-  address internal _governor; // TODO: Remove if unused
-
   // Users
   address internal _requester;
   address internal _proposer;
@@ -45,9 +40,6 @@ contract IntegrationBase is Deploy, Test, Helpers {
     super.setUp();
     run();
 
-    // Define The Graph accounts
-    _governor = _ARBITRUM_SEPOLIA_GOVERNOR;
-
     // Set user accounts
     _requester = makeAddr('requester');
     _proposer = makeAddr('proposer');
diff --git a/yarn.lock b/yarn.lock
index ed598be..726adb5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1684,9 +1684,9 @@ solhint-community@4.0.0:
   optionalDependencies:
     prettier "^2.8.3"
 
-"solmate@git+https://github.com/transmissions11/solmate.git#bfc9c25865a274a7827fea5abf6e4fb64fc64e6c":
+"solmate@https://github.com/transmissions11/solmate.git#bfc9c25865a274a7827fea5abf6e4fb64fc64e6c":
   version "6.1.0"
-  resolved "git+https://github.com/transmissions11/solmate.git#bfc9c25865a274a7827fea5abf6e4fb64fc64e6c"
+  resolved "https://github.com/transmissions11/solmate.git#bfc9c25865a274a7827fea5abf6e4fb64fc64e6c"
 
 sort-object-keys@^1.1.3:
   version "1.1.3"