diff --git a/remappings.txt b/remappings.txt
index b80d0e0..1e78463 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,5 +1,3 @@
 @openzeppelin/contracts/=node_modules/@openzeppelin/contracts/
-@openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/
 forge-std/=node_modules/forge-std/
-@account-abstraction/contracts/=node_modules/@account-abstraction/contracts/
-solady/=solady/src
\ No newline at end of file
+@account-abstraction/contracts/=node_modules/@account-abstraction/contracts/
\ No newline at end of file
diff --git a/src/SimplePlusAccount.sol b/src/SimplePlusAccount.sol
index 4522980..8c8d6e5 100644
--- a/src/SimplePlusAccount.sol
+++ b/src/SimplePlusAccount.sol
@@ -8,7 +8,7 @@ import { SignatureChecker } from "@openzeppelin/contracts/utils/cryptography/Sig
 import { MessageHashUtils } from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import { IERC1271 } from "@openzeppelin/contracts/interfaces/IERC1271.sol";
-import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/EIP712.sol"; // TODO: use upgradable version
+import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
 import { SimpleGuardianModule } from "./SimpleGuardianModule.sol";
 
 contract SimplePlusAccount is SimpleAccount, SimpleGuardianModule, IERC1271, EIP712 {