diff --git a/src/OptionsCompounder.sol b/src/OptionsCompounder.sol
index 51592aa..0ef67c0 100644
--- a/src/OptionsCompounder.sol
+++ b/src/OptionsCompounder.sol
@@ -50,7 +50,6 @@ contract OptionsCompounder is IFlashLoanReceiver, OwnableUpgradeable, UUPSUpgrad
     uint256 public constant FUTURE_NEXT_PROPOSAL_TIME = 365 days * 100;
 
     /* Storages */
-    address public swapper;
     ILendingPoolAddressesProvider private addressProvider;
     ILendingPool private lendingPool;
     bool private flashloanFinished;
@@ -84,7 +83,6 @@ contract OptionsCompounder is IFlashLoanReceiver, OwnableUpgradeable, UUPSUpgrad
     function initialize(
         address _optionsToken,
         address _addressProvider,
-        address _swapper,
         SwapProps memory _swapProps,
         IOracle _oracle,
         address[] memory _strats
@@ -93,7 +91,6 @@ contract OptionsCompounder is IFlashLoanReceiver, OwnableUpgradeable, UUPSUpgrad
         _setOptionsToken(_optionsToken);
         _setSwapProps(_swapProps);
         _setOracle(_oracle);
-        _setSwapper(_swapper);
         _setStrats(_strats);
         flashloanFinished = true;
         _setAddressProvider(_addressProvider);
@@ -135,17 +132,6 @@ contract OptionsCompounder is IFlashLoanReceiver, OwnableUpgradeable, UUPSUpgrad
         oracle = _oracle;
     }
 
-    function setSwapper(address _swapper) external onlyOwner {
-        _setSwapper(_swapper);
-    }
-
-    function _setSwapper(address _swapper) internal {
-        if (_swapper == address(0)) {
-            revert OptionsCompounder__ParamHasAddressZero();
-        }
-        swapper = _swapper;
-    }
-
     function setAddressProvider(address _addressProvider) external onlyOwner {
         _setAddressProvider(_addressProvider);
     }
@@ -325,7 +311,7 @@ contract OptionsCompounder is IFlashLoanReceiver, OwnableUpgradeable, UUPSUpgrad
             minAmountOut = _getMinAmountOutData(balanceOfUnderlyingToken, swapProps.maxSwapSlippage, address(oracle));
 
             /* Approve the underlying token to make swap */
-            underlyingToken.approve(swapper, balanceOfUnderlyingToken);
+            underlyingToken.approve(swapProps.swapper, balanceOfUnderlyingToken);
 
             /* Swap underlying token to payment token (asset) */
             swapAmountOut = _generalSwap(
@@ -337,7 +323,7 @@ contract OptionsCompounder is IFlashLoanReceiver, OwnableUpgradeable, UUPSUpgrad
             }
 
             /* Approve the underlying token to 0 for safety */
-            underlyingToken.approve(swapper, 0);
+            underlyingToken.approve(swapProps.swapper, 0);
         }
 
         /* Calculate profit and revert if it is not profitable */
diff --git a/test/ItMode_OptionsCompounder.t.sol b/test/ItMode_OptionsCompounder.t.sol
index d86339a..2d67930 100644
--- a/test/ItMode_OptionsCompounder.t.sol
+++ b/test/ItMode_OptionsCompounder.t.sol
@@ -103,7 +103,7 @@ contract ItModeOptionsCompounder is Common {
         tmpProxy = new ERC1967Proxy(address(optionsCompounder), "");
         optionsCompounder = OptionsCompounder(address(tmpProxy));
         console.log("Initializing...");
-        optionsCompounder.initialize(address(optionsTokenProxy), address(addressProvider), address(reaperSwapper), swapProps, oracle, strategies);
+        optionsCompounder.initialize(address(optionsTokenProxy), address(addressProvider), swapProps, oracle, strategies);
 
         vm.stopPrank();