diff --git a/packages/plugin-evm/src/actions/swap.ts b/packages/plugin-evm/src/actions/swap.ts
index 1c1a2e5b1b1..0543df97b5c 100644
--- a/packages/plugin-evm/src/actions/swap.ts
+++ b/packages/plugin-evm/src/actions/swap.ts
@@ -6,11 +6,6 @@ import {
     generateObjectDeprecated,
     ModelClass,
 } from "@elizaos/core";
-import {
-    composeContext,
-    generateObjectDeprecated,
-    ModelClass,
-} from "@elizaos/core";
 import {
     createConfig,
     executeRoute,
@@ -113,27 +108,6 @@ export const swapAction = {
         callback?: any
     ) => {
         console.log("Swap action handler called");
-        const walletProvider = initWalletProvider(runtime);
-        const action = new SwapAction(walletProvider);
-
-        // Compose swap context
-        const swapContext = composeContext({
-            state,
-            template: swapTemplate,
-        });
-        const content = await generateObjectDeprecated({
-            runtime,
-            context: swapContext,
-            modelClass: ModelClass.LARGE,
-        });
-
-        const swapOptions: SwapParams = {
-            chain: content.chain,
-            fromToken: content.inputToken,
-            toToken: content.outputToken,
-            amount: content.amount,
-            slippage: content.slippage,
-        };
 
         try {
             const walletProvider = initWalletProvider(runtime);
@@ -149,12 +123,20 @@ export const swapAction = {
             );
 
             // Generate swap details object
-            const swapDetails = (await generateObjectDeprecated({
+            const content = (await generateObjectDeprecated({
                 runtime,
                 context: contextWithChains,
                 modelClass: ModelClass.SMALL,
             })) as SwapParams;
 
+            const swapOptions: SwapParams = {
+                chain: content.chain,
+                fromToken: content.fromToken,
+                toToken: content.toToken,
+                amount: content.amount,
+                slippage: content.slippage,
+            };
+
             const action = new SwapAction(walletProvider);
             const swapResp = await action.swap(swapOptions);
             if (callback) {