diff --git a/packages/entrykit/src/EntryKitConfigProvider.tsx b/packages/entrykit/src/EntryKitConfigProvider.tsx
index a2df0865be..5352e9482a 100644
--- a/packages/entrykit/src/EntryKitConfigProvider.tsx
+++ b/packages/entrykit/src/EntryKitConfigProvider.tsx
@@ -4,11 +4,9 @@ import { RainbowKitProvider, lightTheme, midnightTheme } from "@rainbow-me/rainb
 import { EntryKitConfig } from "./config/output";
 import { Chain } from "viem";
 import { useChains } from "wagmi";
-import { Paymaster, getPaymaster } from "./getPaymaster";
 
 type ContextValue = EntryKitConfig & {
   chain: Chain;
-  paymaster: Paymaster | undefined;
 };
 
 /** @internal */
@@ -29,8 +27,6 @@ export function EntryKitConfigProvider({ config, children }: Props) {
   const chain = chains.find(({ id }) => id === config.chainId);
   if (!chain) throw new Error(`Could not find configured chain for chain ID ${config.chainId}.`);
 
-  const paymaster = getPaymaster(chain);
-
   return (
     <RainbowKitProvider
       // Prevent RainbowKit/Wagmi trying to switch chains after connection
@@ -52,7 +48,7 @@ export function EntryKitConfigProvider({ config, children }: Props) {
               }
       }
     >
-      <Context.Provider value={{ ...config, chain, paymaster }}>{children}</Context.Provider>
+      <Context.Provider value={{ ...config, chain }}>{children}</Context.Provider>
     </RainbowKitProvider>
   );
 }
diff --git a/packages/entrykit/src/createWagmiConfig.ts b/packages/entrykit/src/createWagmiConfig.ts
index be317ccf0c..7ba0468c55 100644
--- a/packages/entrykit/src/createWagmiConfig.ts
+++ b/packages/entrykit/src/createWagmiConfig.ts
@@ -1,5 +1,5 @@
 import { Chain, Transport } from "viem";
-import { WalletList, connectorsForWallets, getDefaultWallets } from "@rainbow-me/rainbowkit";
+import { connectorsForWallets } from "@rainbow-me/rainbowkit";
 import { Config, CreateConfigParameters, createConfig } from "wagmi";
 
 export type CreateWagmiConfigOptions<
@@ -21,12 +21,7 @@ export function createWagmiConfig<
   const chains extends readonly [Chain, ...Chain[]],
   transports extends Record<chains[number]["id"], Transport>,
 >(config: CreateWagmiConfigOptions<chains, transports>): Config<chains, transports> {
-  const { wallets: defaultWallets } = getDefaultWallets();
-  const wallets: WalletList = [
-    // TODO: passkey wallet
-    ...defaultWallets,
-  ];
-
+  const wallets = getWallets();
   const connectors = connectorsForWallets(wallets, {
     appName: config.appName,
     projectId: config.walletConnectProjectId,
diff --git a/packages/entrykit/src/utils/signCall.tsx b/packages/entrykit/src/utils/signCall.ts
similarity index 95%
rename from packages/entrykit/src/utils/signCall.tsx
rename to packages/entrykit/src/utils/signCall.ts
index e7ebcaf94a..945ae91279 100644
--- a/packages/entrykit/src/utils/signCall.tsx
+++ b/packages/entrykit/src/utils/signCall.ts
@@ -24,7 +24,6 @@ export async function signCall<chain extends Chain = Chain>({
   nonce: initialNonce,
   client,
 }: SignCallOptions<chain>) {
-  console.log("getting nonce", worldAddress);
   const nonce =
     initialNonce ??
     (client
@@ -37,7 +36,6 @@ export async function signCall<chain extends Chain = Chain>({
           })
         ).nonce
       : 0n);
-  console.log("got nonce", nonce);
 
   const { namespace: systemNamespace, name: systemName } = hexToResource(systemId);