diff --git a/contracts/polygon/connectors/aave/v3-import/helpers.sol b/contracts/polygon/connectors/aave/v3-import/helpers.sol
index faa9d557..335f700e 100644
--- a/contracts/polygon/connectors/aave/v3-import/helpers.sol
+++ b/contracts/polygon/connectors/aave/v3-import/helpers.sol
@@ -199,9 +199,6 @@ contract AaveHelpers is Helper {
 		uint256 rateMode,
 		address user
 	) private {
-		if (instaList.accountID(user) != 0) {
-			user = address(this);
-		}
 		aave.repay(token, amt, rateMode, user);
 	}
 
@@ -266,11 +263,10 @@ contract AaveHelpers is Helper {
 			);
 
 			for (uint256 i = 0; i < _length; i++) {
-				uint256 _amt = amts[i];
-				address _token = tokens[i];
-				_targets[i] = "BASIC-A";
-
 				if (amts[i] > 0) {
+					uint256 _amt = amts[i];
+					address _token = tokens[i];
+					_targets[i] = "BASIC-A";
 					_data[i] = abi.encodeWithSelector(
 						basicWithdraw,
 						_token,
@@ -279,7 +275,7 @@ contract AaveHelpers is Helper {
 						0,
 						0
 					);
-					if (!getIsColl(_token, userAccount)) {
+					if (!getIsColl(_token, address(this))) {
 						aave.setUserUseReserveAsCollateral(_token, true);
 					}
 				}
diff --git a/contracts/polygon/connectors/aave/v3-import/main.sol b/contracts/polygon/connectors/aave/v3-import/main.sol
index feb2143d..7486f378 100644
--- a/contracts/polygon/connectors/aave/v3-import/main.sol
+++ b/contracts/polygon/connectors/aave/v3-import/main.sol
@@ -32,17 +32,8 @@ contract AaveV3ImportResolver is AaveHelpers {
 
 		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
-		if (
-			ListInterface(0x839c2D3aDe63DF5b0b8F3E57D5e145057Ab41556).accountID(
-				userAccount
-			) == 0
-		) {
-			data = getBorrowAmounts(userAccount, aave, inputData, data);
-			data = getSupplyAmounts(userAccount, inputData, data);
-		} else {
-			data = getBorrowAmounts(address(this), aave, inputData, data);
-			data = getSupplyAmounts(address(this), inputData, data);
-		}
+		data = getBorrowAmounts(userAccount, aave, inputData, data);
+		data = getSupplyAmounts(userAccount, inputData, data);
 
 		//  payback borrowed amount;
 		_PaybackStable(