diff --git a/package.json b/package.json
index 6a52d8c..e2a7870 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.20.43",
+  "version": "0.20.44",
   "description": "Orion Protocol SDK",
   "main": "./lib/index.cjs",
   "module": "./lib/index.js",
diff --git a/src/Unit/Exchange/generateSwapCalldata.ts b/src/Unit/Exchange/generateSwapCalldata.ts
index f0ac04c..91f3fe6 100644
--- a/src/Unit/Exchange/generateSwapCalldata.ts
+++ b/src/Unit/Exchange/generateSwapCalldata.ts
@@ -23,27 +23,22 @@ import { generateFeePaymentCall } from "./callGenerators/feePayment.js";
 
 export type Factory = "UniswapV2" | "UniswapV3" | "Curve" | "OrionV2" | "OrionV3";
 
-export type GenerateSwapCalldataWithUnitParams = {
+type BaseGenerateSwapCalldataParams = {
   amount: BigNumberish;
   minReturnAmount: BigNumberish;
   initiatorAddress: string;
   receiverAddress: string;
-  matcher: AddressLike,
-  feeToken: AddressLike,
-  fee: BigNumberish;
   path: ArrayLike<SingleSwap>;
+  matcher?: AddressLike,
+  feeToken?: AddressLike,
+  fee?: BigNumberish;
+}
+
+export type GenerateSwapCalldataWithUnitParams = BaseGenerateSwapCalldataParams & {
   unit: Unit;
 };
 
-export type GenerateSwapCalldataParams = {
-  amount: BigNumberish;
-  minReturnAmount: BigNumberish;
-  initiatorAddress: string;
-  receiverAddress: string;
-  path: ArrayLike<SingleSwap>;
-  matcher: AddressLike,
-  feeToken: AddressLike,
-  fee: BigNumberish;
+export type GenerateSwapCalldataParams = BaseGenerateSwapCalldataParams & {
   exchangeContractAddress: AddressLike;
   wethAddress: AddressLike;
   curveRegistryAddress: AddressLike;
@@ -347,10 +342,6 @@ async function payFeeToMatcher(
   calls: BytesLike[],
   swapDescription: LibValidator.SwapDescriptionStruct,
 ) {
-  console.log(matcher)
-  console.log(feeAmount)
-  console.log(feeToken)
-  console.log(swapDescription.dstToken)
   if (BigInt(feeAmount) !== 0n && feeToken === swapDescription.dstToken) {
     const feePaymentCall = generateFeePaymentCall(matcher, feeToken, feeAmount)
     calls.push(feePaymentCall)