diff --git a/script/3_Setup.s.sol b/script/3_Setup.s.sol
index 2284f3c0..cdc419ff 100644
--- a/script/3_Setup.s.sol
+++ b/script/3_Setup.s.sol
@@ -40,6 +40,10 @@ contract SetupScript is BaseScript {
         exocoreLzEndpoint = ILayerZeroEndpointV2(stdJson.readAddress(deployedContracts, ".exocore.lzEndpoint"));
         require(address(exocoreLzEndpoint) != address(0), "exocoreLzEndpoint address should not be empty");
 
+        if (!useExocorePrecompileMock) {
+            _bindPrecompileMocks();
+        }
+
         // transfer some gas fee to exocore validator set address
         clientChain = vm.createSelectFork(clientChainRPCURL);
         _topUpPlayer(clientChain, address(0), deployer, exocoreValidatorSet.addr, 0.2 ether);
@@ -98,7 +102,7 @@ contract SetupScript is BaseScript {
         whitelistTokensBytes32[1] = bytes32(bytes20(VIRTUAL_STAKED_ETH_ADDRESS));
         decimals[1] = 18;
         tvlLimits[1] = 1e8 ether;
-        names[1] = "RestakeToken";
+        names[1] = "StakedETH";
         metaData[1] = "";
 
         uint256 messageLength = TOKEN_ADDRESS_BYTES_LENGTH * whitelistTokensBytes32.length + 2;
diff --git a/src/storage/ClientChainGatewayStorage.sol b/src/storage/ClientChainGatewayStorage.sol
index d32bbaca..5d3cfed6 100644
--- a/src/storage/ClientChainGatewayStorage.sol
+++ b/src/storage/ClientChainGatewayStorage.sol
@@ -43,7 +43,6 @@ contract ClientChainGatewayStorage is BootstrapStorage {
     /* ----------------------------- restaking      ----------------------------- */
     event ClaimSucceeded(address token, address recipient, uint256 amount);
     event WithdrawRewardResult(bool indexed success, address indexed token, address indexed withdrawer, uint256 amount);
-    event RegisterTokensResult(bool indexed success);
 
     /* -------------------------------------------------------------------------- */
     /*                                   Errors                                   */
diff --git a/test/foundry/ExocoreDeployer.t.sol b/test/foundry/ExocoreDeployer.t.sol
index 1b0e5bf4..ada6d332 100644
--- a/test/foundry/ExocoreDeployer.t.sol
+++ b/test/foundry/ExocoreDeployer.t.sol
@@ -89,7 +89,6 @@ contract ExocoreDeployer is Test {
 
     event MessageSent(GatewayStorage.Action indexed act, bytes32 packetId, uint64 nonce, uint256 nativeFee);
     event NewPacket(uint32, address, bytes32, uint64, bytes);
-    event RegisterTokensResult(bool indexed success);
     event WhitelistTokenAdded(address _token);
     event VaultCreated(address underlyingToken, address vault);