diff --git a/test/Account.t.sol b/test/Account.t.sol
index d612ef5a..e4b8310b 100644
--- a/test/Account.t.sol
+++ b/test/Account.t.sol
@@ -354,49 +354,4 @@ contract AccountTest is BaseTest {
         uint256 keysCount137 = IthacaAccount(eoaAddress).keyCount();
         assertEq(keysCount137, 2, "Keys should be added on chain 137");
     }
-
-    function testContextKeyHash() public {
-        DelegatedEOA memory d = _randomEIP7702DelegatedEOA();
-
-        PassKey memory key = _randomPassKey();
-        key.k.isSuperAdmin = true;
-
-        vm.prank(d.eoa);
-        d.d.authorize(key.k);
-
-        // Orchestrator workflow
-        vm.prank(d.d.ORCHESTRATOR());
-        ERC7821.Call[] memory calls = new ERC7821.Call[](1);
-        calls[0].data = abi.encodeWithSelector(this.targetFunctionContextKeyHash.selector);
-        calls[0].to = address(this);
-        calls[0].value = 0;
-        bytes memory opData = abi.encode(key.keyHash);
-        bytes memory executionData = abi.encode(calls, opData);
-        d.d.execute(_ERC7821_BATCH_EXECUTION_MODE, executionData);
-
-        assertEq(contextKeyHash, key.keyHash, "Context key hash mismatch orchestrator workflow");
-
-        // Reset context key hash
-        contextKeyHash = bytes32(0);
-
-        // Workflow with opData
-        uint256 nonce = d.d.getNonce(0);
-        bytes memory signature = _sig(key, d.d.computeDigest(calls, nonce));
-        opData = abi.encodePacked(nonce, signature);
-        executionData = abi.encode(calls, opData);
-        d.d.execute(_ERC7821_BATCH_EXECUTION_MODE, executionData);
-
-        assertEq(contextKeyHash, key.keyHash, "Context key hash mismatch orchestrator workflow");
-
-        // Reset context key hash
-        contextKeyHash = bytes32(0);
-
-        // Simple workflow without opData (self-execution)
-        bytes memory emptyOpData;
-        executionData = abi.encode(calls, emptyOpData);
-        vm.prank(address(d.d));
-        d.d.execute(_ERC7821_BATCH_EXECUTION_MODE, executionData);
-
-        assertEq(contextKeyHash, bytes32(0), "Context key hash should be zero for self-execution without opData");
-    }
 }
diff --git a/test/Base.t.sol b/test/Base.t.sol
index 94749645..1765a651 100644
--- a/test/Base.t.sol
+++ b/test/Base.t.sol
@@ -34,7 +34,6 @@ contract BaseTest is SoladyTest {
     EIP7702Proxy eip7702Proxy;
     TargetFunctionPayload[] targetFunctionPayloads;
     Simulator simulator;
-    bytes32 contextKeyHash;
 
     struct TargetFunctionPayload {
         address by;
@@ -95,10 +94,6 @@ contract BaseTest is SoladyTest {
         targetFunctionPayloads.push(TargetFunctionPayload(msg.sender, msg.value, data));
     }
 
-    function targetFunctionContextKeyHash() public payable {
-        contextKeyHash = IthacaAccount(payable(msg.sender)).getContextKeyHash();
-    }
-
     function _setEIP7702Delegation(address eoa) internal {
         vm.etch(eoa, abi.encodePacked(hex"ef0100", address(account)));
     }