more fixes

l1-contracts/contracts/common/libraries/Merkle.sol

@@ -14,7 +14,6 @@ library Merkle {
 
     /// @dev Calculate Merkle root by the provided Merkle proof.
     /// NOTE: When using this function, check that the _path length is equal to the tree height to prevent shorter/longer paths attack
-    /// however, for chains settling on GW the proof includes the GW proof, so the path increases. See Mailbox for more details.
     /// @param _path Merkle path from the leaf to the root
     /// @param _index Leaf index in the tree
     /// @param _itemHash Hash of leaf content

l1-contracts/contracts/upgrades/L1GenesisUpgrade.sol

@@ -19,7 +19,6 @@ import {IBridgehub} from "../bridgehub/IBridgehub.sol";
 
 import {VerifierParams} from "../state-transition/chain-interfaces/IVerifier.sol";
 import {L2ContractHelper} from "../common/libraries/L2ContractHelper.sol";
-import {L1GatewayHelper} from "./L1GatewayHelper.sol";
 
 /// @author Matter Labs
 /// @custom:security-contact [email protected]
@@ -39,8 +38,6 @@ contract L1GenesisUpgrade is IL1GenesisUpgrade, BaseZkSyncUpgradeGenesis {
         bytes calldata _forceDeploymentsData,
         bytes[] calldata _factoryDeps
     ) public override returns (bytes32) {
-        address baseTokenAddress = IBridgehub(s.bridgehub).baseToken(_chainId);
-
         L2CanonicalTransaction memory l2ProtocolUpgradeTx;
 
         {