diff --git a/.gitmodules b/.gitmodules
index a6337f61..e1247196 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "lib/ds-test"]
 	path = lib/ds-test
 	url = https://github.com/dapphub/ds-test
-[submodule "lib/forge-std"]
-	path = lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
diff --git a/contracts/bonding/BondingManager.sol b/contracts/bonding/BondingManager.sol
index d7fab180..ccc93130 100644
--- a/contracts/bonding/BondingManager.sol
+++ b/contracts/bonding/BondingManager.sol
@@ -332,8 +332,6 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
             // based on rewards for currentRound
             IMinter mtr = minter();
             uint256 rewards = PreciseMathUtils.percOf(
-                // TODO: Should this be only `currentMintableTokens()`? The math here is different than what we have in
-                // `minter().createReward`, seems like we're double-counting the already minted tokens here.
                 mtr.currentMintableTokens().add(mtr.currentMintedTokens()),
                 totalStake,
                 currentRoundTotalActiveStake
@@ -344,7 +342,7 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
             rewards = rewards.sub(treasuryRewards);
 
             uint256 transcoderCommissionRewards = MathUtils.percOf(rewards, earningsPool.transcoderRewardCut);
-            uint256 delegatorsRewards = rewards.sub(transcoderCommissionRewards).sub(treasuryRewards);
+            uint256 delegatorsRewards = rewards.sub(transcoderCommissionRewards);
 
             prevEarningsPool.cumulativeRewardFactor = PreciseMathUtils.percOf(
                 earningsPool.cumulativeRewardFactor,
@@ -385,7 +383,6 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
         uint256 _slashAmount,
         uint256 _finderFee
     ) external whenSystemNotPaused onlyVerifier {
-        // TODO: Verify if this is right? Seems like it was missing from this func.
         _autoClaimEarnings(_transcoder);
 
         Delegator storage del = delegators[_transcoder];
diff --git a/foundry.toml b/foundry.toml
index 50e68356..793b21e2 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -1,4 +1,3 @@
-profile = { default = { libs = ["node_modules", "lib"] } }
 [default]
 src = 'src'
 out = 'foundry_artifacts'
diff --git a/lib/forge-std b/lib/forge-std
deleted file mode 160000
index 77f254d8..00000000
--- a/lib/forge-std
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 77f254d842cba6e1afe00dd2c206c36a8b9b5a84