diff --git a/l1-contracts/contracts/bridge/BridgeHelper.sol b/l1-contracts/contracts/bridge/BridgeHelper.sol
index 422ad45e9..bcc59327f 100644
--- a/l1-contracts/contracts/bridge/BridgeHelper.sol
+++ b/l1-contracts/contracts/bridge/BridgeHelper.sol
@@ -7,7 +7,6 @@ pragma solidity 0.8.24;
 import {IERC20Metadata} from "@openzeppelin/contracts-v4/token/ERC20/extensions/IERC20Metadata.sol";
 import {ETH_TOKEN_ADDRESS} from "../common/Config.sol";
 import {DataEncoding} from "../common/libraries/DataEncoding.sol";
-import {NEW_ENCODING_VERSION} from "./asset-router/IAssetRouterBase.sol";
 
 /**
  * @author Matter Labs
diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol
index acd89b8ef..d9675912a 100644
--- a/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol
+++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol
@@ -456,26 +456,17 @@ contract ExperimentalBridgeTest is Test {
         address randomCaller,
         uint256 randomValue
     ) public useRandomToken(randomValue) {
-<<<<<<< HEAD:l1-contracts/test/foundry/l1/unit/concrete/Bridgehub/experimental_bridge.t.sol
         vm.startPrank(bridgeOwner);
         bridgeHub.setAddresses(address(mockSharedBridge), ICTMDeploymentTracker(address(0)), IMessageRoot(address(0)));
         vm.stopPrank();
 
         bytes32 assetId = DataEncoding.encodeNTVAssetId(block.chainid, testTokenAddress);
 
-        if (randomCaller != bridgeOwner) {
-            vm.prank(randomCaller);
-            vm.expectRevert(bytes("Ownable: caller is not the owner"));
-            bridgeHub.addTokenAssetId(assetId);
-        }
-=======
         vm.assume(randomCaller != bridgeOwner);
         vm.assume(randomCaller != bridgeHub.admin());
-
         vm.prank(randomCaller);
         vm.expectRevert(abi.encodeWithSelector(Unauthorized.selector, randomCaller));
-        bridgeHub.addToken(randomAddress);
->>>>>>> b653ac8044f78956d81625dd7ee409d7c9651685:l1-contracts/test/foundry/unit/concrete/Bridgehub/experimental_bridge.t.sol
+        bridgeHub.addTokenAssetId(assetId);
 
         assertTrue(!bridgeHub.assetIdIsRegistered(assetId), "This random address is not registered as a token");
 
diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeAdmin.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeAdmin.t.sol
deleted file mode 100644
index af97e3ed2..000000000
--- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/L1SharedBridgeAdmin.t.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.24;
-
-import {L1SharedBridgeTest} from "./_L1SharedBridge_Shared.t.sol";
-
-/// We are testing all the specified revert and require cases.
-contract L1SharedBridgeAdminTest is L1SharedBridgeTest {
-    uint256 internal randomChainId = 123456;
-
-    function testAdminCanInitializeChainGovernance() public {
-        address randomL2Bridge = makeAddr("randomL2Bridge");
-
-        vm.prank(admin);
-        sharedBridge.initializeChainGovernance(randomChainId, randomL2Bridge);
-
-        assertEq(sharedBridge.l2BridgeAddress(randomChainId), randomL2Bridge);
-    }
-
-    function testAdminCanNotReinitializeChainGovernance() public {
-        address randomNewBridge = makeAddr("randomNewBridge");
-
-        vm.expectRevert("Ownable: caller is not the owner");
-        vm.prank(admin);
-        sharedBridge.reinitializeChainGovernance(randomChainId, randomNewBridge);
-    }
-}
diff --git a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol
index c46059052..fdc42d53e 100644
--- a/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol
+++ b/l1-contracts/test/foundry/l1/unit/concrete/Bridges/L1SharedBridge/_L1SharedBridge_Shared.t.sol
@@ -178,9 +178,6 @@ contract L1AssetRouterTest is Test {
         nativeTokenVault.registerToken(address(token));
         nativeTokenVault.registerEthToken();
         vm.prank(owner);
-        sharedBridge.setPendingAdmin(admin);
-        vm.prank(admin);
-        sharedBridge.acceptAdmin();
 
         vm.store(
             address(sharedBridge),