diff --git a/contracts/src/v0.8/dev/automation/2_1/KeeperRegistryBase2_1.sol b/contracts/src/v0.8/dev/automation/2_1/KeeperRegistryBase2_1.sol
index 24ecb85eea8..65f580d1df6 100644
--- a/contracts/src/v0.8/dev/automation/2_1/KeeperRegistryBase2_1.sol
+++ b/contracts/src/v0.8/dev/automation/2_1/KeeperRegistryBase2_1.sol
@@ -287,7 +287,7 @@ abstract contract KeeperRegistryBase2_1 is ConfirmedOwner, ExecutionPrevention {
     // 0 bytes left in 1st EVM word - not written to in transmit
     uint96 amountSpent;
     uint96 balance;
-    uint32 lastPerformedBlockNumber; // TODO time expires in 2100
+    uint32 lastPerformedBlockNumber;
     // 2 bytes left in 2nd EVM word - written in transmit path
     address target;
     // 12 bytes left in 3rd EVM word - neither written to nor read in transmit
@@ -387,7 +387,7 @@ abstract contract KeeperRegistryBase2_1 is ConfirmedOwner, ExecutionPrevention {
    * @notice the trigger structure for both conditional and ready trigger types
    */
   struct BlockTrigger {
-    uint32 blockNum; // TODO - only 34 years worth of blocks on arbitrum...
+    uint32 blockNum;
     bytes32 blockHash;
   }
 
@@ -445,7 +445,6 @@ abstract contract KeeperRegistryBase2_1 is ConfirmedOwner, ExecutionPrevention {
    * @param fastGasFeed address of the Fast Gas price feed
    */
   constructor(Mode mode, address link, address linkNativeFeed, address fastGasFeed) ConfirmedOwner(msg.sender) {
-    // TODO - logic contracts don't need an owner or ownable functions
     i_mode = mode;
     i_link = LinkTokenInterface(link);
     i_linkNativeFeed = AggregatorV3Interface(linkNativeFeed);
@@ -456,8 +455,6 @@ abstract contract KeeperRegistryBase2_1 is ConfirmedOwner, ExecutionPrevention {
   // GETTERS //
   /////////////
 
-  // TODO - these don't need to be on the Base contract
-
   function getMode() external view returns (Mode) {
     return i_mode;
   }
@@ -663,7 +660,6 @@ abstract contract KeeperRegistryBase2_1 is ConfirmedOwner, ExecutionPrevention {
   }
 
   function getTriggerType(uint256 upkeepId) public pure returns (Trigger) {
-    // TODO - alternatively, we could just look this up from storage
     bytes32 rawID = bytes32(upkeepId);
     bytes1 empty = bytes1(0);
     for (uint256 idx = 4; idx < 15; idx++) {
diff --git a/contracts/src/v0.8/dev/automation/2_1/KeeperRegistryLogicA2_1.sol b/contracts/src/v0.8/dev/automation/2_1/KeeperRegistryLogicA2_1.sol
index 5fb28f53120..fbc925a03b0 100644
--- a/contracts/src/v0.8/dev/automation/2_1/KeeperRegistryLogicA2_1.sol
+++ b/contracts/src/v0.8/dev/automation/2_1/KeeperRegistryLogicA2_1.sol
@@ -7,7 +7,6 @@ import "./Chainable.sol";
 import {AutomationForwarder} from "./AutomationForwarder.sol";
 import "../../../interfaces/automation/UpkeepTranscoderInterfaceV2.sol";
 
-// TODO - we can probably combine these interfaces
 import "../../../interfaces/automation/MigratableKeeperRegistryInterface.sol";
 import "../../../interfaces/automation/MigratableKeeperRegistryInterfaceV2.sol";
 
@@ -192,7 +191,7 @@ contract KeeperRegistryLogicA2_1 is
 
   function registerUpkeep(
     address target,
-    uint32 gasLimit, // TODO - we may want to allow 0 for "unlimited"
+    uint32 gasLimit,
     address admin,
     Trigger triggerType,
     bytes calldata checkData,
@@ -233,7 +232,7 @@ contract KeeperRegistryLogicA2_1 is
    */
   function registerUpkeep(
     address target,
-    uint32 gasLimit, // TODO - we may want to allow 0 for "unlimited"
+    uint32 gasLimit,
     address admin,
     bytes calldata checkData,
     bytes calldata offchainConfig