diff --git a/contracts/token/oracles/TwapOracle.sol b/contracts/token/oracles/TwapOracle.sol
index 4f7b967..8486711 100644
--- a/contracts/token/oracles/TwapOracle.sol
+++ b/contracts/token/oracles/TwapOracle.sol
@@ -3,8 +3,8 @@ pragma solidity ^0.8.27;
 
 import { IOracle } from "../../interfaces/oracles/IOracle.sol";
 import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import { OracleLibrary } from "@uniswap/v3-periphery/libraries/OracleLibrary.sol";
-import { IUniswapV3PoolImmutables } from "@uniswap/v3-core/interfaces/pool/IUniswapV3PoolImmutables.sol";
+import { OracleLibrary } from "@uniswap/v3-periphery/contracts/libraries/OracleLibrary.sol";
+import { IUniswapV3PoolImmutables } from "@uniswap/v3-core/contracts/interfaces/pool/IUniswapV3PoolImmutables.sol";
 
 contract TwapOracle is IOracle {
     /*´:°•.°+.*•´.*:˚.°*.˚•´.°:°•.°•.*•´.*:˚.°*.˚•´.°:°•.°+.*•´.*:*/
diff --git a/contracts/token/swaps/Uniswapper.sol b/contracts/token/swaps/Uniswapper.sol
index ed1889e..e36922e 100644
--- a/contracts/token/swaps/Uniswapper.sol
+++ b/contracts/token/swaps/Uniswapper.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.8.27;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-//import "@uniswap/v3-periphery/contracts/interfaces/ISwapRouter.sol";
 import "@uniswap/v3-periphery/contracts/interfaces/IPeripheryPayments.sol";
 
 interface ISwapRouter {
diff --git a/remappings.txt b/remappings.txt
index 9a6ad70..56163b6 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,6 +1,4 @@
-@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
-@openzeppelin/=node_modules/@openzeppelin/contracts
-@openzeppelin/contracts/contracts/=node_modules/@openzeppelin/contracts/
+@openzeppelin/contracts/=node_modules/@openzeppelin/contracts
 @prb/test/=node_modules/@prb/test/
 @nexus/=node_modules/nexus/
 forge-std/=lib/forge-std/src/
@@ -9,8 +7,6 @@ account-abstraction/=node_modules/account-abstraction/contracts/
 @modulekit/=node_modules/modulekit/src/
 sentinellist/=node_modules/sentinellist/src/
 solady/=node_modules/solady/src/
-@uniswap/v3-periphery/=node_modules/@uniswap/v3-periphery/contracts
-@uniswap/v3-core/=node_modules/@uniswap/v3-core/contracts/
 @uniswap/v3-periphery/contracts/=node_modules/@uniswap/v3-periphery/contracts
 @uniswap/v3-core/contracts/=node_modules/@uniswap/v3-core/contracts/
 solady/src/=node_modules/solady/src/
diff --git a/remappings.txt.bak b/remappings.txt.bak
new file mode 100644
index 0000000..9a6ad70
--- /dev/null
+++ b/remappings.txt.bak
@@ -0,0 +1,24 @@
+@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
+@openzeppelin/=node_modules/@openzeppelin/contracts
+@openzeppelin/contracts/contracts/=node_modules/@openzeppelin/contracts/
+@prb/test/=node_modules/@prb/test/
+@nexus/=node_modules/nexus/
+forge-std/=lib/forge-std/src/
+account-abstraction/=node_modules/account-abstraction/contracts/
+@ERC4337/account-abstraction=node_modules/account-abstraction/
+@modulekit/=node_modules/modulekit/src/
+sentinellist/=node_modules/sentinellist/src/
+solady/=node_modules/solady/src/
+@uniswap/v3-periphery/=node_modules/@uniswap/v3-periphery/contracts
+@uniswap/v3-core/=node_modules/@uniswap/v3-core/contracts/
+@uniswap/v3-periphery/contracts/=node_modules/@uniswap/v3-periphery/contracts
+@uniswap/v3-core/contracts/=node_modules/@uniswap/v3-core/contracts/
+solady/src/=node_modules/solady/src/
+excessively-safe-call/=node_modules/excessively-safe-call/src/
+modulekit/=node_modules/@rhinestone/modulekit/src/
+module-bases/=node_modules/module-bases/src/
+erc7579/=node_modules/erc7579/src/
+kernel/=node_modules/@zerodev/kernel/src/
+@safe-global/=node_modules/@safe-global/
+solarray/=node_modules/solarray/src/
+erc7739Validator/=node_modules/erc7739-validator-base/src/
\ No newline at end of file