diff --git a/deployables/app/app/components/ModSelect.tsx b/deployables/app/app/components/ModSelect.tsx
index 1c7191ee9..a586e4d30 100644
--- a/deployables/app/app/components/ModSelect.tsx
+++ b/deployables/app/app/components/ModSelect.tsx
@@ -13,7 +13,7 @@ export interface Option {
 
 interface Props<Option = unknown, Multi extends boolean = boolean>
   extends SelectProps<false, Option, Multi> {
-  avatarAddress: string
+  avatarAddress: HexAddress
 }
 
 export function ModSelect<Multi extends boolean = boolean>({
@@ -47,7 +47,7 @@ export function ModSelect<Multi extends boolean = boolean>({
 
 type ValueProps = PropsWithChildren<{
   label: string
-  address: string
+  address: HexAddress
 }>
 
 const Value = ({ label, address, children }: ValueProps) => (
diff --git a/deployables/app/app/components/ZodiacMod.tsx b/deployables/app/app/components/ZodiacMod.tsx
index 092a05eeb..563506217 100644
--- a/deployables/app/app/components/ZodiacMod.tsx
+++ b/deployables/app/app/components/ZodiacMod.tsx
@@ -117,7 +117,7 @@ export const ZodiacMod = ({
         }
         isDisabled={disabled || isLoading}
         placeholder={isLoading ? 'Loading modules...' : 'Select a module'}
-        avatarAddress={avatar}
+        avatarAddress={parsePrefixedAddress(avatar)}
       />
 
       {selectedModule?.type === SupportedZodiacModuleType.ROLES_V1 && (
diff --git a/deployables/app/app/components/wallet/Account.tsx b/deployables/app/app/components/wallet/Account.tsx
index f06c0f2c4..071915f51 100644
--- a/deployables/app/app/components/wallet/Account.tsx
+++ b/deployables/app/app/components/wallet/Account.tsx
@@ -8,7 +8,7 @@ type AccountProps = {
 }
 
 export const Account = ({ children, type }: AccountProps) => {
-  const address = validateAddress(children) ?? ''
+  const address = validateAddress(children)
 
   return (
     <AddressInput
diff --git a/deployables/extension/e2e/accountHandling/lockedAccount.spec.ts b/deployables/extension/e2e/accountHandling/lockedAccount.spec.ts
deleted file mode 100644
index 71d7260a6..000000000
--- a/deployables/extension/e2e/accountHandling/lockedAccount.spec.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import {
-  defaultMockAccount,
-  expect,
-  loadExtension,
-  mockWeb3,
-  test,
-} from '@/e2e-utils'
-import type { Page } from '@playwright/test'
-
-const openConfiguration = async (
-  page: Page,
-  account: `0x${string}` = defaultMockAccount,
-) => {
-  await page.getByRole('button', { name: 'Add Route' }).click()
-
-  // MONDAY PHIL: This button is not being enabled
-  await page.getByRole('button', { name: 'Connect with MetaMask' }).click()
-  await expect(
-    page.getByRole('textbox', { name: 'Pilot Account' }),
-  ).toHaveValue(account)
-}
-
-test.describe('Locked account', () => {
-  const account = '0x1000000000000000000000000000000000000000'
-
-  test('handles wallet disconnect gracefully', async ({ page }) => {
-    const { lockWallet } = await mockWeb3(page)
-
-    const extension = await loadExtension(page)
-
-    await openConfiguration(extension)
-    await lockWallet()
-
-    await expect(
-      extension.getByRole('alert', { name: 'Wallet disconnected' }),
-    ).toBeInViewport()
-  })
-
-  test('it is possible to reconnect an account', async ({ page }) => {
-    const { lockWallet } = await mockWeb3(page, {
-      accounts: [account],
-    })
-
-    const extension = await loadExtension(page)
-
-    await openConfiguration(extension, account)
-    await lockWallet()
-
-    await extension
-      .getByRole('button', { name: 'Connect', exact: true })
-      .click()
-
-    await expect(
-      extension.getByRole('textbox', { name: 'Pilot Account' }),
-    ).toHaveValue(account)
-  })
-
-  test('it is possible to disconnect a locked account', async ({ page }) => {
-    const { lockWallet } = await mockWeb3(page)
-
-    const extension = await loadExtension(page)
-
-    await openConfiguration(extension)
-    await lockWallet()
-
-    await extension.getByRole('button', { name: 'Disconnect' }).click()
-
-    await expect(
-      extension.getByRole('button', { name: 'Connect with MetaMask' }),
-    ).toBeInViewport()
-  })
-})
diff --git a/deployables/extension/e2e/accountHandling/unavailableWallet.spec.ts b/deployables/extension/e2e/accountHandling/unavailableWallet.spec.ts
deleted file mode 100644
index ee48ce33d..000000000
--- a/deployables/extension/e2e/accountHandling/unavailableWallet.spec.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import {
-  defaultMockAccount,
-  expect,
-  loadExtension,
-  mockWeb3,
-  test,
-} from '@/e2e-utils'
-import type { Page } from '@playwright/test'
-
-const openConfiguration = async (
-  page: Page,
-  account: `0x${string}` = defaultMockAccount,
-) => {
-  await page.getByRole('button', { name: 'Add Route' }).click()
-  await page.getByRole('button', { name: 'Connect with MetaMask' }).click()
-  await expect(
-    page.getByRole('textbox', { name: 'Pilot Account' }),
-  ).toHaveValue(account)
-}
-
-test.describe('Account unavailable', () => {
-  test('handles unavailable accounts gracefully', async ({ page }) => {
-    const { loadAccounts } = await mockWeb3(page, {
-      accounts: ['0x1000000000000000000000000000000000000000'],
-    })
-
-    const extension = await loadExtension(page)
-
-    await openConfiguration(
-      extension,
-      '0x1000000000000000000000000000000000000000',
-    )
-    await loadAccounts(['0x2000000000000000000000000000000000000000'])
-
-    await expect(
-      extension.getByRole('alert', {
-        name: `Account is not connected`,
-      }),
-    ).toHaveAccessibleDescription(
-      'Switch your wallet to this account in order to use Pilot.',
-    )
-  })
-})
diff --git a/deployables/extension/e2e/accountHandling/wrongChain.spec.ts b/deployables/extension/e2e/accountHandling/wrongChain.spec.ts
deleted file mode 100644
index 05e2d20ec..000000000
--- a/deployables/extension/e2e/accountHandling/wrongChain.spec.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import {
-  defaultMockAccount,
-  expect,
-  loadExtension,
-  mockWeb3,
-  test,
-} from '@/e2e-utils'
-import type { Page } from '@playwright/test'
-
-const openConfiguration = async (
-  page: Page,
-  account: `0x${string}` = defaultMockAccount,
-) => {
-  await page.getByRole('button', { name: 'Add Route' }).click()
-  await page.getByRole('button', { name: 'Connect with MetaMask' }).click()
-  await expect(
-    page.getByRole('textbox', { name: 'Pilot Account' }),
-  ).toHaveValue(account)
-}
-
-test.describe('Wrong chain selected', () => {
-  test('it is possible to switch to the correct chain', async ({ page }) => {
-    const { switchChain } = await mockWeb3(page)
-
-    const extension = await loadExtension(page)
-
-    await openConfiguration(extension)
-    await switchChain(10)
-
-    await expect(
-      extension.getByRole('alert', { name: 'Chain mismatch' }),
-    ).toBeInViewport()
-  })
-
-  test('it is possible to switch back to the connected chain', async ({
-    page,
-  }) => {
-    const { switchChain } = await mockWeb3(page)
-
-    const extension = await loadExtension(page)
-
-    await openConfiguration(extension)
-    await switchChain(10)
-
-    await expect(
-      extension.getByRole('button', { name: 'Switch wallet to Ethereum' }),
-    ).toBeInViewport()
-  })
-})
diff --git a/deployables/extension/package.json b/deployables/extension/package.json
index 3c3092cad..fc593db7f 100644
--- a/deployables/extension/package.json
+++ b/deployables/extension/package.json
@@ -28,14 +28,9 @@
   },
   "devDependencies": {
     "@depay/web3-mock": "^14.19.1",
-    "@gnosis.pm/zodiac": "^4.0.3",
-    "@noble/hashes": "^1.4.0",
     "@playwright/test": "^1.48.1",
-    "@safe-global/api-kit": "2.5.7",
-    "@safe-global/protocol-kit": "5.2.0",
-    "@safe-global/safe-apps-sdk": "9.1.0",
     "@safe-global/safe-gateway-typescript-sdk": "3.22.7",
-    "@shazow/whatsabi": "^0.19.0",
+    "@sentry/esbuild-plugin": "^3.0.0",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "16.2.0",
@@ -46,53 +41,41 @@
     "@types/react": "19.0.7",
     "@types/react-dom": "19.0.3",
     "@vitest/coverage-v8": "2.1.8",
-    "@walletconnect/core": "2.17.3",
-    "@walletconnect/ethereum-provider": "2.17.3",
-    "@walletconnect/keyvaluestorage": "^1.1.1",
-    "@walletconnect/modal": "2.7.0",
-    "@walletconnect/sign-client": "2.17.3",
-    "@walletconnect/universal-provider": "2.17.3",
     "@zodiac/eslint-config": "workspace:*",
     "@zodiac/tailwind-config": "workspace:*",
     "@zodiac/test-utils": "workspace:*",
     "@zodiac/typescript-config": "workspace:*",
     "autoprefixer": "^10.4.20",
     "chalk": "^5.4.1",
-    "classnames": "^2.3.1",
-    "copy-to-clipboard": "^3.3.1",
     "dotenv": "^16.0.1",
     "esbuild": "^0.24.0",
     "esbuild-style-plugin": "^1.6.3",
     "eslint": "^9.7.0",
-    "ethereum-blockies-base64": "^1.0.2",
     "ethers": "6.13.5",
     "events": "^3.3.0",
-    "evm-proxy-detection": "^2.0.1",
     "globals": "^15.8.0",
     "happy-dom": "^16.0.0",
-    "isomorphic-fetch": "^3.0.0",
     "jsdom-testing-mocks": "^1.13.1",
     "madge": "^8.0.0",
-    "nanoid": "^5.0.0",
-    "node-stdlib-browser": "^1.2.0",
     "postcss": "^8.4.47",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "react-select": "5.9.0",
     "rimraf": "6.0.1",
-    "ser-kit": "1.1.0",
     "tailwindcss": "^3.4.14",
     "typescript": "^5.5.4",
     "vitest": "2.1.8",
-    "vitest-chrome": "0.1.0",
-    "zodiac-roles-deployments": "^2.2.2"
+    "vitest-chrome": "0.1.0"
   },
   "packageManager": "pnpm@9.15.4",
   "dependencies": {
     "@epic-web/invariant": "^1.0.0",
+    "@gnosis.pm/zodiac": "^4.0.3",
     "@headlessui/react": "^2.2.0",
-    "@sentry/esbuild-plugin": "^3.0.0",
     "@sentry/browser": "^8.50.0",
+    "@walletconnect/core": "2.17.3",
+    "@walletconnect/ethereum-provider": "2.17.3",
+    "@walletconnect/keyvaluestorage": "^1.1.1",
+    "@walletconnect/modal": "2.7.0",
+    "@walletconnect/sign-client": "2.17.3",
+    "@walletconnect/universal-provider": "2.17.3",
     "@zodiac/chains": "workspace:*",
     "@zodiac/env": "workspace:*",
     "@zodiac/form-data": "workspace:*",
@@ -101,11 +84,16 @@
     "@zodiac/safe": "workspace:*",
     "@zodiac/schema": "workspace:*",
     "@zodiac/ui": "workspace:*",
+    "classnames": "^2.3.1",
     "date-fns": "^4.1.0",
     "lucide-react": "^0.470.0",
+    "nanoid": "^5.0.0",
+    "node-stdlib-browser": "^1.2.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "react-router": "7.1.3",
     "react-stick": "^5.0.6",
-    "react-toastify": "11.0.3",
+    "ser-kit": "1.1.0",
     "zod": "^3.23.8"
   }
 }
diff --git a/deployables/extension/src/panel/app.tsx b/deployables/extension/src/panel/app.tsx
index 3432e8c6b..ed3f1ba0d 100644
--- a/deployables/extension/src/panel/app.tsx
+++ b/deployables/extension/src/panel/app.tsx
@@ -3,10 +3,10 @@
 import { ProvideConnectProvider, ProvideInjectedWallet } from '@/providers'
 import { sentry } from '@/sentry'
 import { invariant } from '@epic-web/invariant'
+import { ToastContainer } from '@zodiac/ui'
 import { StrictMode, useEffect } from 'react'
 import { createRoot } from 'react-dom/client'
 import { createHashRouter, RouterProvider } from 'react-router'
-import { ToastContainer } from 'react-toastify'
 import '../global.css'
 import { pages } from './pages'
 import { ProvidePort } from './port-handling'
diff --git a/deployables/extension/src/panel/integrations/zodiac/fetchZodiacModules.ts b/deployables/extension/src/panel/integrations/zodiac/fetchZodiacModules.ts
deleted file mode 100644
index 31ed21e80..000000000
--- a/deployables/extension/src/panel/integrations/zodiac/fetchZodiacModules.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { getReadOnlyProvider } from '@/providers'
-import type { HexAddress } from '@/types'
-import type { ZodiacModule } from '@zodiac/modules'
-import { fetchZodiacModules as baseFetchZodiacModules } from '@zodiac/modules'
-import { type ChainId } from 'ser-kit'
-
-export async function fetchZodiacModules(
-  safeOrModifierAddress: HexAddress,
-  chainId: ChainId,
-  previous?: Set<string>,
-): Promise<ZodiacModule[]> {
-  return baseFetchZodiacModules(getReadOnlyProvider(chainId), {
-    safeOrModifierAddress,
-    chainId,
-    previous,
-  })
-}
diff --git a/deployables/extension/src/panel/integrations/zodiac/index.ts b/deployables/extension/src/panel/integrations/zodiac/index.ts
index 0e03ab506..93aa515ed 100644
--- a/deployables/extension/src/panel/integrations/zodiac/index.ts
+++ b/deployables/extension/src/panel/integrations/zodiac/index.ts
@@ -2,8 +2,5 @@ export {
   MULTISEND,
   MULTISEND_CALL_ONLY,
   SupportedZodiacModuleType,
-  queryRolesV2MultiSend,
 } from '@zodiac/modules'
 export type { ZodiacModule } from '@zodiac/modules'
-export { fetchZodiacModules } from './fetchZodiacModules'
-export { queryRolesV1MultiSend } from './rolesMultisend'
diff --git a/deployables/extension/src/panel/integrations/zodiac/rolesMultisend.ts b/deployables/extension/src/panel/integrations/zodiac/rolesMultisend.ts
deleted file mode 100644
index 529e28148..000000000
--- a/deployables/extension/src/panel/integrations/zodiac/rolesMultisend.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { getReadOnlyProvider } from '@/providers'
-import { queryRolesV1MultiSend as baseQueryRolesV1MultiSend } from '@zodiac/modules'
-import type { ChainId } from 'ser-kit'
-
-export const queryRolesV1MultiSend = (chainId: ChainId, modAddress: string) =>
-  baseQueryRolesV1MultiSend(getReadOnlyProvider(chainId), modAddress)
diff --git a/deployables/extension/src/panel/pages/$activeRouteId/ActiveRoute.tsx b/deployables/extension/src/panel/pages/$activeRouteId/ActiveRoute.tsx
index acc13296d..cc4ebb933 100644
--- a/deployables/extension/src/panel/pages/$activeRouteId/ActiveRoute.tsx
+++ b/deployables/extension/src/panel/pages/$activeRouteId/ActiveRoute.tsx
@@ -11,6 +11,8 @@ import {
 } from '@/providers'
 import { ProvideProvider } from '@/providers-ui'
 import { formData, getString } from '@/utils'
+import { ZERO_ADDRESS } from '@zodiac/chains'
+import { updatePilotAddress } from '@zodiac/modules'
 import {
   Outlet,
   redirect,
@@ -20,10 +22,6 @@ import {
   type LoaderFunctionArgs,
 } from 'react-router'
 import { saveStorageEntry } from '../../utils/saveStorageEntry'
-import {
-  asLegacyConnection,
-  fromLegacyConnection,
-} from '../legacyConnectionMigrations'
 import { getActiveRouteId } from './getActiveRouteId'
 import { Intent } from './intents'
 
@@ -51,12 +49,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
       const routeId = getActiveRouteId(params)
       const route = await getRoute(routeId)
 
-      await saveRoute(
-        fromLegacyConnection({
-          ...asLegacyConnection(route),
-          pilotAddress: '',
-        }),
-      )
+      await saveRoute(updatePilotAddress(route, ZERO_ADDRESS))
 
       return null
     }
diff --git a/deployables/extension/src/panel/pages/$activeRouteId/transactions/ContractAddress/index.tsx b/deployables/extension/src/panel/pages/$activeRouteId/transactions/ContractAddress/index.tsx
index 10cea19c1..3790ba3ac 100644
--- a/deployables/extension/src/panel/pages/$activeRouteId/transactions/ContractAddress/index.tsx
+++ b/deployables/extension/src/panel/pages/$activeRouteId/transactions/ContractAddress/index.tsx
@@ -1,4 +1,5 @@
 import { EXPLORER_URL } from '@zodiac/chains'
+import type { HexAddress } from '@zodiac/schema'
 import { AddressInput, GhostLinkButton } from '@zodiac/ui'
 import { getAddress } from 'ethers'
 import { SquareArrowOutUpRight } from 'lucide-react'
@@ -7,7 +8,7 @@ import type { ContractInfo } from '../../../../utils/abi'
 
 interface Props {
   chainId: ChainId
-  address: string
+  address: HexAddress
   contractInfo?: ContractInfo
 }
 
@@ -21,7 +22,7 @@ export const ContractAddress = ({ chainId, address, contractInfo }: Props) => {
       readOnly
       label="Contract"
       description={contractInfo?.name}
-      value={checksumAddress}
+      value={checksumAddress as HexAddress}
       action={
         <GhostLinkButton
           openInNewWindow
diff --git a/deployables/extension/src/panel/pages/$activeRouteId/transactions/RouteBubble/index.tsx b/deployables/extension/src/panel/pages/$activeRouteId/transactions/RouteBubble/index.tsx
index 31ed8f7ef..5f9ff02c7 100644
--- a/deployables/extension/src/panel/pages/$activeRouteId/transactions/RouteBubble/index.tsx
+++ b/deployables/extension/src/panel/pages/$activeRouteId/transactions/RouteBubble/index.tsx
@@ -1,19 +1,27 @@
 import { useCompanionAppUrl } from '@/companion'
 import { useExecutionRoute } from '@/execution-routes'
 import { Transition } from '@headlessui/react'
+import {
+  getPilotAddress,
+  getRolesWaypoint,
+  getStartingWaypoint,
+} from '@zodiac/modules'
+import type { HexAddress } from '@zodiac/schema'
 import { Blockie } from '@zodiac/ui'
 import { AlignJustify, Cog } from 'lucide-react'
 import { useState } from 'react'
 import { Link } from 'react-router'
 import Stick from 'react-stick'
+import { parsePrefixedAddress } from 'ser-kit'
 import { ConnectionStack } from '../../../ConnectionStack'
-import { asLegacyConnection } from '../../../legacyConnectionMigrations'
 
 export const RouteBubble = () => {
   const route = useExecutionRoute()
-  const connection = asLegacyConnection(route)
   const [hover, setHover] = useState(false)
 
+  const pilotAddress = getPilotAddress([getStartingWaypoint(route.waypoints)])
+  const rolesWaypoint = getRolesWaypoint(route)
+
   return (
     <Stick
       sameWidth
@@ -33,7 +41,7 @@ export const RouteBubble = () => {
         >
           <div className="isolate z-10 pt-2">
             <div className="rounded-md border border-zinc-200/80 bg-zinc-100/80 px-4 py-2 shadow-lg backdrop-blur-sm dark:border-zinc-500/80 dark:bg-zinc-900/80">
-              <ConnectionStack connection={connection} />
+              <ConnectionStack route={route} />
             </div>
           </div>
         </Transition>
@@ -41,13 +49,15 @@ export const RouteBubble = () => {
     >
       <div className="flex items-center gap-2 overflow-hidden">
         <Blockies
-          avatarAddress={connection.avatarAddress}
-          moduleAddress={connection.moduleAddress}
-          pilotAddress={connection.pilotAddress}
+          avatarAddress={parsePrefixedAddress(route.avatar)}
+          moduleAddress={
+            rolesWaypoint == null ? undefined : rolesWaypoint.account.address
+          }
+          pilotAddress={pilotAddress}
         />
 
         <p className="overflow-hidden text-ellipsis whitespace-nowrap">
-          {connection.label || <span className="italic">Unnamed route</span>}
+          {route.label || <span className="italic">Unnamed route</span>}
         </p>
       </div>
 
@@ -75,9 +85,9 @@ export const RouteBubble = () => {
 }
 
 type BlockiesProps = {
-  avatarAddress: string
-  pilotAddress?: string
-  moduleAddress?: string
+  avatarAddress: HexAddress
+  pilotAddress?: HexAddress
+  moduleAddress?: HexAddress
 }
 
 const Blockies = ({
diff --git a/deployables/extension/src/panel/pages/ConnectionStack/Address.tsx b/deployables/extension/src/panel/pages/ConnectionStack/Address.tsx
index e582a2177..0f8b6bb22 100644
--- a/deployables/extension/src/panel/pages/ConnectionStack/Address.tsx
+++ b/deployables/extension/src/panel/pages/ConnectionStack/Address.tsx
@@ -1,9 +1,10 @@
 import { shortenAddress, validateAddress } from '@/utils'
+import type { HexAddress } from '@zodiac/schema'
 import { Address as BaseAddress, Blockie, Tag } from '@zodiac/ui'
 import { Unlink } from 'lucide-react'
 
 interface Props {
-  address: string
+  address: HexAddress
 }
 
 export const Address = ({ address }: Props) => {
diff --git a/deployables/extension/src/panel/pages/ConnectionStack/index.tsx b/deployables/extension/src/panel/pages/ConnectionStack/index.tsx
index 1dee76973..9753e4154 100644
--- a/deployables/extension/src/panel/pages/ConnectionStack/index.tsx
+++ b/deployables/extension/src/panel/pages/ConnectionStack/index.tsx
@@ -1,13 +1,25 @@
-import type { LegacyConnection } from '@/types'
-import { ZODIAC_MODULE_NAMES } from '@zodiac/modules'
+import type { ExecutionRoute } from '@/types'
+import { invariant } from '@epic-web/invariant'
+import {
+  getModuleName,
+  getPilotAddress,
+  getRolesWaypoint,
+} from '@zodiac/modules'
+import { parsePrefixedAddress } from 'ser-kit'
 import { Address } from './Address'
 
 interface Props {
-  connection: LegacyConnection
+  route: ExecutionRoute
 }
 
-export const ConnectionStack = ({ connection }: Props) => {
-  const { avatarAddress, moduleAddress, pilotAddress, moduleType } = connection
+export const ConnectionStack = ({ route }: Props) => {
+  invariant(route.waypoints != null, 'Cannot render route without waypoints')
+
+  const pilotAddress = getPilotAddress(route.waypoints)
+  const avatarAddress = parsePrefixedAddress(route.avatar)
+
+  const rolesWaypoint = getRolesWaypoint(route)
+
   return (
     <div className="flex flex-col gap-2">
       <div className="flex items-center justify-between">
@@ -16,13 +28,13 @@ export const ConnectionStack = ({ connection }: Props) => {
         <Address address={pilotAddress} />
       </div>
 
-      {moduleAddress && (
+      {rolesWaypoint != null && (
         <div className="flex items-center justify-between">
           <div className="text-sm">
-            {(moduleType && ZODIAC_MODULE_NAMES[moduleType]) || 'Zodiac'} Mod
+            {getModuleName(rolesWaypoint.account)} Mod
           </div>
 
-          <Address address={moduleAddress} />
+          <Address address={rolesWaypoint.account.address} />
         </div>
       )}
 
diff --git a/deployables/extension/src/panel/pages/legacyConnectionMigrations.test.ts b/deployables/extension/src/panel/pages/legacyConnectionMigrations.test.ts
deleted file mode 100644
index 6056ce4df..000000000
--- a/deployables/extension/src/panel/pages/legacyConnectionMigrations.test.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-import type { LegacyConnection } from '@/types'
-import { SupportedZodiacModuleType } from '@zodiac/modules'
-import { describe, expect, it } from 'vitest'
-import {
-  asLegacyConnection,
-  fromLegacyConnection,
-} from './legacyConnectionMigrations'
-
-describe('legacy connection migrations', () => {
-  it('returns x for asLegacyConnection(fromLegacyConnection(x))', () => {
-    const standard: LegacyConnection = {
-      id: 'PnNZf8JmJTUCzEuS0kAwV',
-      label: 'KPK Mainnet',
-      chainId: 1,
-      moduleAddress: '0xb89e3f01ead1906806597488ee5e089a0037f50c',
-      avatarAddress: '0x58e6c7ab55aa9012eacca16d1ed4c15795669e1c',
-      pilotAddress: '0xe697903dc6ca014d3e17ba61f4daf657afd51561',
-      providerType: 0,
-      moduleType: SupportedZodiacModuleType.ROLES_V2,
-      roleId:
-        '0x4d414e4147455200000000000000000000000000000000000000000000000000',
-      lastUsed: 1717492134,
-      multisend: '0xa238cbeb142c10ef7ad8442c6d1f9e89e07e7761',
-    }
-    const standardMigrated = fromLegacyConnection(standard)!
-    expect(standardMigrated).toMatchInlineSnapshot(`
-      {
-        "avatar": "eth:0x58e6c7ab55aa9012eacca16d1ed4c15795669e1c",
-        "id": "PnNZf8JmJTUCzEuS0kAwV",
-        "initiator": "eth:0xe697903dc6ca014d3e17ba61f4daf657afd51561",
-        "label": "KPK Mainnet",
-        "lastUsed": 1717492134,
-        "providerType": 0,
-        "waypoints": [
-          {
-            "account": {
-              "address": "0xe697903dc6ca014d3e17ba61f4daf657afd51561",
-              "chain": 1,
-              "prefixedAddress": "eth:0xe697903dc6ca014d3e17ba61f4daf657afd51561",
-              "threshold": NaN,
-              "type": "SAFE",
-            },
-          },
-          {
-            "account": {
-              "address": "0xb89e3f01ead1906806597488ee5e089a0037f50c",
-              "chain": 1,
-              "multisend": [
-                "0xa238cbeb142c10ef7ad8442c6d1f9e89e07e7761",
-              ],
-              "prefixedAddress": "eth:0xb89e3f01ead1906806597488ee5e089a0037f50c",
-              "type": "ROLES",
-              "version": 2,
-            },
-            "connection": {
-              "from": "eth:0xe697903dc6ca014d3e17ba61f4daf657afd51561",
-              "roles": [
-                "0x4d414e4147455200000000000000000000000000000000000000000000000000",
-              ],
-              "type": "IS_MEMBER",
-            },
-          },
-          {
-            "account": {
-              "address": "0x58e6c7ab55aa9012eacca16d1ed4c15795669e1c",
-              "chain": 1,
-              "prefixedAddress": "eth:0x58e6c7ab55aa9012eacca16d1ed4c15795669e1c",
-              "threshold": NaN,
-              "type": "SAFE",
-            },
-            "connection": {
-              "from": "eth:0xb89e3f01ead1906806597488ee5e089a0037f50c",
-              "type": "IS_ENABLED",
-            },
-          },
-        ],
-      }
-    `)
-    expect(asLegacyConnection(standardMigrated)).toEqual(standard)
-
-    const noPilot: LegacyConnection = {
-      id: 'bxY85cd9V24e8CvHBmwYo',
-      label: 'Gnosis DAO Mainnet',
-      chainId: 1,
-      moduleAddress: '0x1cfb0cd7b1111bf2054615c7c491a15c4a3303cc',
-      avatarAddress: '0x849d52316331967b6ff1198e5e32a0eb168d039d',
-      pilotAddress: '',
-      providerType: 0,
-      roleId: '1',
-      lastUsed: 1719582404,
-      moduleType: SupportedZodiacModuleType.ROLES_V1,
-      multisend: '0xa238cbeb142c10ef7ad8442c6d1f9e89e07e7761',
-    }
-    const noPilotMigrated = fromLegacyConnection(noPilot)!
-    expect(noPilotMigrated).toMatchInlineSnapshot(`
-      {
-        "avatar": "eth:0x849d52316331967b6ff1198e5e32a0eb168d039d",
-        "id": "bxY85cd9V24e8CvHBmwYo",
-        "initiator": "eth:0x0000000000000000000000000000000000000000",
-        "label": "Gnosis DAO Mainnet",
-        "lastUsed": 1719582404,
-        "providerType": 0,
-        "waypoints": [
-          {
-            "account": {
-              "address": "0x0000000000000000000000000000000000000000",
-              "chain": 1,
-              "prefixedAddress": "eth:0x0000000000000000000000000000000000000000",
-              "threshold": NaN,
-              "type": "SAFE",
-            },
-          },
-          {
-            "account": {
-              "address": "0x1cfb0cd7b1111bf2054615c7c491a15c4a3303cc",
-              "chain": 1,
-              "multisend": [
-                "0xa238cbeb142c10ef7ad8442c6d1f9e89e07e7761",
-              ],
-              "prefixedAddress": "eth:0x1cfb0cd7b1111bf2054615c7c491a15c4a3303cc",
-              "type": "ROLES",
-              "version": 1,
-            },
-            "connection": {
-              "from": "eth:0x0000000000000000000000000000000000000000",
-              "roles": [
-                "1",
-              ],
-              "type": "IS_MEMBER",
-            },
-          },
-          {
-            "account": {
-              "address": "0x849d52316331967b6ff1198e5e32a0eb168d039d",
-              "chain": 1,
-              "prefixedAddress": "eth:0x849d52316331967b6ff1198e5e32a0eb168d039d",
-              "threshold": NaN,
-              "type": "SAFE",
-            },
-            "connection": {
-              "from": "eth:0x1cfb0cd7b1111bf2054615c7c491a15c4a3303cc",
-              "type": "IS_ENABLED",
-            },
-          },
-        ],
-      }
-    `)
-    expect(asLegacyConnection(noPilotMigrated)).toMatchInlineSnapshot(`
-      {
-        "avatarAddress": "0x849d52316331967b6ff1198e5e32a0eb168d039d",
-        "chainId": 1,
-        "id": "bxY85cd9V24e8CvHBmwYo",
-        "label": "Gnosis DAO Mainnet",
-        "lastUsed": 1719582404,
-        "moduleAddress": "0x1cfb0cd7b1111bf2054615c7c491a15c4a3303cc",
-        "moduleType": "roles_v1",
-        "multisend": "0xa238cbeb142c10ef7ad8442c6d1f9e89e07e7761",
-        "multisendCallOnly": undefined,
-        "pilotAddress": "",
-        "providerType": 0,
-        "roleId": "1",
-      }
-    `)
-
-    const noModule: LegacyConnection = {
-      id: 'PnNZf8JmJTUCzEuS0kAwV',
-      label: 'KPK Mainnet',
-      chainId: 1,
-      moduleAddress: '',
-      avatarAddress: '0x58e6c7ab55aa9012eacca16d1ed4c15795669e1c',
-      pilotAddress: '0xe697903dc6ca014d3e17ba61f4daf657afd51561',
-      providerType: 0,
-      lastUsed: 1717492134,
-    }
-    const noModuleMigrated = fromLegacyConnection(noModule)!
-    expect(noModuleMigrated).toMatchInlineSnapshot(`
-      {
-        "avatar": "eth:0x58e6c7ab55aa9012eacca16d1ed4c15795669e1c",
-        "id": "PnNZf8JmJTUCzEuS0kAwV",
-        "initiator": "eth:0xe697903dc6ca014d3e17ba61f4daf657afd51561",
-        "label": "KPK Mainnet",
-        "lastUsed": 1717492134,
-        "providerType": 0,
-        "waypoints": [
-          {
-            "account": {
-              "address": "0xe697903dc6ca014d3e17ba61f4daf657afd51561",
-              "chain": 1,
-              "prefixedAddress": "eth:0xe697903dc6ca014d3e17ba61f4daf657afd51561",
-              "threshold": NaN,
-              "type": "SAFE",
-            },
-          },
-          {
-            "account": {
-              "address": "0x58e6c7ab55aa9012eacca16d1ed4c15795669e1c",
-              "chain": 1,
-              "prefixedAddress": "eth:0x58e6c7ab55aa9012eacca16d1ed4c15795669e1c",
-              "threshold": NaN,
-              "type": "SAFE",
-            },
-            "connection": {
-              "from": "eth:0xe697903dc6ca014d3e17ba61f4daf657afd51561",
-              "type": "OWNS",
-            },
-          },
-        ],
-      }
-    `)
-    expect(asLegacyConnection(noModuleMigrated)).toEqual(noModule)
-  })
-
-  it('migrates connections without a pilot address', () => {
-    expect(
-      fromLegacyConnection({
-        id: '28KuFy7mBqI1lQdOs5KgE',
-        label: 'test',
-        moduleAddress: '0x53253c670e079274e13a5e1b462e7f6e8b6a4b40',
-        avatarAddress: '0xd0ca2a7ed8aee7972750b085b27350f1cd387f9b',
-        pilotAddress: '',
-        chainId: 1,
-        providerType: 1,
-        moduleType: SupportedZodiacModuleType.ROLES_V2,
-      }),
-    ).toMatchInlineSnapshot(`
-      {
-        "avatar": "eth:0xd0ca2a7ed8aee7972750b085b27350f1cd387f9b",
-        "id": "28KuFy7mBqI1lQdOs5KgE",
-        "initiator": "eoa:0x0000000000000000000000000000000000000000",
-        "label": "test",
-        "lastUsed": undefined,
-        "providerType": 1,
-        "waypoints": [
-          {
-            "account": {
-              "address": "0x0000000000000000000000000000000000000000",
-              "prefixedAddress": "eoa:0x0000000000000000000000000000000000000000",
-              "type": "EOA",
-            },
-          },
-          {
-            "account": {
-              "address": "0x53253c670e079274e13a5e1b462e7f6e8b6a4b40",
-              "chain": 1,
-              "multisend": [],
-              "prefixedAddress": "eth:0x53253c670e079274e13a5e1b462e7f6e8b6a4b40",
-              "type": "ROLES",
-              "version": 2,
-            },
-            "connection": {
-              "from": "eoa:0x0000000000000000000000000000000000000000",
-              "roles": [],
-              "type": "IS_MEMBER",
-            },
-          },
-          {
-            "account": {
-              "address": "0xd0ca2a7ed8aee7972750b085b27350f1cd387f9b",
-              "chain": 1,
-              "prefixedAddress": "eth:0xd0ca2a7ed8aee7972750b085b27350f1cd387f9b",
-              "threshold": NaN,
-              "type": "SAFE",
-            },
-            "connection": {
-              "from": "eth:0x53253c670e079274e13a5e1b462e7f6e8b6a4b40",
-              "type": "IS_ENABLED",
-            },
-          },
-        ],
-      }
-    `)
-  })
-})
diff --git a/deployables/extension/src/panel/pages/legacyConnectionMigrations.ts b/deployables/extension/src/panel/pages/legacyConnectionMigrations.ts
deleted file mode 100644
index 18aba6b1a..000000000
--- a/deployables/extension/src/panel/pages/legacyConnectionMigrations.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-import {
-  ProviderType,
-  type ExecutionRoute,
-  type LegacyConnection,
-} from '@/types'
-import {
-  MULTISEND,
-  MULTISEND_CALL_ONLY,
-  SupportedZodiacModuleType,
-} from '@/zodiac'
-import { invariant } from '@epic-web/invariant'
-import { ZeroAddress } from 'ethers'
-import {
-  AccountType,
-  ConnectionType,
-  formatPrefixedAddress,
-  parsePrefixedAddress,
-  splitPrefixedAddress,
-  type PrefixedAddress,
-  type Waypoint,
-} from 'ser-kit'
-
-export function fromLegacyConnection(
-  connection: LegacyConnection,
-): ExecutionRoute {
-  const { chainId, providerType, moduleType } = connection
-
-  // We assume an EOA if the providerType is MetaMask, a Safe otherwise
-  const isEoa = providerType === ProviderType.InjectedWallet
-
-  const avatarAddress = (connection.avatarAddress ||
-    ZeroAddress) as `0x${string}`
-  const pilotAddress = (connection.pilotAddress || ZeroAddress) as `0x${string}`
-
-  const avatarPrefixedAddress = formatPrefixedAddress(chainId, avatarAddress)
-
-  const pilotPrefixedAddress = formatPrefixedAddress(
-    isEoa ? undefined : chainId,
-    pilotAddress,
-  )
-
-  const modulePrefixedAddress =
-    moduleType && connection.moduleAddress
-      ? formatPrefixedAddress(
-          chainId,
-          connection.moduleAddress as `0x${string}`,
-        )
-      : undefined
-
-  const delayModuleWaypoint = moduleType ===
-    SupportedZodiacModuleType.DELAY && {
-    account: {
-      type: AccountType.DELAY,
-      prefixedAddress: modulePrefixedAddress?.toLowerCase(),
-      address: connection.moduleAddress,
-      chain: chainId,
-    },
-
-    connection: {
-      type: ConnectionType.IS_ENABLED,
-      from: pilotPrefixedAddress.toLowerCase(),
-    },
-  }
-
-  const rolesModuleWaypoint = (moduleType ===
-    SupportedZodiacModuleType.ROLES_V1 ||
-    moduleType === SupportedZodiacModuleType.ROLES_V2) && {
-    account: {
-      type: AccountType.ROLES,
-      prefixedAddress: modulePrefixedAddress?.toLowerCase(),
-      address: connection.moduleAddress,
-      chain: chainId,
-      version: moduleType === SupportedZodiacModuleType.ROLES_V1 ? 1 : 2,
-      multisend: [connection.multisend, connection.multisendCallOnly].filter(
-        Boolean,
-      ) as `0x${string}`[],
-    },
-    connection: pilotPrefixedAddress
-      ? {
-          type: ConnectionType.IS_MEMBER,
-          from: pilotPrefixedAddress.toLowerCase(),
-          roles: [connection.roleId].filter(Boolean) as string[],
-        }
-      : undefined,
-  }
-
-  const moduleWaypoint = delayModuleWaypoint || rolesModuleWaypoint
-
-  const waypoints = [
-    {
-      account: isEoa
-        ? ({
-            type: AccountType.EOA,
-            prefixedAddress: pilotPrefixedAddress.toLowerCase(),
-            address: pilotAddress,
-          } as const)
-        : ({
-            type: AccountType.SAFE,
-            prefixedAddress: pilotPrefixedAddress.toLowerCase(),
-            address: pilotAddress,
-            chain: chainId,
-            threshold: NaN, // we don't know the threshold
-          } as const),
-    },
-
-    ...((moduleWaypoint ? [moduleWaypoint] : []) as Waypoint[]),
-
-    {
-      account: {
-        type: AccountType.SAFE,
-        prefixedAddress: avatarPrefixedAddress.toLowerCase(),
-        address: avatarAddress,
-        chain: chainId,
-        threshold: NaN, // we don't know the threshold
-      },
-      connection: modulePrefixedAddress
-        ? {
-            type: ConnectionType.IS_ENABLED,
-            from: modulePrefixedAddress.toLowerCase(),
-          }
-        : {
-            type: ConnectionType.OWNS,
-            from: pilotPrefixedAddress.toLowerCase(),
-          },
-    } as Waypoint,
-  ]
-
-  return {
-    id: connection.id,
-    label: connection.label,
-    lastUsed: connection.lastUsed,
-    providerType,
-    waypoints: waypoints as ExecutionRoute['waypoints'],
-    initiator: pilotAddress
-      ? (pilotPrefixedAddress.toLowerCase() as PrefixedAddress)
-      : undefined,
-    avatar: avatarPrefixedAddress.toLowerCase() as PrefixedAddress,
-  }
-}
-
-export function asLegacyConnection(route: ExecutionRoute): LegacyConnection {
-  if (route.waypoints && route.waypoints.length > 3) {
-    throw new Error('Not representable as legacy connection')
-  }
-
-  const [chainId, avatarAddressChecksummed] = splitPrefixedAddress(route.avatar)
-  const avatarAddress = avatarAddressChecksummed.toLowerCase()
-
-  invariant(chainId != null, 'chainId is empty')
-
-  const pilotAddress =
-    (route.initiator && parsePrefixedAddress(route.initiator).toLowerCase()) ||
-    ''
-
-  const moduleWaypoint = route.waypoints?.find(
-    (w) =>
-      w.account.type === AccountType.ROLES ||
-      w.account.type === AccountType.DELAY,
-  )
-  const moduleType = moduleWaypoint?.account.type
-
-  const multisend =
-    moduleWaypoint?.account.type === AccountType.ROLES
-      ? moduleWaypoint?.account.multisend
-      : []
-
-  return {
-    id: route.id,
-    label: route.label,
-    moduleAddress: moduleWaypoint?.account.address || '',
-    avatarAddress,
-    pilotAddress:
-      pilotAddress && pilotAddress !== ZeroAddress ? pilotAddress : '',
-    chainId,
-    providerType: route.providerType ?? ProviderType.InjectedWallet,
-    moduleType:
-      moduleType === AccountType.DELAY
-        ? SupportedZodiacModuleType.DELAY
-        : moduleType === AccountType.ROLES
-          ? moduleWaypoint?.account.version === 1
-            ? SupportedZodiacModuleType.ROLES_V1
-            : SupportedZodiacModuleType.ROLES_V2
-          : undefined,
-    multisend: multisend.find((a) => MULTISEND.includes(a)),
-    multisendCallOnly: multisend.find((a) => MULTISEND_CALL_ONLY.includes(a)),
-    roleId:
-      moduleWaypoint &&
-      'connection' in moduleWaypoint &&
-      moduleWaypoint.connection?.type === ConnectionType.IS_MEMBER
-        ? moduleWaypoint?.connection.roles[0]
-        : undefined,
-    lastUsed: route.lastUsed,
-  }
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/AvatarInput.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/AvatarInput.tsx
deleted file mode 100644
index df262c91d..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/AvatarInput.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import { validateAddress } from '@/utils'
-import { Blockie, Input, Select, selectStyles, TextInput } from '@zodiac/ui'
-import { getAddress } from 'ethers'
-import { useEffect, useState } from 'react'
-import CreatableSelect from 'react-select/creatable'
-import type { Option } from './ModSelect'
-
-interface Props {
-  value: string
-  availableSafes?: string[]
-  onChange(value: string): void
-}
-
-export const AvatarInput = ({
-  value,
-  onChange,
-  availableSafes = [],
-}: Props) => {
-  const [pendingValue, setPendingValue] = useState(value)
-
-  useEffect(() => {
-    setPendingValue(value)
-  }, [value])
-
-  const checksumAvatarAddress = validateAddress(pendingValue)
-
-  return (
-    <>
-      {availableSafes.length > 0 || checksumAvatarAddress ? (
-        <Input
-          label="Piloted Safe"
-          clearLabel="Clear piloted Safe"
-          dropdownLabel="View all available Safes"
-        >
-          {({ inputId }) => (
-            <CreatableSelect
-              unstyled
-              inputId={inputId}
-              blurInputOnSelect
-              isClearable
-              components={{
-                ClearIndicator: Select.ClearIndicator<Option, false>,
-                DropdownIndicator: Select.DropdownIndicator,
-              }}
-              formatOptionLabel={SafeOptionLabel}
-              placeholder="Paste an address or select from the list"
-              classNames={selectStyles<{ value: string; label: string }>()}
-              value={
-                checksumAvatarAddress !== ''
-                  ? {
-                      value: checksumAvatarAddress,
-                      label: checksumAvatarAddress,
-                    }
-                  : undefined
-              }
-              options={availableSafes.map((address) => {
-                return { value: address, label: address }
-              })}
-              onChange={(option) => {
-                if (option) {
-                  const sanitized = (option as Option).value
-                    .trim()
-                    .replace(/^[a-z]{3}:/g, '')
-                  if (validateAddress(sanitized)) {
-                    onChange(sanitized.toLowerCase())
-                  }
-                } else {
-                  onChange('')
-                }
-              }}
-              isValidNewOption={(option) => {
-                return !!validateAddress(option)
-              }}
-            />
-          )}
-        </Input>
-      ) : (
-        <TextInput
-          label="Piloted Safe"
-          value={pendingValue}
-          placeholder="Paste in Safe address"
-          onChange={(ev) => {
-            const sanitized = ev.target.value.trim().replace(/^[a-z]{3}:/g, '')
-            setPendingValue(sanitized)
-            if (validateAddress(sanitized)) {
-              onChange(sanitized.toLowerCase())
-            }
-          }}
-        />
-      )}
-    </>
-  )
-}
-
-const SafeOptionLabel = (option: Option) => {
-  const checksumAddress = getAddress(option.value)
-
-  return (
-    <div className="flex items-center gap-4 py-2">
-      <Blockie address={option.value} className="size-5 shrink-0" />
-
-      <code className="overflow-hidden text-ellipsis whitespace-nowrap font-mono">
-        {checksumAddress}
-      </code>
-    </div>
-  )
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/ChainSelect.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/ChainSelect.tsx
deleted file mode 100644
index dcaeb990a..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/ChainSelect.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { invariant } from '@epic-web/invariant'
-import { CHAIN_NAME } from '@zodiac/chains'
-import { Select } from '@zodiac/ui'
-import type { ChainId } from 'ser-kit'
-
-export interface Props {
-  value: ChainId
-  onChange(chainId: ChainId): void
-}
-
-interface Option {
-  value: ChainId
-  label: string
-}
-
-const options = Object.entries(CHAIN_NAME).map(([chainId, name]) => ({
-  value: parseInt(chainId) as ChainId,
-  label: name,
-}))
-
-export const ChainSelect = ({ value, onChange }: Props) => (
-  <Select
-    label="Chain"
-    isMulti={false}
-    options={options}
-    value={options.find((op) => op.value === value)}
-    onChange={(option) => {
-      invariant(option != null, 'Empty value selected as chain')
-
-      onChange(option.value)
-    }}
-    formatOptionLabel={ChainOptionLabel}
-  />
-)
-
-const ChainOptionLabel = ({ value, label }: Option) => (
-  <div className="flex items-center gap-4 py-2">
-    <div className="pl-1">{label || `#${value}`}</div>
-  </div>
-)
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/EditRoute.spec.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/EditRoute.spec.tsx
deleted file mode 100644
index a0f73441d..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/EditRoute.spec.tsx
+++ /dev/null
@@ -1,698 +0,0 @@
-import {
-  getLastUsedRouteId,
-  getRoute,
-  getRoutes,
-  saveLastUsedRouteId,
-} from '@/execution-routes'
-import { useInjectedWallet } from '@/providers'
-import {
-  createMockRoleWaypoint,
-  createMockRoute,
-  createMockStartingWaypoint,
-  createTransaction,
-  MockProvider,
-  mockRoute,
-  mockRoutes,
-  randomAddress,
-  randomPrefixedAddress,
-  render,
-} from '@/test-utils'
-import { ProviderType } from '@/types'
-import {
-  fetchZodiacModules,
-  queryRolesV2MultiSend,
-  SupportedZodiacModuleType,
-} from '@/zodiac'
-import { screen, within } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { Chain } from '@zodiac/chains'
-import { expectRouteToBe } from '@zodiac/test-utils'
-import { getAddress } from 'ethers'
-import {
-  formatPrefixedAddress,
-  parsePrefixedAddress,
-  splitPrefixedAddress,
-} from 'ser-kit'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { action, EditRoute, loader } from './EditRoute'
-
-vi.mock('@/providers', async (importOriginal) => {
-  const module = await importOriginal<typeof import('@/providers')>()
-
-  return {
-    ...module,
-
-    useInjectedWallet: vi.fn(module.useInjectedWallet),
-  }
-})
-
-const mockUseInjectedWallet = vi.mocked(useInjectedWallet)
-
-vi.mock('@/zodiac', async (importOriginal) => {
-  const module = await importOriginal<typeof import('@/zodiac')>()
-
-  return {
-    ...module,
-
-    fetchZodiacModules: vi.fn(module.fetchZodiacModules),
-    queryRolesV2MultiSend: vi.fn(module.queryRolesV2MultiSend),
-  }
-})
-
-const mockFetchZodiacModules = vi.mocked(fetchZodiacModules)
-const mockQueryRolesV2MultiSend = vi.mocked(queryRolesV2MultiSend)
-
-describe('Edit Zodiac route', () => {
-  beforeEach(() => {
-    mockUseInjectedWallet.mockRestore()
-
-    mockFetchZodiacModules.mockResolvedValue([])
-  })
-
-  describe('Label', () => {
-    it('is possible to rename a route', async () => {
-      mockRoute({ id: 'route-id' })
-
-      await render('/routes/edit/route-id', [
-        {
-          path: '/routes/edit/:routeId',
-          Component: EditRoute,
-          loader,
-          action,
-        },
-      ])
-
-      await userEvent.type(
-        screen.getByRole('textbox', { name: 'Route label' }),
-        'Test route',
-      )
-
-      await userEvent.click(
-        screen.getByRole('button', { name: 'Save & Launch' }),
-      )
-
-      await expect(getRoute('route-id')).resolves.toHaveProperty(
-        'label',
-        'Test route',
-      )
-    })
-  })
-
-  describe('Chain', () => {
-    it('is possible to switch the chain of a route', async () => {
-      const avatarAddress = randomAddress()
-
-      mockRoute({
-        id: 'route-id',
-        avatar: formatPrefixedAddress(1, avatarAddress),
-      })
-
-      await render('/routes/edit/route-id', [
-        {
-          path: '/routes/edit/:routeId',
-          Component: EditRoute,
-          loader,
-          action,
-        },
-      ])
-
-      await userEvent.click(screen.getByRole('combobox', { name: 'Chain' }))
-      await userEvent.click(
-        screen.getByRole('option', { name: 'Arbitrum One' }),
-      )
-
-      await userEvent.click(
-        screen.getByRole('button', { name: 'Save & Launch' }),
-      )
-
-      await expect(getRoute('route-id')).resolves.toHaveProperty(
-        'avatar',
-        formatPrefixedAddress(42161, avatarAddress).toLowerCase(),
-      )
-    })
-  })
-
-  describe('Pilot Account', () => {
-    describe('MetaMask', () => {
-      it('is possible to connect an account', async () => {
-        const account = randomAddress()
-
-        mockUseInjectedWallet.mockReturnValue({
-          accounts: [account],
-          chainId: 1,
-          connect: vi
-            .fn()
-            .mockResolvedValue({ chainId: 1, accounts: [account] }),
-          connectionStatus: 'disconnected',
-          provider: new MockProvider(),
-          ready: true,
-          switchChain: vi.fn(),
-        })
-
-        mockRoute({ id: 'route-id' })
-
-        await render('/routes/edit/route-id', [
-          {
-            path: '/routes/edit/:routeId',
-            Component: EditRoute,
-            loader,
-            action,
-          },
-        ])
-
-        await userEvent.click(
-          screen.getByRole('button', { name: 'Connect with MetaMask' }),
-        )
-        await userEvent.click(
-          screen.getByRole('button', { name: 'Save & Launch' }),
-        )
-
-        await expect(getRoute('route-id')).resolves.toHaveProperty(
-          'initiator',
-          `eoa:${account}`,
-        )
-      })
-    })
-  })
-
-  describe('Piloted Safe', () => {
-    it('is possible to define a safe', async () => {
-      await mockRoute({ id: 'route-id' })
-
-      await render('/routes/edit/route-id', [
-        {
-          path: '/routes/edit/:routeId',
-          Component: EditRoute,
-          loader,
-          action,
-        },
-      ])
-
-      const address = randomAddress()
-
-      await userEvent.type(
-        screen.getByRole('textbox', { name: 'Piloted Safe' }),
-        `${address}[enter]`,
-      )
-      await userEvent.click(
-        screen.getByRole('button', { name: 'Save & Launch' }),
-      )
-
-      await expect(getRoute('route-id')).resolves.toHaveProperty(
-        'avatar',
-        formatPrefixedAddress(1, address).toLowerCase(),
-      )
-    })
-
-    it('clears the module when the piloted safe changes', async () => {
-      const moduleAddress = randomAddress()
-
-      await mockRoute({
-        id: 'route-id',
-        avatar: randomPrefixedAddress(),
-        waypoints: [
-          createMockStartingWaypoint(),
-          createMockRoleWaypoint({ moduleAddress }),
-        ],
-      })
-
-      mockFetchZodiacModules.mockResolvedValue([
-        { moduleAddress, type: SupportedZodiacModuleType.ROLES_V2 },
-      ])
-
-      mockQueryRolesV2MultiSend.mockResolvedValue([])
-
-      await render('/routes/edit/route-id', [
-        {
-          path: '/routes/edit/:routeId',
-          Component: EditRoute,
-          loader,
-          action,
-        },
-      ])
-
-      await userEvent.click(
-        screen.getByRole('button', { name: 'Clear piloted Safe' }),
-      )
-
-      expect(screen.queryByText('Roles v2')).not.toBeInTheDocument()
-    })
-  })
-
-  describe('Zodiac modules', () => {
-    it('is possible to select a zodiac mod', async () => {
-      mockRoute({ id: 'route-id', avatar: randomPrefixedAddress() })
-
-      const moduleAddress = randomAddress()
-
-      mockFetchZodiacModules.mockResolvedValue([
-        { moduleAddress, type: SupportedZodiacModuleType.ROLES_V2 },
-      ])
-
-      mockQueryRolesV2MultiSend.mockResolvedValue([])
-
-      await render('/routes/edit/route-id', [
-        {
-          path: '/routes/edit/:routeId',
-          Component: EditRoute,
-          loader,
-          action,
-        },
-      ])
-
-      await userEvent.click(
-        screen.getByRole('combobox', { name: 'Zodiac Mod' }),
-      )
-      await userEvent.click(
-        screen.getByRole('option', {
-          name: `Roles v2 ${getAddress(moduleAddress)}`,
-        }),
-      )
-
-      await userEvent.click(
-        screen.getByRole('button', { name: 'Save & Launch' }),
-      )
-
-      const route = await getRoute('route-id')
-      const [, roleWaypoint] = route.waypoints || []
-
-      expect(roleWaypoint?.account).toHaveProperty('address', moduleAddress)
-    })
-  })
-
-  describe('Remove', () => {
-    it('is possible to remove a route', async () => {
-      mockRoute({ id: 'route-id' })
-
-      await render('/routes/edit/route-id', [
-        {
-          path: '/routes/edit/:routeId',
-          Component: EditRoute,
-          loader,
-          action,
-        },
-      ])
-
-      await userEvent.click(
-        screen.getByRole('button', { name: 'Remove route' }),
-      )
-
-      const { getByRole } = within(
-        screen.getByRole('dialog', { name: 'Remove route' }),
-      )
-
-      await userEvent.click(getByRole('button', { name: 'Remove' }))
-
-      await expect(getRoutes()).resolves.toEqual([])
-    })
-
-    it('does not remove the route if the user cancels', async () => {
-      const route = await mockRoute({ id: 'route-id' })
-
-      await render('/routes/edit/route-id', [
-        {
-          path: '/routes/edit/:routeId',
-          Component: EditRoute,
-          loader,
-          action,
-        },
-      ])
-
-      await userEvent.click(
-        screen.getByRole('button', { name: 'Remove route' }),
-      )
-
-      const { getAllByRole } = within(
-        screen.getByRole('dialog', { name: 'Remove route' }),
-      )
-
-      await userEvent.click(getAllByRole('button', { name: 'Cancel' })[0])
-
-      await expect(getRoutes()).resolves.toEqual([route])
-    })
-
-    it('navigates back to all routes after remove', async () => {
-      await mockRoutes(
-        { id: 'route-id', label: 'First route' },
-        { label: 'Second route' },
-      )
-
-      await render(
-        '/routes/edit/route-id',
-        [
-          {
-            path: '/routes/edit/:routeId',
-            Component: EditRoute,
-            loader,
-            action,
-          },
-        ],
-        { inspectRoutes: ['/routes'] },
-      )
-
-      await userEvent.click(
-        screen.getByRole('button', { name: 'Remove route' }),
-      )
-
-      const { getByRole } = within(
-        screen.getByRole('dialog', { name: 'Remove route' }),
-      )
-
-      await userEvent.click(getByRole('button', { name: 'Remove' }))
-
-      await expectRouteToBe('/routes')
-    })
-
-    it('navigates back to the root when the last route is removed', async () => {
-      await mockRoutes({ id: 'route-id' })
-
-      await render(
-        '/routes/edit/route-id',
-        [
-          {
-            path: '/routes/edit/:routeId',
-            Component: EditRoute,
-            loader,
-            action,
-          },
-        ],
-        { inspectRoutes: ['/'] },
-      )
-
-      await userEvent.click(
-        screen.getByRole('button', { name: 'Remove route' }),
-      )
-
-      const { getByRole } = within(
-        screen.getByRole('dialog', { name: 'Remove route' }),
-      )
-
-      await userEvent.click(getByRole('button', { name: 'Remove' }))
-
-      await expectRouteToBe('/')
-    })
-
-    it('sets another route as active, when the the deleted route is currently active', async () => {
-      await mockRoutes({ id: 'first-route' }, { id: 'second-route' })
-
-      await render(
-        '/routes/edit/first-route',
-        [
-          {
-            path: '/routes/edit/:routeId',
-            Component: EditRoute,
-            loader,
-            action,
-          },
-        ],
-        { inspectRoutes: ['/routes'] },
-      )
-
-      await userEvent.click(
-        screen.getByRole('button', { name: 'Remove route' }),
-      )
-
-      const { getByRole } = within(
-        screen.getByRole('dialog', { name: 'Remove route' }),
-      )
-
-      await userEvent.click(getByRole('button', { name: 'Remove' }))
-
-      await expect(getLastUsedRouteId()).resolves.toEqual('second-route')
-    })
-  })
-
-  describe('Switch chain', () => {
-    it('is possible to switch the chain of an injected wallet', async () => {
-      mockRoute({
-        id: 'routeId',
-        providerType: ProviderType.InjectedWallet,
-        initiator: randomPrefixedAddress({ chainId: 1 }),
-        avatar: randomPrefixedAddress({ chainId: 10 }),
-      })
-
-      const switchChain = vi.fn()
-
-      mockUseInjectedWallet.mockReturnValue({
-        accounts: ['0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266'],
-        chainId: 1,
-        ready: true,
-        connectionStatus: 'connected',
-        connect: vi.fn(),
-        switchChain,
-        provider: new MockProvider(),
-      })
-
-      await render('/routes/edit/routeId', [
-        {
-          path: '/routes/edit/:routeId',
-          Component: EditRoute,
-          loader,
-          action,
-        },
-      ])
-
-      await userEvent.click(
-        screen.getByRole('button', { name: 'Switch wallet to Optimism' }),
-      )
-
-      expect(switchChain).toHaveBeenCalledWith(10)
-    })
-  })
-
-  describe('New route', () => {
-    it('uses the correct chain to fetch zodiac modules', async () => {
-      const route = await mockRoute({ id: 'new-route' })
-
-      await render('/routes/edit/new-route', [
-        {
-          path: '/routes/edit/:routeId',
-          Component: EditRoute,
-          loader,
-          action,
-        },
-      ])
-
-      await userEvent.click(screen.getByRole('combobox', { name: 'Chain' }))
-      await userEvent.click(
-        screen.getByRole('option', { name: 'Arbitrum One' }),
-      )
-
-      await userEvent.type(
-        screen.getByRole('textbox', { name: 'Piloted Safe' }),
-        randomAddress(),
-      )
-
-      const [, avatarAddress] = splitPrefixedAddress(route.avatar)
-
-      expect(mockFetchZodiacModules).toHaveBeenCalledWith(
-        avatarAddress,
-        Chain.ARB1,
-      )
-    })
-  })
-
-  describe('Launch', () => {
-    it('launches the route upon save', async () => {
-      mockRoute({ id: 'route-id' })
-
-      await render(
-        '/routes/edit/route-id',
-        [
-          {
-            path: '/routes/edit/:routeId',
-            Component: EditRoute,
-            loader,
-            action,
-          },
-        ],
-        { inspectRoutes: ['/:activeRouteId'] },
-      )
-
-      await userEvent.click(
-        screen.getByRole('button', { name: 'Save & Launch' }),
-      )
-
-      await expectRouteToBe('/route-id')
-    })
-
-    describe('Clearing transactions', () => {
-      it('warns about clearing transactions when the avatars differ', async () => {
-        const currentAvatar = randomPrefixedAddress()
-        const newAvatar = randomAddress()
-
-        const selectedRoute = createMockRoute({
-          id: 'firstRoute',
-          avatar: currentAvatar,
-        })
-
-        await mockRoutes(selectedRoute)
-        await saveLastUsedRouteId(selectedRoute.id)
-
-        await render(
-          '/routes/edit/firstRoute',
-          [
-            {
-              path: '/routes/edit/:routeId',
-              Component: EditRoute,
-              loader,
-              action,
-            },
-          ],
-          {
-            initialState: [createTransaction()],
-          },
-        )
-
-        await userEvent.click(
-          screen.getByRole('button', { name: 'Clear piloted Safe' }),
-        )
-        await userEvent.type(
-          screen.getByRole('textbox', { name: 'Piloted Safe' }),
-          newAvatar,
-        )
-
-        await userEvent.click(
-          screen.getByRole('button', { name: 'Save & Launch' }),
-        )
-
-        expect(
-          screen.getByRole('dialog', { name: 'Clear transactions' }),
-        ).toBeInTheDocument()
-      })
-
-      it('does not warn about clearing transactions when the avatars stay the same', async () => {
-        const avatar = randomPrefixedAddress()
-
-        const selectedRoute = createMockRoute({
-          id: 'firstRoute',
-          label: 'First route',
-          avatar,
-        })
-
-        await mockRoutes(selectedRoute)
-        await saveLastUsedRouteId(selectedRoute.id)
-
-        await render(
-          '/routes/edit/firstRoute',
-          [
-            {
-              path: '/routes/edit/:routeId',
-              Component: EditRoute,
-              loader,
-              action,
-            },
-          ],
-          {
-            initialState: [createTransaction()],
-          },
-        )
-
-        await userEvent.click(
-          screen.getByRole('button', { name: 'Clear piloted Safe' }),
-        )
-
-        await userEvent.type(
-          screen.getByRole('textbox', { name: 'Piloted Safe' }),
-          parsePrefixedAddress(avatar),
-        )
-
-        await userEvent.click(
-          screen.getByRole('button', { name: 'Save & Launch' }),
-        )
-
-        expect(
-          screen.queryByRole('dialog', { name: 'Clear transactions' }),
-        ).not.toBeInTheDocument()
-      })
-
-      it('should not warn about clearing transactions when there are none', async () => {
-        const selectedRoute = createMockRoute({
-          id: 'firstRoute',
-          label: 'First route',
-          avatar: randomPrefixedAddress(),
-        })
-
-        await mockRoutes(selectedRoute)
-        await saveLastUsedRouteId(selectedRoute.id)
-
-        await render('/routes/edit/firstRoute', [
-          {
-            path: '/routes/edit/:routeId',
-            Component: EditRoute,
-            loader,
-            action,
-          },
-        ])
-
-        await userEvent.click(
-          screen.getByRole('button', { name: 'Clear piloted Safe' }),
-        )
-
-        await userEvent.type(
-          screen.getByRole('textbox', { name: 'Piloted Safe' }),
-          randomAddress(),
-        )
-
-        await userEvent.click(
-          screen.getByRole('button', { name: 'Save & Launch' }),
-        )
-
-        expect(
-          screen.queryByRole('dialog', { name: 'Clear transactions' }),
-        ).not.toBeInTheDocument()
-      })
-
-      it('is possible to launch a new route and clear transactions', async () => {
-        const selectedRoute = createMockRoute({
-          id: 'firstRoute',
-          label: 'First route',
-          avatar: randomPrefixedAddress(),
-        })
-
-        await mockRoutes(selectedRoute, {
-          id: 'another-route',
-          avatar: randomPrefixedAddress(),
-        })
-        await saveLastUsedRouteId('another-route')
-
-        await render(
-          '/routes/edit/firstRoute',
-          [
-            {
-              path: '/routes/edit/:routeId',
-              Component: EditRoute,
-              loader,
-              action,
-            },
-          ],
-          {
-            initialState: [createTransaction()],
-            inspectRoutes: [
-              '/:activeRouteId/clear-transactions/:newActiveRouteId',
-            ],
-          },
-        )
-
-        await userEvent.click(
-          screen.getByRole('button', { name: 'Clear piloted Safe' }),
-        )
-
-        await userEvent.type(
-          screen.getByRole('textbox', { name: 'Piloted Safe' }),
-          randomAddress(),
-        )
-
-        await userEvent.click(
-          screen.getByRole('button', { name: 'Save & Launch' }),
-        )
-
-        await userEvent.click(
-          screen.getByRole('button', { name: 'Clear transactions' }),
-        )
-
-        await expectRouteToBe('/another-route/clear-transactions/firstRoute')
-      })
-    })
-  })
-})
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/EditRoute.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/EditRoute.tsx
deleted file mode 100644
index d6da3bbb1..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/EditRoute.tsx
+++ /dev/null
@@ -1,482 +0,0 @@
-import {
-  getLastUsedRouteId,
-  getRoute,
-  getRoutes,
-  removeRoute,
-  saveLastUsedRouteId,
-  saveRoute,
-} from '@/execution-routes'
-import { useDisconnectWalletConnectIfNeeded } from '@/providers'
-import { useTransactions } from '@/state'
-import type { HexAddress, LegacyConnection } from '@/types'
-import { formData, getInt, getOptionalString, getString } from '@/utils'
-import {
-  fetchZodiacModules,
-  queryRolesV1MultiSend,
-  queryRolesV2MultiSend,
-  SupportedZodiacModuleType,
-} from '@/zodiac'
-import { invariantResponse } from '@epic-web/invariant'
-import { EOA_ZERO_ADDRESS } from '@zodiac/chains'
-import { decodeRoleKey, encodeRoleKey } from '@zodiac/modules'
-import {
-  Breadcrumbs,
-  Error,
-  errorToast,
-  InlineForm,
-  Page,
-  PrimaryButton,
-  Section,
-  Select,
-  TextInput,
-  Warning,
-} from '@zodiac/ui'
-import { getAddress, ZeroAddress } from 'ethers'
-import { Rocket } from 'lucide-react'
-import { Suspense, useEffect, useRef, useState } from 'react'
-import {
-  Await,
-  redirect,
-  useLoaderData,
-  useSubmit,
-  type ActionFunctionArgs,
-  type LoaderFunctionArgs,
-} from 'react-router'
-import {
-  formatPrefixedAddress,
-  splitPrefixedAddress,
-  type ChainId,
-} from 'ser-kit'
-import { ClearTransactionsModal } from '../../ClearTransactionsModal'
-import {
-  asLegacyConnection,
-  fromLegacyConnection,
-} from '../../legacyConnectionMigrations'
-import { RemoveButton } from '../RemoveButton'
-import { AvatarInput } from './AvatarInput'
-import { ChainSelect } from './ChainSelect'
-import { getRouteId } from './getRouteId'
-import { Intent } from './intents'
-import { useConnectionDryRun } from './useConnectionDryRun'
-import { useSafesWithOwner } from './useSafesWithOwner'
-import { ConnectWallet } from './wallet'
-import { ZodiacMod } from './ZodiacMod'
-
-type ConnectionPatch = Omit<Partial<LegacyConnection>, 'id' | 'lastUsed'>
-
-export const loader = async ({ params, request }: LoaderFunctionArgs) => {
-  const url = new URL(request.url)
-  const lastUsedRouteId = await getLastUsedRouteId()
-  const routeId = getRouteId(params)
-
-  const route = await getRoute(routeId)
-
-  const preliminaryAvatarAddress = getPreliminaryAvatarAddress(
-    url.searchParams.get('avatarAddress'),
-  )
-  const preliminaryChainId = url.searchParams.get('chainId')
-  const [chainId, avatarAddress] = splitPrefixedAddress(route.avatar)
-
-  invariantResponse(
-    chainId != null,
-    `Could not parse chain ID from address "${route.avatar}"`,
-  )
-
-  const zodiacModules = fetchZodiacModules(
-    preliminaryAvatarAddress != null ? preliminaryAvatarAddress : avatarAddress,
-    preliminaryChainId != null
-      ? (parseInt(preliminaryChainId) as ChainId)
-      : chainId,
-  )
-
-  return {
-    initialRouteState: route,
-    currentExecutionRoute:
-      lastUsedRouteId != null ? await getRoute(lastUsedRouteId) : null,
-    zodiacModules,
-  }
-}
-
-const getPreliminaryAvatarAddress = (
-  address: string | null,
-): HexAddress | null => {
-  if (address == null) {
-    return null
-  }
-
-  try {
-    return getAddress(address) as HexAddress
-  } catch {
-    return null
-  }
-}
-
-export const action = async ({ params, request }: ActionFunctionArgs) => {
-  const data = await request.formData()
-  const routeId = getRouteId(params)
-
-  switch (getString(data, 'intent')) {
-    case Intent.removeRoute: {
-      const lastUsedRouteId = await getLastUsedRouteId()
-
-      await removeRoute(routeId)
-
-      if (lastUsedRouteId === routeId) {
-        await saveLastUsedRouteId(null)
-      }
-
-      const routes = await getRoutes()
-
-      if (routes.length === 0) {
-        return redirect('/')
-      }
-
-      const [newActiveRoute] = routes
-
-      await saveLastUsedRouteId(newActiveRoute.id)
-
-      return redirect('/routes')
-    }
-
-    case Intent.saveRoute: {
-      await saveRoute(
-        fromLegacyConnection({
-          id: routeId,
-          label: getString(data, 'label'),
-          chainId: getInt(data, 'chainId') as ChainId,
-          avatarAddress: getString(data, 'avatarAddress'),
-          moduleAddress: getString(data, 'moduleAddress'),
-          pilotAddress: getString(data, 'pilotAddress'),
-          providerType: getInt(data, 'providerType'),
-          moduleType: getOptionalString(
-            data,
-            'moduleType',
-          ) as SupportedZodiacModuleType,
-          multisend: getOptionalString(data, 'multisend'),
-          multisendCallOnly: getOptionalString(data, 'multisendCallOnly'),
-          roleId: getOptionalString(data, 'roleId'),
-        }),
-      )
-
-      return redirect(`/${routeId}`)
-    }
-
-    case Intent.clearTransactions: {
-      const lastUsedRouteId = await getLastUsedRouteId()
-
-      await saveRoute(
-        fromLegacyConnection({
-          id: routeId,
-          label: getString(data, 'label'),
-          chainId: getInt(data, 'chainId') as ChainId,
-          avatarAddress: getString(data, 'avatarAddress'),
-          moduleAddress: getString(data, 'moduleAddress'),
-          pilotAddress: getString(data, 'pilotAddress'),
-          providerType: getInt(data, 'providerType'),
-          moduleType: getOptionalString(
-            data,
-            'moduleType',
-          ) as SupportedZodiacModuleType,
-          multisend: getOptionalString(data, 'multisend'),
-          multisendCallOnly: getOptionalString(data, 'multisendCallOnly'),
-          roleId: getOptionalString(data, 'roleId'),
-        }),
-      )
-
-      return redirect(`/${lastUsedRouteId}/clear-transactions/${routeId}`)
-    }
-  }
-}
-
-export const EditRoute = () => {
-  const { initialRouteState, currentExecutionRoute, zodiacModules } =
-    useLoaderData<typeof loader>()
-  const [currentRouteState, setCurrentRouteState] = useState(initialRouteState)
-  const [confirmClearTransactions, setConfirmClearTransactions] =
-    useState(false)
-  const transactions = useTransactions()
-
-  const legacyConnection = asLegacyConnection(currentRouteState)
-  const { label, avatarAddress, pilotAddress, roleId, chainId, moduleAddress } =
-    legacyConnection
-
-  const { safes } = useSafesWithOwner(initialRouteState, pilotAddress)
-
-  const prefixedAvatarAddress = formatPrefixedAddress(
-    chainId,
-    avatarAddress as HexAddress,
-  )
-
-  const updateRoute = (patch: ConnectionPatch) => {
-    console.debug('updateRoute', patch)
-    setCurrentRouteState((route) =>
-      fromLegacyConnection({ ...asLegacyConnection(route), ...patch }),
-    )
-  }
-
-  const error = useConnectionDryRun({
-    currentRoute: initialRouteState,
-    futureRoute: currentRouteState,
-  })
-
-  const [roleIdError, setRoleIdError] = useState<string | null>(null)
-
-  useDisconnectWalletConnectIfNeeded(currentRouteState, {
-    onDisconnect: () => updateRoute({ pilotAddress: '' }),
-  })
-
-  const formRef = useRef(null)
-  const submit = useSubmit()
-
-  useEffect(() => {
-    submit(formData({ avatarAddress, chainId }), { method: 'get' })
-  }, [chainId, avatarAddress, submit])
-
-  return (
-    <>
-      <Page>
-        <Page.Header>
-          <Breadcrumbs>
-            <Breadcrumbs.Entry to="/">Transactions</Breadcrumbs.Entry>
-            <Breadcrumbs.Entry to="/routes">All routes</Breadcrumbs.Entry>
-          </Breadcrumbs>
-
-          <h2 className="mt-1 text-xl">
-            {currentRouteState.label || 'New connection'}
-          </h2>
-        </Page.Header>
-
-        <Page.Content>
-          <InlineForm
-            ref={formRef}
-            className="flex flex-col gap-4"
-            intent={Intent.saveRoute}
-            context={{ ...legacyConnection }}
-          >
-            <TextInput
-              label="Route label"
-              name="label"
-              value={label}
-              onChange={(event) => updateRoute({ label: event.target.value })}
-              placeholder="Label this route"
-            />
-
-            <ChainSelect
-              value={chainId}
-              onChange={(chainId) => updateRoute({ chainId })}
-            />
-
-            <Section
-              title={
-                currentRouteState.initiator === EOA_ZERO_ADDRESS
-                  ? 'Pilot Account'
-                  : undefined
-              }
-            >
-              <ConnectWallet
-                route={currentRouteState}
-                onConnect={({ providerType, chainId, account }) => {
-                  updateRoute({
-                    providerType,
-                    chainId,
-                    pilotAddress: account,
-                  })
-                }}
-                onDisconnect={() => {
-                  updateRoute({ pilotAddress: '' })
-                }}
-                onError={() => {
-                  errorToast({
-                    title: 'Connection error',
-                    message: 'Could not connect to the wallet.',
-                  })
-                }}
-              />
-            </Section>
-
-            <AvatarInput
-              availableSafes={safes}
-              value={avatarAddress === ZeroAddress ? '' : avatarAddress || ''}
-              onChange={(address) => {
-                updateRoute({
-                  avatarAddress: address || undefined,
-                  moduleAddress: '',
-                  moduleType: undefined,
-                })
-              }}
-            />
-
-            <Suspense
-              fallback={
-                <Select
-                  isDisabled
-                  label="Zodiac Mod"
-                  placeholder="Loading modules..."
-                />
-              }
-            >
-              <Await
-                resolve={zodiacModules}
-                errorElement={
-                  <Warning title="Selected safe is not valid">
-                    Please select a valid safe to be able to select a mod.
-                  </Warning>
-                }
-              >
-                {(modules) => {
-                  const selectedModule = modules.find(
-                    (module) => module.moduleAddress === moduleAddress,
-                  )
-
-                  return (
-                    <>
-                      <ZodiacMod
-                        modules={modules}
-                        route={initialRouteState}
-                        avatarAddress={prefixedAvatarAddress}
-                        pilotAddress={pilotAddress}
-                        value={
-                          selectedModule
-                            ? {
-                                moduleAddress: selectedModule.moduleAddress,
-                                moduleType: selectedModule.type,
-                              }
-                            : null
-                        }
-                        onSelect={async (value) => {
-                          if (value == null) {
-                            updateRoute({
-                              moduleAddress: undefined,
-                              moduleType: undefined,
-                            })
-
-                            return
-                          }
-
-                          switch (value.moduleType) {
-                            case SupportedZodiacModuleType.ROLES_V1: {
-                              const multisend = await queryRolesV1MultiSend(
-                                chainId,
-                                value.moduleAddress,
-                              )
-
-                              updateRoute({
-                                ...value,
-                                multisend: multisend[0],
-                              })
-
-                              break
-                            }
-
-                            case SupportedZodiacModuleType.ROLES_V2: {
-                              const [multisend, multisendCallOnly] =
-                                await queryRolesV2MultiSend(
-                                  chainId,
-                                  value.moduleAddress,
-                                )
-
-                              updateRoute({
-                                ...value,
-                                multisend,
-                                multisendCallOnly,
-                              })
-
-                              break
-                            }
-                          }
-                        }}
-                      />
-
-                      {selectedModule?.type ===
-                        SupportedZodiacModuleType.ROLES_V1 && (
-                        <TextInput
-                          label="Role ID"
-                          value={roleId}
-                          onChange={(ev) => {
-                            updateRoute({ roleId: ev.target.value })
-                          }}
-                          placeholder="0"
-                        />
-                      )}
-
-                      {selectedModule?.type ===
-                        SupportedZodiacModuleType.ROLES_V2 && (
-                        <TextInput
-                          label="Role Key"
-                          key={currentRouteState.id} // makes sure the defaultValue is reset when switching connections
-                          error={roleIdError}
-                          defaultValue={
-                            roleId != null
-                              ? decodeRoleKey(roleId) || roleId
-                              : roleId
-                          }
-                          onChange={(ev) => {
-                            try {
-                              const roleId = encodeRoleKey(ev.target.value)
-                              setRoleIdError(null)
-                              updateRoute({ roleId })
-                            } catch (e) {
-                              updateRoute({ roleId: '' })
-                              setRoleIdError((e as Error).message)
-                            }
-                          }}
-                          placeholder="Enter key as bytes32 hex string or in human-readable decoding"
-                        />
-                      )}
-                    </>
-                  )
-                }}
-              </Await>
-            </Suspense>
-          </InlineForm>
-        </Page.Content>
-
-        <Page.Footer>
-          {error && (
-            <Error title="There is a problem with this connection">
-              {error}
-            </Error>
-          )}
-
-          <div className="flex items-center justify-between gap-4">
-            <RemoveButton
-              routeId={legacyConnection.id}
-              intent={Intent.removeRoute}
-            />
-
-            <PrimaryButton
-              disabled={!avatarAddress}
-              icon={Rocket}
-              onClick={async () => {
-                // we continue working with the same avatar, so don't have to clear the recorded transaction
-                const keepTransactionBundle =
-                  currentExecutionRoute == null ||
-                  currentExecutionRoute.avatar.toLowerCase() ===
-                    currentRouteState.avatar.toLowerCase() ||
-                  transactions.length === 0
-
-                if (keepTransactionBundle) {
-                  submit(formRef.current, { method: 'post' })
-
-                  return
-                }
-
-                setConfirmClearTransactions(true)
-              }}
-            >
-              Save & Launch
-            </PrimaryButton>
-          </div>
-        </Page.Footer>
-      </Page>
-
-      <ClearTransactionsModal
-        newActiveRouteId={initialRouteState.id}
-        additionalContext={{ ...legacyConnection }}
-        open={confirmClearTransactions}
-        intent={Intent.clearTransactions}
-        onClose={() => setConfirmClearTransactions(false)}
-      />
-    </>
-  )
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/ModSelect.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/ModSelect.tsx
deleted file mode 100644
index 734e7db37..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/ModSelect.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Blockie, Select } from '@zodiac/ui'
-import { getAddress } from 'ethers'
-import type { PropsWithChildren } from 'react'
-import type { Props as SelectProps } from 'react-select'
-
-export const NO_MODULE_OPTION = { value: '', label: '' }
-
-export interface Option {
-  value: string
-  label: string
-}
-
-interface Props<Option = unknown, Multi extends boolean = boolean>
-  extends SelectProps<Option, Multi> {
-  avatarAddress: string
-}
-
-export function ModSelect<Multi extends boolean = boolean>({
-  avatarAddress,
-  ...props
-}: Props<Option, Multi>) {
-  const ModuleOptionLabel = (option: Option) => {
-    if (!option.value)
-      return (
-        <Value label="No Mod — Direct execution" address={avatarAddress}>
-          Transactions submitted directly to the Safe
-        </Value>
-      )
-
-    const checksumAddress = getAddress(option.value)
-    return (
-      <Value address={option.value} label={option.label}>
-        {checksumAddress}
-      </Value>
-    )
-  }
-
-  return (
-    <Select
-      {...props}
-      label="Zodiac Mod"
-      formatOptionLabel={ModuleOptionLabel}
-      noOptionsMessage={() => 'No modules are enabled on this Safe'}
-    />
-  )
-}
-
-type ValueProps = PropsWithChildren<{
-  label: string
-  address: string
-}>
-
-const Value = ({ label, address, children }: ValueProps) => (
-  <div className="flex items-center gap-4 py-2">
-    <Blockie address={address} className="size-5 shrink-0" />
-
-    <div className="flex items-center gap-2 overflow-hidden">
-      <span className="whitespace-nowrap font-semibold">{label}</span>
-      <code className="overflow-hidden text-ellipsis whitespace-nowrap font-mono opacity-75">
-        {children}
-      </code>
-    </div>
-  </div>
-)
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/ZodiacMod.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/ZodiacMod.tsx
deleted file mode 100644
index 39e3246f3..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/ZodiacMod.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import type { ExecutionRoute } from '@/types'
-import { type ZodiacModule } from '@/zodiac'
-import { SupportedZodiacModuleType, ZODIAC_MODULE_NAMES } from '@zodiac/modules'
-import type { PrefixedAddress } from 'ser-kit'
-import { ModSelect, NO_MODULE_OPTION } from './ModSelect'
-import { useSafeDelegates } from './useSafeDelegates'
-import { useSafesWithOwner } from './useSafesWithOwner'
-
-type Value = {
-  moduleType: SupportedZodiacModuleType
-  moduleAddress: string
-}
-
-type ZodiacModProps = {
-  avatarAddress: PrefixedAddress
-  pilotAddress: string
-  route: ExecutionRoute
-  modules: ZodiacModule[]
-  disabled?: boolean
-  value: Value | null
-
-  onSelect: (value: Value | null) => void
-}
-
-export const ZodiacMod = ({
-  avatarAddress,
-  pilotAddress,
-  value,
-  route,
-  modules,
-  disabled,
-  onSelect,
-}: ZodiacModProps) => {
-  const { safes } = useSafesWithOwner(route, pilotAddress)
-  const { delegates } = useSafeDelegates(route, avatarAddress)
-
-  const pilotIsOwner = safes.some(
-    (safe) => safe.toLowerCase() === avatarAddress.toLowerCase(),
-  )
-  const pilotIsDelegate = delegates.some(
-    (delegate) => delegate.toLowerCase() === pilotAddress.toLowerCase(),
-  )
-  const defaultModOption =
-    pilotIsOwner || pilotIsDelegate ? NO_MODULE_OPTION : undefined
-
-  return (
-    <div className="flex flex-col gap-4">
-      <ModSelect
-        isMulti={false}
-        // disabled={modules.length === 0}
-        options={[
-          ...(pilotIsOwner || pilotIsDelegate ? [NO_MODULE_OPTION] : []),
-          ...modules.map((mod) => ({
-            value: mod.moduleAddress,
-            label: ZODIAC_MODULE_NAMES[mod.type],
-          })),
-        ]}
-        onChange={async (selected) => {
-          if (selected == null) {
-            onSelect(null)
-
-            return
-          }
-
-          const module = modules.find(
-            ({ moduleAddress }) => moduleAddress === selected.value,
-          )
-
-          if (module == null) {
-            onSelect(null)
-
-            return
-          }
-
-          onSelect({
-            moduleAddress: module.moduleAddress,
-            moduleType: module.type,
-          })
-        }}
-        value={
-          value
-            ? {
-                value: value.moduleAddress,
-                label: ZODIAC_MODULE_NAMES[value.moduleType],
-              }
-            : defaultModOption != null
-              ? defaultModOption
-              : null
-        }
-        isDisabled={disabled}
-        placeholder="Select a module"
-        avatarAddress={avatarAddress}
-      />
-    </div>
-  )
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/getRouteId.ts b/deployables/extension/src/panel/pages/routes/edit.$routeId/getRouteId.ts
deleted file mode 100644
index f0c31a7ad..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/getRouteId.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { invariant } from '@epic-web/invariant'
-import { type Params } from 'react-router'
-
-export const getRouteId = (params: Params) => {
-  const { routeId } = params
-
-  invariant(routeId != null, 'No "routeId" found in params')
-
-  return routeId
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/index.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/index.tsx
deleted file mode 100644
index 44115d314..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/index.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { action, EditRoute as Component, loader } from './EditRoute'
-
-export const EditRoute = {
-  path: 'edit/:routeId',
-  element: <Component />,
-  loader,
-  action,
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/intents.ts b/deployables/extension/src/panel/pages/routes/edit.$routeId/intents.ts
deleted file mode 100644
index 827a4cd37..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/intents.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export enum Intent {
-  saveRoute = 'saveRoute',
-  removeRoute = 'removeRoute',
-  clearTransactions = 'clearTransactions',
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/useConnectionDryRun.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/useConnectionDryRun.tsx
deleted file mode 100644
index 65a1e58c7..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/useConnectionDryRun.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-import { useRouteConnect } from '@/execution-routes'
-import { getReadOnlyProvider } from '@/providers'
-import { sentry } from '@/sentry'
-import type {
-  ExecutionRoute,
-  HexAddress,
-  JsonRpcError,
-  LegacyConnection,
-} from '@/types'
-import {
-  decodeGenericError,
-  decodeRolesV1Error,
-  decodeRolesV2Error,
-  isSmartContractAddress,
-  validateAddress,
-} from '@/utils'
-import { decodeRoleKey, SupportedZodiacModuleType } from '@zodiac/modules'
-import { useEffect, useState } from 'react'
-import { asLegacyConnection } from '../../legacyConnectionMigrations'
-import { wrapRequest } from './wrapRequest'
-
-type DryRunOptions = {
-  currentRoute: ExecutionRoute
-  futureRoute: ExecutionRoute
-}
-
-export const useConnectionDryRun = ({
-  currentRoute,
-  futureRoute,
-}: DryRunOptions) => {
-  const [error, setError] = useState<string | null>(null)
-
-  const [connected] = useRouteConnect(currentRoute)
-
-  useEffect(() => {
-    const connection = asLegacyConnection(futureRoute)
-    const { pilotAddress, avatarAddress, moduleAddress, moduleType, roleId } =
-      connection
-
-    const configurationComplete =
-      moduleType === SupportedZodiacModuleType.DELAY || !!roleId
-
-    if (
-      connected &&
-      pilotAddress &&
-      avatarAddress &&
-      moduleAddress &&
-      configurationComplete
-    ) {
-      dryRun(connection)
-        .then(() => {
-          console.debug('dry run success')
-          setError(null)
-        })
-        .catch((e: JsonRpcError) => {
-          // For the Roles mod, we actually expect the dry run to fail with TargetAddressNotAllowed()
-          // In case we see any other error, we try to help the user identify the problem.
-
-          switch (moduleType) {
-            case SupportedZodiacModuleType.ROLES_V1: {
-              setError(handleRolesV1Error(e, roleId || '0'))
-              return
-            }
-            case SupportedZodiacModuleType.ROLES_V2: {
-              setError(handleRolesV2Error(e, roleId || '0'))
-              return
-            }
-            default: {
-              setError(decodeGenericError(e))
-
-              sentry.captureException(e)
-              console.warn('Unexpected dry run error', e)
-            }
-          }
-        })
-    }
-  }, [connected, futureRoute])
-
-  return error
-}
-
-const handleRolesV1Error = (e: JsonRpcError, roleId: string) => {
-  const rolesError = decodeRolesV1Error(e)
-  if (rolesError) {
-    switch (rolesError.signature) {
-      case 'UnacceptableMultiSendOffset()':
-        // we're calling to the zero address, so if this error happens it means our call was handled as a multi-send which happens
-        // if the Role mod's multiSend address has not been initialized
-        return "The Roles mod is not configured to accept multi-send calls. Use the contract's `setMultiSend` function to set the multi-send address."
-
-      case 'TargetAddressNotAllowed()':
-        // this is the expected error for a working Roles mod setup
-        return null
-
-      case 'NoMembership()':
-        return `The Pilot account is not a member of role #${roleId}.`
-
-      default:
-    }
-  }
-
-  const decoded = decodeGenericError(e)
-  console.warn('Unexpected Roles v1 error', e, decoded)
-  return decoded || 'Unexpected error'
-}
-
-const handleRolesV2Error = (e: JsonRpcError, roleKey: string) => {
-  const rolesError = decodeRolesV2Error(e)
-  if (rolesError) {
-    switch (rolesError.signature) {
-      case 'NotAuthorized(address)':
-        return 'The Pilot account must be enabled as a module of the modifier.'
-
-      case 'ConditionViolation(uint8,bytes32)':
-        // this is the expected error for a working Roles mod setup
-        return null
-
-      case 'NoMembership()':
-        return `The Pilot account is not a member of role ${decodeRoleKey(
-          roleKey,
-        )}.`
-
-      default:
-    }
-  }
-
-  const decoded = decodeGenericError(e)
-  console.warn('Unexpected Roles v2 error', e, decoded)
-  return decoded || 'Unexpected error'
-}
-
-async function dryRun(connection: LegacyConnection) {
-  const provider = getReadOnlyProvider(connection.chainId)
-
-  if (connection.pilotAddress && !validateAddress(connection.pilotAddress)) {
-    return Promise.reject('Pilot Account: Invalid address')
-  }
-  if (!validateAddress(connection.moduleAddress)) {
-    return Promise.reject('Module Address: Invalid address')
-  }
-  if (!validateAddress(connection.avatarAddress)) {
-    return Promise.reject('Avatar: Invalid address')
-  }
-
-  if (!(await isSmartContractAddress(connection.moduleAddress, provider))) {
-    return Promise.reject('Module Address: Not a smart contract')
-  }
-  if (!(await isSmartContractAddress(connection.avatarAddress, provider))) {
-    return Promise.reject('Avatar: Not a smart contract')
-  }
-
-  const request = wrapRequest(
-    {
-      to: '0x0000000000000000000000000000000000000000',
-      data: '0x00000000',
-      from: connection.avatarAddress as HexAddress,
-    },
-    connection,
-    false,
-  )
-
-  // TODO enable this once we can query role members from ser
-  // if (!request.from && connection.roleId) {
-  //   // If pilotAddress is not yet determined, we will use a random member of the specified role
-  //   request.from = await getRoleMember(connection)
-  // }
-
-  await provider.estimateGas(request)
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/useRouteId.ts b/deployables/extension/src/panel/pages/routes/edit.$routeId/useRouteId.ts
deleted file mode 100644
index 28d58c954..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/useRouteId.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { invariant } from '@epic-web/invariant'
-import { useParams } from 'react-router'
-
-export const useRouteId = () => {
-  const { routeId } = useParams()
-
-  invariant(routeId != null, 'No "routeId" found in params')
-
-  return routeId
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/useSafeDelegates.ts b/deployables/extension/src/panel/pages/routes/edit.$routeId/useSafeDelegates.ts
deleted file mode 100644
index 41f2f5686..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/useSafeDelegates.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { useRouteProvider } from '@/execution-routes'
-import { initSafeApiKit } from '@/safe'
-import { sentry } from '@/sentry'
-import type { ExecutionRoute } from '@/types'
-import { validateAddress } from '@/utils'
-import { getChainId } from '@zodiac/chains'
-import { useEffect, useState } from 'react'
-import type { ChainId } from 'ser-kit'
-
-export const useSafeDelegates = (
-  route: ExecutionRoute,
-  safeAddress: string,
-) => {
-  const chainId = getChainId(route.avatar)
-  const provider = useRouteProvider(route)
-
-  const [loading, setLoading] = useState(false)
-  const [delegates, setDelegates] = useState<string[]>([])
-
-  const checksumSafeAddress = validateAddress(safeAddress)
-
-  useEffect(() => {
-    if (!chainId || !checksumSafeAddress) return
-
-    const safeApiKit = initSafeApiKit(chainId as ChainId)
-
-    setLoading(true)
-    let canceled = false
-
-    safeApiKit
-      .getSafeDelegates({ safeAddress: checksumSafeAddress })
-      .then((res) => {
-        if (!canceled) {
-          setDelegates(res.results.map((delegate) => delegate.delegate))
-        }
-      })
-      .catch((e) => {
-        sentry.captureException(e)
-        console.error(`Error fetching delegates for ${checksumSafeAddress}`, e)
-      })
-      .finally(() => {
-        setLoading(false)
-      })
-
-    return () => {
-      setLoading(false)
-      setDelegates([])
-      canceled = true
-    }
-  }, [provider, checksumSafeAddress, chainId])
-
-  return { loading, delegates }
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/useSafesWithOwner.ts b/deployables/extension/src/panel/pages/routes/edit.$routeId/useSafesWithOwner.ts
deleted file mode 100644
index e5bc14d7b..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/useSafesWithOwner.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { initSafeApiKit } from '@/safe'
-import { sentry } from '@/sentry'
-import type { ExecutionRoute } from '@/types'
-import { validateAddress } from '@/utils'
-import { getChainId } from '@zodiac/chains'
-import { useEffect, useState } from 'react'
-import type { ChainId } from 'ser-kit'
-
-export const useSafesWithOwner = (
-  route: ExecutionRoute,
-  ownerAddress: string,
-) => {
-  const chainId = getChainId(route.avatar)
-
-  const [loading, setLoading] = useState(false)
-  const [safes, setSafes] = useState<string[]>([])
-
-  const checksumOwnerAddress = validateAddress(ownerAddress)
-
-  useEffect(() => {
-    if (!chainId || !checksumOwnerAddress) return
-
-    const safeService = initSafeApiKit(chainId as ChainId)
-
-    setLoading(true)
-    let canceled = false
-
-    safeService
-      .getSafesByOwner(checksumOwnerAddress)
-      .then((res) => {
-        if (!canceled) {
-          setSafes(res.safes)
-        }
-      })
-      .catch((e) => {
-        sentry.captureException(e)
-        console.error(`Error fetching safes for ${checksumOwnerAddress}`, e)
-      })
-      .finally(() => {
-        setLoading(false)
-      })
-
-    return () => {
-      setLoading(false)
-      setSafes([])
-      canceled = true
-    }
-  }, [checksumOwnerAddress, chainId])
-
-  return { loading, safes }
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/Account.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/Account.tsx
deleted file mode 100644
index f6e926f7d..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/Account.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { ProviderType } from '@/types'
-import { validateAddress } from '@/utils'
-import { AddressInput, CopyToClipboard } from '@zodiac/ui'
-
-type AccountProps = {
-  type: ProviderType
-  children: string
-}
-
-export const Account = ({ children, type }: AccountProps) => {
-  const address = validateAddress(children)
-
-  return (
-    <AddressInput
-      readOnly
-      value={address}
-      label="Pilot Account"
-      description={
-        type === ProviderType.InjectedWallet ? 'Meta Mask' : 'Wallet Connect'
-      }
-      action={
-        <CopyToClipboard iconOnly size="small" data={address}>
-          Copy address
-        </CopyToClipboard>
-      }
-    />
-  )
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/ConnectWallet.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/ConnectWallet.tsx
deleted file mode 100644
index 5329a3ce8..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/ConnectWallet.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import {
-  type InjectedWalletContextT,
-  type WalletConnectResult,
-  isConnected as isConnectedBase,
-} from '@/providers'
-import { type ExecutionRoute, ProviderType } from '@/types'
-import { getChainId } from '@zodiac/chains'
-import { ZeroAddress } from 'ethers'
-import { type ChainId, parsePrefixedAddress } from 'ser-kit'
-import { InjectedWallet, InjectedWalletConnect } from './injectedWallet'
-import { WalletConnect, WalletConnectConnect } from './walletConnect'
-
-interface Props {
-  route: ExecutionRoute
-  onConnect(args: {
-    providerType: ProviderType
-    chainId: ChainId
-    account: string
-  }): void
-  onDisconnect(): void
-  onError: () => void
-}
-
-export const ConnectWallet = ({
-  route,
-  onConnect,
-  onDisconnect,
-  onError,
-}: Props) => {
-  const pilotAddress = getPilotAddress(route)
-  const chainId = getChainId(route.avatar)
-
-  const isConnected = (
-    provider: InjectedWalletContextT | WalletConnectResult,
-  ) =>
-    route.initiator != null &&
-    isConnectedBase(provider, route.initiator, chainId)
-
-  // not connected
-  if (pilotAddress == null) {
-    return (
-      <div className="flex flex-col gap-2">
-        <WalletConnectConnect
-          routeId={route.id}
-          onConnect={(chainId, account) =>
-            onConnect({
-              providerType: ProviderType.WalletConnect,
-              chainId,
-              account,
-            })
-          }
-          onError={onError}
-        />
-
-        <InjectedWalletConnect
-          onConnect={(chainId, account) =>
-            onConnect({
-              providerType: ProviderType.InjectedWallet,
-              chainId,
-              account,
-            })
-          }
-          onError={onError}
-        />
-      </div>
-    )
-  }
-
-  switch (route.providerType) {
-    case ProviderType.InjectedWallet:
-      return (
-        <InjectedWallet
-          chainId={chainId}
-          pilotAddress={pilotAddress}
-          isConnected={isConnected}
-          onDisconnect={onDisconnect}
-          onError={onError}
-        />
-      )
-    case ProviderType.WalletConnect:
-      return (
-        <WalletConnect
-          chainId={chainId}
-          pilotAddress={pilotAddress}
-          routeId={route.id}
-          isConnected={isConnected}
-          onDisconnect={onDisconnect}
-          onError={onError}
-        />
-      )
-  }
-}
-
-const getPilotAddress = (route: ExecutionRoute) => {
-  if (route.initiator == null) {
-    return null
-  }
-
-  const address = parsePrefixedAddress(route.initiator).toLowerCase()
-
-  if (address === ZeroAddress) {
-    return null
-  }
-
-  return address
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/Connected.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/Connected.tsx
deleted file mode 100644
index 5dd326858..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/Connected.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { SecondaryButton } from '@zodiac/ui'
-import type { PropsWithChildren } from 'react'
-import { Section } from './Section'
-
-type ConnectedProps = PropsWithChildren<{
-  onDisconnect: () => void
-}>
-
-export const Connected = ({ children, onDisconnect }: ConnectedProps) => (
-  <Section>
-    {children}
-
-    <SecondaryButton fluid onClick={onDisconnect}>
-      Disconnect
-    </SecondaryButton>
-  </Section>
-)
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/Section.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/Section.tsx
deleted file mode 100644
index da71b9bbe..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/Section.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { PropsWithChildren } from 'react'
-
-export const Section = ({ children }: PropsWithChildren) => (
-  <div className="flex flex-col gap-4">{children}</div>
-)
-
-const Actions = ({ children }: PropsWithChildren) => (
-  <div className="flex gap-2">{children}</div>
-)
-
-Section.Actions = Actions
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/SwitchChain.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/SwitchChain.tsx
deleted file mode 100644
index 50d3ad18c..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/SwitchChain.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { CHAIN_NAME } from '@zodiac/chains'
-import { SecondaryButton, Warning } from '@zodiac/ui'
-import type { PropsWithChildren } from 'react'
-import type { ChainId } from 'ser-kit'
-import { Section } from './Section'
-
-type SwitchChainProps = PropsWithChildren<{
-  chainId: ChainId
-
-  onSwitch?: () => void
-  onDisconnect?: () => void
-}>
-
-export const SwitchChain = ({
-  chainId,
-  children,
-  onSwitch,
-  onDisconnect,
-}: SwitchChainProps) => {
-  const chainName = CHAIN_NAME[chainId] || `#${chainId}`
-
-  return (
-    <Section>
-      {children}
-
-      <Warning title="Chain mismatch">
-        The connected wallet belongs to a different chain. To use it you need to
-        switch back to <span className="font-semibold">{chainName}</span>
-      </Warning>
-
-      <Section.Actions>
-        {onSwitch && (
-          <SecondaryButton fluid onClick={onSwitch}>
-            Switch wallet to {chainName}
-          </SecondaryButton>
-        )}
-
-        {onDisconnect && (
-          <SecondaryButton fluid onClick={onDisconnect}>
-            Disconnect
-          </SecondaryButton>
-        )}
-      </Section.Actions>
-    </Section>
-  )
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/WalletDisconnected.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/WalletDisconnected.tsx
deleted file mode 100644
index bc9e6debf..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/WalletDisconnected.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { useInjectedWallet } from '@/providers'
-import { SecondaryButton, Warning } from '@zodiac/ui'
-import type { PropsWithChildren } from 'react'
-import { Section } from './Section'
-
-type WalletDisconnectedProps = PropsWithChildren<{
-  onReconnect: () => void
-  onDisconnect: () => void
-}>
-
-export const WalletDisconnected = ({
-  children,
-  onReconnect,
-  onDisconnect,
-}: WalletDisconnectedProps) => {
-  const injectedWallet = useInjectedWallet()
-
-  return (
-    <Section>
-      {children}
-
-      <Warning title="Wallet disconnected">
-        Your wallet is disconnected from Pilot. Reconnect it to use the selected
-        account with Pilot.
-      </Warning>
-
-      <Section.Actions>
-        <SecondaryButton
-          fluid
-          disabled={!injectedWallet.ready}
-          onClick={onReconnect}
-        >
-          Connect
-        </SecondaryButton>
-
-        <SecondaryButton fluid onClick={onDisconnect}>
-          Disconnect
-        </SecondaryButton>
-      </Section.Actions>
-    </Section>
-  )
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/WrongAccount.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/WrongAccount.tsx
deleted file mode 100644
index 429f2951f..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/WrongAccount.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { SecondaryButton, Warning } from '@zodiac/ui'
-import type { PropsWithChildren } from 'react'
-import { Section } from './Section'
-
-type WrongAccountProps = PropsWithChildren<{
-  onDisconnect: () => void
-}>
-
-export const WrongAccount = ({ children, onDisconnect }: WrongAccountProps) => (
-  <Section>
-    {children}
-
-    <Warning title="Account is not connected">
-      Switch your wallet to this account in order to use Pilot.
-    </Warning>
-
-    <SecondaryButton fluid onClick={onDisconnect}>
-      Disconnect
-    </SecondaryButton>
-  </Section>
-)
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/index.ts b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/index.ts
deleted file mode 100644
index 8524fdbef..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ConnectWallet } from './ConnectWallet'
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/injectedWallet/InjectedWallet.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/injectedWallet/InjectedWallet.tsx
deleted file mode 100644
index df3f38c99..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/injectedWallet/InjectedWallet.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { type InjectedWalletContextT, useInjectedWallet } from '@/providers'
-import { ProviderType } from '@/types'
-import type { ChainId } from 'ser-kit'
-import { Account } from '../Account'
-import { Connected } from '../Connected'
-import { SwitchChain } from '../SwitchChain'
-import { WalletDisconnected } from '../WalletDisconnected'
-import { WrongAccount } from '../WrongAccount'
-
-type InjectedWalletProps = {
-  pilotAddress: string
-  chainId: ChainId
-
-  onDisconnect: () => void
-  onError: () => void
-  isConnected: (provider: InjectedWalletContextT) => boolean
-}
-
-export const InjectedWallet = ({
-  pilotAddress,
-  chainId,
-  onDisconnect,
-  onError,
-  isConnected,
-}: InjectedWalletProps) => {
-  const injectedWallet = useInjectedWallet()
-
-  if (isConnected(injectedWallet)) {
-    return (
-      <Connected onDisconnect={onDisconnect}>
-        <Account type={ProviderType.InjectedWallet}>{pilotAddress}</Account>
-      </Connected>
-    )
-  }
-
-  // Wallet disconnected
-  if (injectedWallet.accounts.length === 0) {
-    return (
-      <WalletDisconnected
-        onDisconnect={onDisconnect}
-        onReconnect={async () => {
-          const result = await injectedWallet.connect()
-
-          if (result == null) {
-            onError()
-          }
-        }}
-      >
-        <Account type={ProviderType.InjectedWallet}>{pilotAddress}</Account>
-      </WalletDisconnected>
-    )
-  }
-
-  // Injected wallet: right account, wrong chain
-  if (injectedWallet.chainId !== chainId) {
-    return (
-      <SwitchChain
-        chainId={chainId}
-        onSwitch={() => injectedWallet.switchChain(chainId)}
-        onDisconnect={onDisconnect}
-      >
-        <Account type={ProviderType.InjectedWallet}>{pilotAddress}</Account>
-      </SwitchChain>
-    )
-  }
-
-  const accountInWallet = injectedWallet.accounts.some(
-    (acc) => acc.toLowerCase() === pilotAddress,
-  )
-
-  // Wrong account
-  if (!accountInWallet) {
-    return (
-      <WrongAccount onDisconnect={onDisconnect}>
-        <Account type={ProviderType.InjectedWallet}>{pilotAddress}</Account>
-      </WrongAccount>
-    )
-  }
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/injectedWallet/InjectedWalletConnect.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/injectedWallet/InjectedWalletConnect.tsx
deleted file mode 100644
index 77cf27042..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/injectedWallet/InjectedWalletConnect.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { useInjectedWallet } from '@/providers'
-import { ProviderType } from '@/types'
-import { SecondaryButton } from '@zodiac/ui'
-import type { ChainId } from 'ser-kit'
-import { ProviderLogo } from '../providerLogo'
-
-type InjectedWalletProps = {
-  onConnect: (chainId: ChainId, account: string) => void
-  onError: () => void
-}
-
-export const InjectedWalletConnect = ({
-  onConnect,
-  onError,
-}: InjectedWalletProps) => {
-  const injectedWallet = useInjectedWallet()
-
-  if (injectedWallet.provider == null) {
-    return null
-  }
-
-  return (
-    <SecondaryButton
-      fluid
-      disabled={
-        injectedWallet.ready === false ||
-        injectedWallet.connectionStatus === 'connecting'
-      }
-      onClick={async () => {
-        const connectResult = await injectedWallet.connect({
-          force: true,
-        })
-
-        if (connectResult == null) {
-          onError()
-        } else {
-          const { chainId, accounts } = connectResult
-
-          onConnect(chainId, accounts[0])
-        }
-      }}
-    >
-      <ProviderLogo providerType={ProviderType.InjectedWallet} />
-      {injectedWallet.connectionStatus === 'connecting'
-        ? 'Connecting...'
-        : 'Connect with MetaMask'}
-    </SecondaryButton>
-  )
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/injectedWallet/index.ts b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/injectedWallet/index.ts
deleted file mode 100644
index b43499ff7..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/injectedWallet/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { InjectedWallet } from './InjectedWallet'
-export { InjectedWalletConnect } from './InjectedWalletConnect'
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/providerLogo/ProviderLogo.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/providerLogo/ProviderLogo.tsx
deleted file mode 100644
index 51033f254..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/providerLogo/ProviderLogo.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { ProviderType } from '@/types'
-import metamaskLogoUrl from './metamask-logo.svg'
-import walletConnectLogoUrl from './wallet-connect-logo.png'
-
-type ProviderLogoProps = {
-  providerType: ProviderType
-}
-
-export const ProviderLogo = ({ providerType }: ProviderLogoProps) => {
-  switch (providerType) {
-    case ProviderType.WalletConnect:
-      return (
-        <img
-          aria-hidden
-          alt=""
-          src={chrome.runtime.getURL(walletConnectLogoUrl)}
-          className="h-5 invert dark:invert-0"
-        />
-      )
-    case ProviderType.InjectedWallet:
-      return (
-        <img
-          aria-hidden
-          alt=""
-          src={chrome.runtime.getURL(metamaskLogoUrl)}
-          className="size-5"
-        />
-      )
-  }
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/providerLogo/index.ts b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/providerLogo/index.ts
deleted file mode 100644
index 8e3cb38e2..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/providerLogo/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ProviderLogo } from './ProviderLogo'
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/providerLogo/metamask-logo.svg b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/providerLogo/metamask-logo.svg
deleted file mode 100644
index 6cb41ba98..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/providerLogo/metamask-logo.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns:ev="http://www.w3.org/2001/xml-events"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 318.6 318.6"
-	 style="enable-background:new 0 0 318.6 318.6;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#E2761B;stroke:#E2761B;stroke-linecap:round;stroke-linejoin:round;}
-	.st1{fill:#E4761B;stroke:#E4761B;stroke-linecap:round;stroke-linejoin:round;}
-	.st2{fill:#D7C1B3;stroke:#D7C1B3;stroke-linecap:round;stroke-linejoin:round;}
-	.st3{fill:#233447;stroke:#233447;stroke-linecap:round;stroke-linejoin:round;}
-	.st4{fill:#CD6116;stroke:#CD6116;stroke-linecap:round;stroke-linejoin:round;}
-	.st5{fill:#E4751F;stroke:#E4751F;stroke-linecap:round;stroke-linejoin:round;}
-	.st6{fill:#F6851B;stroke:#F6851B;stroke-linecap:round;stroke-linejoin:round;}
-	.st7{fill:#C0AD9E;stroke:#C0AD9E;stroke-linecap:round;stroke-linejoin:round;}
-	.st8{fill:#161616;stroke:#161616;stroke-linecap:round;stroke-linejoin:round;}
-	.st9{fill:#763D16;stroke:#763D16;stroke-linecap:round;stroke-linejoin:round;}
-</style>
-<polygon class="st0" points="274.1,35.5 174.6,109.4 193,65.8 "/>
-<g>
-	<polygon class="st1" points="44.4,35.5 143.1,110.1 125.6,65.8 	"/>
-	<polygon class="st1" points="238.3,206.8 211.8,247.4 268.5,263 284.8,207.7 	"/>
-	<polygon class="st1" points="33.9,207.7 50.1,263 106.8,247.4 80.3,206.8 	"/>
-	<polygon class="st1" points="103.6,138.2 87.8,162.1 144.1,164.6 142.1,104.1 	"/>
-	<polygon class="st1" points="214.9,138.2 175.9,103.4 174.6,164.6 230.8,162.1 	"/>
-	<polygon class="st1" points="106.8,247.4 140.6,230.9 111.4,208.1 	"/>
-	<polygon class="st1" points="177.9,230.9 211.8,247.4 207.1,208.1 	"/>
-</g>
-<g>
-	<polygon class="st2" points="211.8,247.4 177.9,230.9 180.6,253 180.3,262.3 	"/>
-	<polygon class="st2" points="106.8,247.4 138.3,262.3 138.1,253 140.6,230.9 	"/>
-</g>
-<polygon class="st3" points="138.8,193.5 110.6,185.2 130.5,176.1 "/>
-<polygon class="st3" points="179.7,193.5 188,176.1 208,185.2 "/>
-<g>
-	<polygon class="st4" points="106.8,247.4 111.6,206.8 80.3,207.7 	"/>
-	<polygon class="st4" points="207,206.8 211.8,247.4 238.3,207.7 	"/>
-	<polygon class="st4" points="230.8,162.1 174.6,164.6 179.8,193.5 188.1,176.1 208.1,185.2 	"/>
-	<polygon class="st4" points="110.6,185.2 130.6,176.1 138.8,193.5 144.1,164.6 87.8,162.1 	"/>
-</g>
-<g>
-	<polygon class="st5" points="87.8,162.1 111.4,208.1 110.6,185.2 	"/>
-	<polygon class="st5" points="208.1,185.2 207.1,208.1 230.8,162.1 	"/>
-	<polygon class="st5" points="144.1,164.6 138.8,193.5 145.4,227.6 146.9,182.7 	"/>
-	<polygon class="st5" points="174.6,164.6 171.9,182.6 173.1,227.6 179.8,193.5 	"/>
-</g>
-<polygon class="st6" points="179.8,193.5 173.1,227.6 177.9,230.9 207.1,208.1 208.1,185.2 "/>
-<polygon class="st6" points="110.6,185.2 111.4,208.1 140.6,230.9 145.4,227.6 138.8,193.5 "/>
-<polygon class="st7" points="180.3,262.3 180.6,253 178.1,250.8 140.4,250.8 138.1,253 138.3,262.3 106.8,247.4 117.8,256.4 
-	140.1,271.9 178.4,271.9 200.8,256.4 211.8,247.4 "/>
-<polygon class="st8" points="177.9,230.9 173.1,227.6 145.4,227.6 140.6,230.9 138.1,253 140.4,250.8 178.1,250.8 180.6,253 "/>
-<g>
-	<polygon class="st9" points="278.3,114.2 286.8,73.4 274.1,35.5 177.9,106.9 214.9,138.2 267.2,153.5 278.8,140 273.8,136.4 
-		281.8,129.1 275.6,124.3 283.6,118.2 	"/>
-	<polygon class="st9" points="31.8,73.4 40.3,114.2 34.9,118.2 42.9,124.3 36.8,129.1 44.8,136.4 39.8,140 51.3,153.5 103.6,138.2 
-		140.6,106.9 44.4,35.5 	"/>
-</g>
-<polygon class="st6" points="267.2,153.5 214.9,138.2 230.8,162.1 207.1,208.1 238.3,207.7 284.8,207.7 "/>
-<polygon class="st6" points="103.6,138.2 51.3,153.5 33.9,207.7 80.3,207.7 111.4,208.1 87.8,162.1 "/>
-<polygon class="st6" points="174.6,164.6 177.9,106.9 193.1,65.8 125.6,65.8 140.6,106.9 144.1,164.6 145.3,182.8 145.4,227.6 
-	173.1,227.6 173.3,182.8 "/>
-</svg>
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/providerLogo/wallet-connect-logo.png b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/providerLogo/wallet-connect-logo.png
deleted file mode 100644
index c5ca43e3e..000000000
Binary files a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/providerLogo/wallet-connect-logo.png and /dev/null differ
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/walletConnect/WalletConnect.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/walletConnect/WalletConnect.tsx
deleted file mode 100644
index 5fbb26f76..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/walletConnect/WalletConnect.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import { useWalletConnect, type WalletConnectResult } from '@/providers'
-import { ProviderType } from '@/types'
-import { SecondaryButton } from '@zodiac/ui'
-import type { ChainId } from 'ser-kit'
-import { Account } from '../Account'
-import { Connected } from '../Connected'
-import { Section } from '../Section'
-import { SwitchChain } from '../SwitchChain'
-import { WalletDisconnected } from '../WalletDisconnected'
-
-type WalletConnectProps = {
-  routeId: string
-  pilotAddress: string
-  chainId: ChainId
-  onDisconnect: () => void
-  onError: () => void
-  isConnected: (provider: WalletConnectResult) => boolean
-}
-
-export const WalletConnect = ({
-  routeId,
-  pilotAddress,
-  chainId,
-  onDisconnect,
-  onError,
-  isConnected,
-}: WalletConnectProps) => {
-  const walletConnect = useWalletConnect(routeId)
-
-  const disconnect = () => {
-    onDisconnect()
-
-    walletConnect.disconnect()
-  }
-
-  if (isConnected(walletConnect)) {
-    return (
-      <Connected onDisconnect={disconnect}>
-        <Account type={ProviderType.WalletConnect}>{pilotAddress}</Account>
-      </Connected>
-    )
-  }
-
-  if (walletConnect.accounts.length === 0) {
-    return (
-      <WalletDisconnected
-        onDisconnect={onDisconnect}
-        onReconnect={async () => {
-          const result = await walletConnect.connect()
-
-          if (result == null) {
-            onError()
-          }
-        }}
-      >
-        <Account type={ProviderType.WalletConnect}>{pilotAddress}</Account>
-      </WalletDisconnected>
-    )
-  }
-
-  const knownAccount = walletConnect.accounts.some(
-    (acc) => acc.toLowerCase() === pilotAddress,
-  )
-
-  if (knownAccount === false) {
-    return (
-      <Section>
-        <Account type={ProviderType.WalletConnect}>{pilotAddress}</Account>
-        <SecondaryButton onClick={disconnect}>Disconnect</SecondaryButton>
-      </Section>
-    )
-  }
-
-  if (walletConnect.chainId !== chainId) {
-    return (
-      <SwitchChain chainId={chainId} onDisconnect={disconnect}>
-        <Account type={ProviderType.WalletConnect}>{pilotAddress}</Account>
-      </SwitchChain>
-    )
-  }
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/walletConnect/WalletConnectConnect.tsx b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/walletConnect/WalletConnectConnect.tsx
deleted file mode 100644
index 64a4103a9..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/walletConnect/WalletConnectConnect.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useWalletConnect } from '@/providers'
-import { ProviderType } from '@/types'
-import { invariant } from '@epic-web/invariant'
-import { SecondaryButton } from '@zodiac/ui'
-import type { ChainId } from 'ser-kit'
-import { ProviderLogo } from '../providerLogo'
-
-type WalletConnectProps = {
-  routeId: string
-  onConnect: (chainId: ChainId, account: string) => void
-  onError: () => void
-}
-
-export const WalletConnectConnect = ({
-  routeId,
-  onConnect,
-  onError,
-}: WalletConnectProps) => {
-  const walletConnect = useWalletConnect(routeId)
-
-  return (
-    <SecondaryButton
-      fluid
-      disabled={walletConnect == null}
-      onClick={async () => {
-        invariant(
-          walletConnect != null,
-          'walletConnect provider is not available',
-        )
-
-        const connectResult = await walletConnect.connect()
-
-        if (connectResult == null) {
-          onError()
-        } else {
-          const { chainId, accounts } = connectResult
-
-          onConnect(chainId, accounts[0])
-        }
-      }}
-    >
-      <ProviderLogo providerType={ProviderType.WalletConnect} />
-      Connect with WalletConnect
-    </SecondaryButton>
-  )
-}
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/walletConnect/index.ts b/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/walletConnect/index.ts
deleted file mode 100644
index 981ad23d0..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wallet/walletConnect/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { WalletConnect } from './WalletConnect'
-export { WalletConnectConnect } from './WalletConnectConnect'
diff --git a/deployables/extension/src/panel/pages/routes/edit.$routeId/wrapRequest.ts b/deployables/extension/src/panel/pages/routes/edit.$routeId/wrapRequest.ts
deleted file mode 100644
index 924ffbb2b..000000000
--- a/deployables/extension/src/panel/pages/routes/edit.$routeId/wrapRequest.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import type { HexAddress, LegacyConnection, TransactionData } from '@/types'
-import { ContractFactories } from '@gnosis.pm/zodiac'
-import { SupportedZodiacModuleType } from '@zodiac/modules'
-import { toQuantity } from 'ethers'
-import type { MetaTransactionRequest } from 'ser-kit'
-
-const RolesV1Interface =
-  ContractFactories[SupportedZodiacModuleType.ROLES_V1].createInterface()
-const RolesV2Interface =
-  ContractFactories[SupportedZodiacModuleType.ROLES_V2].createInterface()
-const DelayInterface =
-  ContractFactories[SupportedZodiacModuleType.DELAY].createInterface()
-
-export function wrapRequest(
-  request: MetaTransactionRequest | TransactionData,
-  connection: LegacyConnection,
-  revertOnError = true,
-): TransactionData {
-  if (!connection.moduleAddress) {
-    throw new Error('No wrapping should be applied for direct execution')
-  }
-
-  let data: string
-  switch (connection.moduleType) {
-    case SupportedZodiacModuleType.ROLES_V1:
-      data = RolesV1Interface.encodeFunctionData('execTransactionWithRole', [
-        request.to || '',
-        request.value || 0,
-        request.data || '0x',
-        ('operation' in request && request.operation) || 0,
-        connection.roleId || 0,
-        revertOnError,
-      ])
-      break
-    case SupportedZodiacModuleType.ROLES_V2:
-      data = RolesV2Interface.encodeFunctionData('execTransactionWithRole', [
-        request.to || '',
-        request.value || 0,
-        request.data || '0x',
-        ('operation' in request && request.operation) || 0,
-        connection.roleId ||
-          '0x0000000000000000000000000000000000000000000000000000000000000000',
-        revertOnError,
-      ])
-      break
-    case SupportedZodiacModuleType.DELAY:
-      data = DelayInterface.encodeFunctionData('execTransactionFromModule', [
-        request.to || '',
-        request.value || 0,
-        request.data || '0x',
-        ('operation' in request && request.operation) || 0,
-      ])
-      break
-    default:
-      throw new Error(`Unsupported module type: ${connection.moduleType}`)
-  }
-
-  return {
-    from: connection.pilotAddress as HexAddress,
-    to: connection.moduleAddress as HexAddress,
-    data: data as HexAddress,
-    value: toQuantity(0n),
-  }
-}
diff --git a/deployables/extension/src/panel/pages/routes/index.tsx b/deployables/extension/src/panel/pages/routes/index.tsx
index ba200bf45..c02d4c254 100644
--- a/deployables/extension/src/panel/pages/routes/index.tsx
+++ b/deployables/extension/src/panel/pages/routes/index.tsx
@@ -1,14 +1,9 @@
 import { redirect, type RouteObject } from 'react-router'
-import { EditRoute } from './edit.$routeId'
 import { ListRoutes } from './list'
 import { Routes } from './Routes'
 
 export const routes: RouteObject = {
   path: 'routes',
   Component: Routes,
-  children: [
-    { index: true, loader: () => redirect('list') },
-    ListRoutes,
-    EditRoute,
-  ],
+  children: [{ index: true, loader: () => redirect('list') }, ListRoutes],
 }
diff --git a/deployables/extension/src/panel/pages/routes/list/Route.tsx b/deployables/extension/src/panel/pages/routes/list/Route.tsx
index 56707ce4a..2060751fb 100644
--- a/deployables/extension/src/panel/pages/routes/list/Route.tsx
+++ b/deployables/extension/src/panel/pages/routes/list/Route.tsx
@@ -14,7 +14,6 @@ import { useRef, useState } from 'react'
 import type { PrefixedAddress } from 'ser-kit'
 import { ClearTransactionsModal } from '../../ClearTransactionsModal'
 import { ConnectionStack } from '../../ConnectionStack'
-import { asLegacyConnection } from '../../legacyConnectionMigrations'
 import { RemoveButton } from '../RemoveButton'
 import { Intent } from './intents'
 
@@ -66,7 +65,7 @@ export const Route = ({ route, currentlyActiveAvatar }: RouteProps) => {
           </div>
         </div>
 
-        <ConnectionStack connection={asLegacyConnection(route)} />
+        <ConnectionStack route={route} />
 
         <div className="flex justify-between">
           <RemoveButton routeId={route.id} intent={Intent.removeRoute} />
diff --git a/deployables/extension/test-utils/render.tsx b/deployables/extension/test-utils/render.tsx
index 431e65ad6..da0e294fc 100644
--- a/deployables/extension/test-utils/render.tsx
+++ b/deployables/extension/test-utils/render.tsx
@@ -5,8 +5,8 @@ import {
   type RenderOptions,
   type Route,
 } from '@zodiac/test-utils'
+import { ToastContainer } from '@zodiac/ui'
 import { type PropsWithChildren } from 'react'
-import { ToastContainer } from 'react-toastify'
 import {
   createMockPort,
   mockActiveTab,
diff --git a/packages/modules/src/ZodiacModule.ts b/packages/modules/src/ZodiacModule.ts
index 82966f2c0..1027cee32 100644
--- a/packages/modules/src/ZodiacModule.ts
+++ b/packages/modules/src/ZodiacModule.ts
@@ -1,5 +1,6 @@
 import { KnownContracts } from '@gnosis.pm/zodiac'
-import { addressSchema, type HexAddress } from '@zodiac/schema'
+import { addressSchema, type Contract, type HexAddress } from '@zodiac/schema'
+import { AccountType } from 'ser-kit'
 import { z } from 'zod'
 
 export const SUPPORTED_ZODIAC_MODULES = [
@@ -37,6 +38,17 @@ export const ZODIAC_MODULE_NAMES: Record<SupportedZodiacModuleType, string> = {
   [KnownContracts.ROLES_V2]: 'Roles v2',
 }
 
+export const getModuleName = (account: Contract) => {
+  switch (account.type) {
+    case AccountType.DELAY: {
+      return 'Delay'
+    }
+    case AccountType.ROLES: {
+      return `Roles v${account.version}`
+    }
+  }
+}
+
 export const isValidZodiacModuleType = (
   type: unknown,
 ): type is SupportedZodiacModuleType =>
diff --git a/packages/modules/src/index.ts b/packages/modules/src/index.ts
index 8d026340a..911035fc7 100644
--- a/packages/modules/src/index.ts
+++ b/packages/modules/src/index.ts
@@ -3,6 +3,7 @@ export { fetchZodiacModules } from './fetchZodiacModules'
 export { getPilotAddress } from './getPilotAddress'
 export { getRolesVersion } from './getRolesVersion'
 export { getRolesWaypoint } from './getRolesWaypoint'
+export { getStartingWaypoint } from './getStartingWaypoint'
 export { queryRolesV1MultiSend } from './queryRolesV1MultiSend'
 export {
   MULTISEND,
@@ -22,6 +23,7 @@ export {
   SUPPORTED_ZODIAC_MODULES,
   SupportedZodiacModuleType,
   ZODIAC_MODULE_NAMES,
+  getModuleName,
   zodiacModuleSchema,
 } from './ZodiacModule'
 export type { ZodiacModule } from './ZodiacModule'
diff --git a/packages/modules/src/updateChainId.ts b/packages/modules/src/updateChainId.ts
index 20cdbd49c..6e7a8a4e0 100644
--- a/packages/modules/src/updateChainId.ts
+++ b/packages/modules/src/updateChainId.ts
@@ -59,9 +59,5 @@ const updateWaypoint = (
         connection: updateConnection(connection, { chainId }),
       })
     }
-
-    default: {
-      throw new Error(`Cannot update waypoint of type "${account.type}"`)
-    }
   }
 }
diff --git a/packages/schema/src/routeSchema.ts b/packages/schema/src/routeSchema.ts
index 0cafc44f4..b057f5f35 100644
--- a/packages/schema/src/routeSchema.ts
+++ b/packages/schema/src/routeSchema.ts
@@ -1,4 +1,9 @@
-import { chains, type PrefixedAddress } from 'ser-kit'
+import {
+  AccountType,
+  chains,
+  ConnectionType,
+  type PrefixedAddress,
+} from 'ser-kit'
 import { z } from 'zod'
 
 export const chainIdSchema = z.union([
@@ -40,7 +45,7 @@ const prefixedAddressSchema = z.custom<PrefixedAddress>((value) => {
 })
 
 const safeSchema = z.object({
-  type: z.literal('SAFE'),
+  type: z.literal(AccountType.SAFE),
   address: addressSchema,
   prefixedAddress: prefixedAddressSchema,
   chain: chainIdSchema,
@@ -53,7 +58,7 @@ const safeSchema = z.object({
 })
 
 const rolesSchema = z.object({
-  type: z.literal('ROLES'),
+  type: z.literal(AccountType.ROLES),
   address: addressSchema,
   prefixedAddress: prefixedAddressSchema,
   chain: chainIdSchema,
@@ -62,24 +67,24 @@ const rolesSchema = z.object({
 })
 
 const delaySchema = z.object({
-  type: z.literal('DELAY'),
+  type: z.literal(AccountType.DELAY),
   address: addressSchema,
   prefixedAddress: prefixedAddressSchema,
   chain: chainIdSchema,
 })
 
 const ownConnectionSchema = z.object({
-  type: z.literal('OWNS'),
+  type: z.literal(ConnectionType.OWNS),
   from: prefixedAddressSchema,
 })
 
 const isEnabledConnectionSchema = z.object({
-  type: z.literal('IS_ENABLED'),
+  type: z.literal(ConnectionType.IS_ENABLED),
   from: prefixedAddressSchema,
 })
 
 const isMemberConnectionSchema = z.object({
-  type: z.literal('IS_MEMBER'),
+  type: z.literal(ConnectionType.IS_MEMBER),
   roles: z.string().array(),
   defaultRole: z.string().optional(),
   from: prefixedAddressSchema,
diff --git a/packages/ui/package.json b/packages/ui/package.json
index b6fef0cc3..cbce2fda1 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -19,6 +19,8 @@
   "dependencies": {
     "@epic-web/invariant": "^1.0.0",
     "@headlessui/react": "^2.2.0",
+    "@zodiac/chains": "workspace:*",
+    "@zodiac/schema": "workspace:*",
     "classnames": "2.5.1",
     "ethereum-blockies-base64": "1.0.2",
     "lucide-react": "^0.470.0",
diff --git a/packages/ui/src/Blockie.tsx b/packages/ui/src/Blockie.tsx
index 71f979d90..2f969e0e2 100644
--- a/packages/ui/src/Blockie.tsx
+++ b/packages/ui/src/Blockie.tsx
@@ -1,9 +1,10 @@
+import type { HexAddress } from '@zodiac/schema'
 import classNames from 'classnames'
 import makeBlockie from 'ethereum-blockies-base64'
 import { useMemo } from 'react'
 
 interface Props {
-  address: string
+  address: HexAddress
   className?: string
 }
 
diff --git a/packages/ui/src/inputs/AddressInput.tsx b/packages/ui/src/inputs/AddressInput.tsx
index 2c8be67a8..0c2c93953 100644
--- a/packages/ui/src/inputs/AddressInput.tsx
+++ b/packages/ui/src/inputs/AddressInput.tsx
@@ -1,3 +1,5 @@
+import { ZERO_ADDRESS } from '@zodiac/chains'
+import type { HexAddress } from '@zodiac/schema'
 import type { ComponentPropsWithoutRef, ReactNode } from 'react'
 import { Blockie } from '../Blockie'
 import { type ComposableInputProps, Input } from './Input'
@@ -7,7 +9,7 @@ type AddressInputProps = Omit<
   'id' | 'type' | 'className' | 'value'
 > &
   ComposableInputProps & {
-    value?: string
+    value?: HexAddress | null
     action?: ReactNode
   }
 
@@ -17,6 +19,7 @@ export const AddressInput = ({
   error,
   action,
   disabled,
+  value,
   ...props
 }: AddressInputProps) => (
   <Input
@@ -27,7 +30,7 @@ export const AddressInput = ({
     after={action && <div className="mr-2">{action}</div>}
     before={
       <Blockie
-        address={props.value || '0x0000000000000000000000000000000000000000'}
+        address={value || ZERO_ADDRESS}
         className="ml-4 size-5 shrink-0"
       />
     }
@@ -37,6 +40,7 @@ export const AddressInput = ({
         {...props}
         id={inputId}
         disabled={disabled}
+        value={value ?? ''}
         aria-describedby={descriptionId}
         aria-errormessage={error ?? undefined}
         className="w-full border-none bg-transparent px-4 py-2 font-mono text-sm outline-none"
diff --git a/packages/ui/src/toasts/index.ts b/packages/ui/src/toasts/index.ts
index 485d4be9c..731031029 100644
--- a/packages/ui/src/toasts/index.ts
+++ b/packages/ui/src/toasts/index.ts
@@ -1,3 +1,4 @@
+export { ToastContainer } from 'react-toastify'
 export { errorToast } from './errorToast'
 export { infoToast } from './infoToast'
 export { successToast } from './successToast'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 604df4250..0b6ed5d7a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -287,7 +287,7 @@ importers:
     devDependencies:
       '@remix-run/dev':
         specifier: ^2.12.1
-        version: 2.15.2(@remix-run/react@2.15.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(typescript@5.7.3))(@types/node@22.10.7)(babel-plugin-macros@3.1.0)(bufferutil@4.0.9)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(typescript@5.7.3)(utf-8-validate@5.0.10)(vite@6.0.11(@types/node@22.10.7)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(yaml@2.7.0))(wrangler@3.103.2(@cloudflare/workers-types@4.20250121.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10))
+        version: 2.15.2(@remix-run/react@2.15.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(typescript@5.7.3))(@types/node@22.10.7)(babel-plugin-macros@3.1.0)(bufferutil@4.0.9)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(typescript@5.7.3)(utf-8-validate@5.0.10)(vite@6.0.11(@types/node@22.10.7)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(yaml@2.7.0))(wrangler@3.104.0(@cloudflare/workers-types@4.20250121.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10))
       '@types/chrome':
         specifier: ^0.0.299
         version: 0.0.299
@@ -330,15 +330,33 @@ importers:
       '@epic-web/invariant':
         specifier: ^1.0.0
         version: 1.0.0
+      '@gnosis.pm/zodiac':
+        specifier: ^4.0.3
+        version: 4.0.3(patch_hash=qw56tepajizvmumojx6tatibqy)(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       '@headlessui/react':
         specifier: ^2.2.0
         version: 2.2.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       '@sentry/browser':
         specifier: ^8.50.0
         version: 8.50.0
-      '@sentry/esbuild-plugin':
-        specifier: ^3.0.0
-        version: 3.0.0
+      '@walletconnect/core':
+        specifier: 2.17.3
+        version: 2.17.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)
+      '@walletconnect/ethereum-provider':
+        specifier: 2.17.3
+        version: 2.17.3(@types/react@19.0.7)(bufferutil@4.0.9)(react@19.0.0)(utf-8-validate@5.0.10)
+      '@walletconnect/keyvaluestorage':
+        specifier: ^1.1.1
+        version: 1.1.1
+      '@walletconnect/modal':
+        specifier: 2.7.0
+        version: 2.7.0(@types/react@19.0.7)(react@19.0.0)
+      '@walletconnect/sign-client':
+        specifier: 2.17.3
+        version: 2.17.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)
+      '@walletconnect/universal-provider':
+        specifier: 2.17.3
+        version: 2.17.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       '@zodiac/chains':
         specifier: workspace:*
         version: link:../../packages/chains
@@ -363,21 +381,36 @@ importers:
       '@zodiac/ui':
         specifier: workspace:*
         version: link:../../packages/ui
+      classnames:
+        specifier: ^2.3.1
+        version: 2.5.1
       date-fns:
         specifier: ^4.1.0
         version: 4.1.0
       lucide-react:
         specifier: ^0.470.0
         version: 0.470.0(react@19.0.0)
+      nanoid:
+        specifier: ^5.0.0
+        version: 5.0.9
+      node-stdlib-browser:
+        specifier: ^1.2.0
+        version: 1.3.0
+      react:
+        specifier: ^19.0.0
+        version: 19.0.0
+      react-dom:
+        specifier: ^19.0.0
+        version: 19.0.0(react@19.0.0)
       react-router:
         specifier: 7.1.3
         version: 7.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       react-stick:
         specifier: ^5.0.6
         version: 5.0.6(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
-      react-toastify:
-        specifier: 11.0.3
-        version: 11.0.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+      ser-kit:
+        specifier: 1.1.0
+        version: 1.1.0(bufferutil@4.0.9)(typescript@5.7.3)(utf-8-validate@5.0.10)(zod@3.24.1)
       zod:
         specifier: ^3.23.8
         version: 3.24.1
@@ -385,30 +418,15 @@ importers:
       '@depay/web3-mock':
         specifier: ^14.19.1
         version: 14.19.1(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-      '@gnosis.pm/zodiac':
-        specifier: ^4.0.3
-        version: 4.0.3(patch_hash=qw56tepajizvmumojx6tatibqy)(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-      '@noble/hashes':
-        specifier: ^1.4.0
-        version: 1.7.1
       '@playwright/test':
         specifier: ^1.48.1
         version: 1.49.1
-      '@safe-global/api-kit':
-        specifier: 2.5.7
-        version: 2.5.7(bufferutil@4.0.9)(typescript@5.7.3)(utf-8-validate@5.0.10)(zod@3.24.1)
-      '@safe-global/protocol-kit':
-        specifier: 5.2.0
-        version: 5.2.0(bufferutil@4.0.9)(typescript@5.7.3)(utf-8-validate@5.0.10)(zod@3.24.1)
-      '@safe-global/safe-apps-sdk':
-        specifier: 9.1.0
-        version: 9.1.0(bufferutil@4.0.9)(typescript@5.7.3)(utf-8-validate@5.0.10)(zod@3.24.1)
       '@safe-global/safe-gateway-typescript-sdk':
         specifier: 3.22.7
         version: 3.22.7
-      '@shazow/whatsabi':
-        specifier: ^0.19.0
-        version: 0.19.0(@noble/hashes@1.7.1)(typescript@5.7.3)(zod@3.24.1)
+      '@sentry/esbuild-plugin':
+        specifier: ^3.0.0
+        version: 3.0.0
       '@testing-library/dom':
         specifier: 10.4.0
         version: 10.4.0
@@ -439,24 +457,6 @@ importers:
       '@vitest/coverage-v8':
         specifier: 2.1.8
         version: 2.1.8(vitest@2.1.8(@types/node@22.10.7)(happy-dom@16.7.2)(jsdom@26.0.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0))
-      '@walletconnect/core':
-        specifier: 2.17.3
-        version: 2.17.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-      '@walletconnect/ethereum-provider':
-        specifier: 2.17.3
-        version: 2.17.3(@types/react@19.0.7)(bufferutil@4.0.9)(react@19.0.0)(utf-8-validate@5.0.10)
-      '@walletconnect/keyvaluestorage':
-        specifier: ^1.1.1
-        version: 1.1.1
-      '@walletconnect/modal':
-        specifier: 2.7.0
-        version: 2.7.0(@types/react@19.0.7)(react@19.0.0)
-      '@walletconnect/sign-client':
-        specifier: 2.17.3
-        version: 2.17.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)
-      '@walletconnect/universal-provider':
-        specifier: 2.17.3
-        version: 2.17.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       '@zodiac/eslint-config':
         specifier: workspace:*
         version: link:../../configs/eslint
@@ -475,12 +475,6 @@ importers:
       chalk:
         specifier: ^5.4.1
         version: 5.4.1
-      classnames:
-        specifier: ^2.3.1
-        version: 2.5.1
-      copy-to-clipboard:
-        specifier: ^3.3.1
-        version: 3.3.3
       dotenv:
         specifier: ^16.0.1
         version: 16.4.7
@@ -493,57 +487,30 @@ importers:
       eslint:
         specifier: ^9.7.0
         version: 9.18.0(jiti@2.4.1)
-      ethereum-blockies-base64:
-        specifier: ^1.0.2
-        version: 1.0.2
       ethers:
         specifier: 6.13.5
         version: 6.13.5(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       events:
         specifier: ^3.3.0
         version: 3.3.0
-      evm-proxy-detection:
-        specifier: ^2.0.1
-        version: 2.0.1(patch_hash=6vcbqkl2il57qcqj5fdd3rom54)
       globals:
         specifier: ^15.8.0
         version: 15.14.0
       happy-dom:
         specifier: ^16.0.0
         version: 16.7.2
-      isomorphic-fetch:
-        specifier: ^3.0.0
-        version: 3.0.0
       jsdom-testing-mocks:
         specifier: ^1.13.1
         version: 1.13.1
       madge:
         specifier: ^8.0.0
         version: 8.0.0(typescript@5.7.3)
-      nanoid:
-        specifier: ^5.0.0
-        version: 5.0.9
-      node-stdlib-browser:
-        specifier: ^1.2.0
-        version: 1.3.0
       postcss:
         specifier: ^8.4.47
         version: 8.5.1
-      react:
-        specifier: ^19.0.0
-        version: 19.0.0
-      react-dom:
-        specifier: ^19.0.0
-        version: 19.0.0(react@19.0.0)
-      react-select:
-        specifier: 5.9.0
-        version: 5.9.0(@types/react@19.0.7)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       rimraf:
         specifier: 6.0.1
         version: 6.0.1
-      ser-kit:
-        specifier: 1.1.0
-        version: 1.1.0(bufferutil@4.0.9)(typescript@5.7.3)(utf-8-validate@5.0.10)(zod@3.24.1)
       tailwindcss:
         specifier: ^3.4.14
         version: 3.4.17
@@ -556,9 +523,6 @@ importers:
       vitest-chrome:
         specifier: 0.1.0
         version: 0.1.0(patch_hash=fdaw4hoeqovzhwxyfu42zc636a)
-      zodiac-roles-deployments:
-        specifier: ^2.2.2
-        version: 2.3.4
 
   deployables/fork-api:
     devDependencies:
@@ -876,7 +840,7 @@ importers:
     devDependencies:
       '@react-router/dev':
         specifier: ^7.1.1
-        version: 7.1.3(@react-router/serve@7.1.3(react-router@7.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(typescript@5.7.3))(@types/node@22.10.7)(babel-plugin-macros@3.1.0)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(react-router@7.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(sass@1.82.0)(stylus@0.62.0)(typescript@5.7.3)(vite@6.0.11(@types/node@22.10.7)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(yaml@2.7.0))(wrangler@3.103.2(@cloudflare/workers-types@4.20250121.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10))(yaml@2.7.0)
+        version: 7.1.3(@react-router/serve@7.1.3(react-router@7.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(typescript@5.7.3))(@types/node@22.10.7)(babel-plugin-macros@3.1.0)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(react-router@7.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(sass@1.82.0)(stylus@0.62.0)(typescript@5.7.3)(vite@6.0.11(@types/node@22.10.7)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(yaml@2.7.0))(wrangler@3.104.0(@cloudflare/workers-types@4.20250121.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10))(yaml@2.7.0)
       '@types/chrome':
         specifier: ^0.0.299
         version: 0.0.299
@@ -907,6 +871,12 @@ importers:
       '@headlessui/react':
         specifier: ^2.2.0
         version: 2.2.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+      '@zodiac/chains':
+        specifier: workspace:*
+        version: link:../chains
+      '@zodiac/schema':
+        specifier: workspace:*
+        version: link:../schema
       classnames:
         specifier: 2.5.1
         version: 2.5.1
@@ -4190,9 +4160,6 @@ packages:
   copy-anything@2.0.6:
     resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==}
 
-  copy-to-clipboard@3.3.3:
-    resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==}
-
   core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
@@ -5599,9 +5566,6 @@ packages:
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
-  isomorphic-fetch@3.0.0:
-    resolution: {integrity: sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==}
-
   isomorphic-timers-promises@1.0.1:
     resolution: {integrity: sha512-u4sej9B1LPSxTGKB/HiuzvEQnXH0ECYkSVQU39koSwmFAxhlEAFl9RdTvLv4TOTQUgBS5O3O5fwUxk6byBZ+IQ==}
     engines: {node: '>=10'}
@@ -7718,9 +7682,6 @@ packages:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
 
-  toggle-selection@1.0.6:
-    resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==}
-
   toidentifier@1.0.1:
     resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
     engines: {node: '>=0.6'}
@@ -7908,6 +7869,9 @@ packages:
   unenv@1.10.0:
     resolution: {integrity: sha512-wY5bskBQFL9n3Eca5XnhH6KbUo/tfvkwm9OpcdCvLaeA7piBNbavbOKJySEwQ1V0RH6HvNlSAFRTpvTqgKRQXQ==}
 
+  unenv@2.0.0-rc.0:
+    resolution: {integrity: sha512-H0kl2w8jFL/FAk0xvjVing4bS3jd//mbg1QChDnn58l9Sc5RtduaKmLAL8n+eBw5jJo8ZjYV7CrEGage5LAOZQ==}
+
   unified@10.1.2:
     resolution: {integrity: sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==}
 
@@ -8314,9 +8278,6 @@ packages:
     resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
     engines: {node: '>=18'}
 
-  whatwg-fetch@3.6.20:
-    resolution: {integrity: sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==}
-
   whatwg-mimetype@3.0.0:
     resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
     engines: {node: '>=12'}
@@ -8390,6 +8351,16 @@ packages:
       '@cloudflare/workers-types':
         optional: true
 
+  wrangler@3.104.0:
+    resolution: {integrity: sha512-txxgkKZwPQrX1PDgY+ATWnnx4GSeNxUrnBumudWPRmXG0JdLzCf09R+723slMMT1m+CKQXU1KvuUHc/GxTnTyA==}
+    engines: {node: '>=16.17.0'}
+    hasBin: true
+    peerDependencies:
+      '@cloudflare/workers-types': ^4.20241230.0
+    peerDependenciesMeta:
+      '@cloudflare/workers-types':
+        optional: true
+
   wrap-ansi@6.2.0:
     resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
     engines: {node: '>=8'}
@@ -10441,6 +10412,59 @@ snapshots:
       - tsx
       - yaml
 
+  '@react-router/dev@7.1.3(@react-router/serve@7.1.3(react-router@7.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(typescript@5.7.3))(@types/node@22.10.7)(babel-plugin-macros@3.1.0)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(react-router@7.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(sass@1.82.0)(stylus@0.62.0)(typescript@5.7.3)(vite@6.0.11(@types/node@22.10.7)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(yaml@2.7.0))(wrangler@3.104.0(@cloudflare/workers-types@4.20250121.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10))(yaml@2.7.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/generator': 7.26.5
+      '@babel/parser': 7.26.5
+      '@babel/plugin-syntax-decorators': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-syntax-jsx': 7.25.9(@babel/core@7.26.0)
+      '@babel/preset-typescript': 7.26.0(@babel/core@7.26.0)
+      '@babel/traverse': 7.26.5
+      '@babel/types': 7.26.5
+      '@npmcli/package-json': 4.0.1
+      '@react-router/node': 7.1.3(react-router@7.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(typescript@5.7.3)
+      arg: 5.0.2
+      babel-dead-code-elimination: 1.0.8
+      chokidar: 4.0.3
+      dedent: 1.5.3(babel-plugin-macros@3.1.0)
+      es-module-lexer: 1.6.0
+      exit-hook: 2.2.1
+      fs-extra: 10.1.0
+      gunzip-maybe: 1.4.2
+      jsesc: 3.0.2
+      lodash: 4.17.21
+      pathe: 1.1.2
+      picocolors: 1.1.1
+      picomatch: 2.3.1
+      prettier: 2.8.8
+      react-refresh: 0.14.2
+      react-router: 7.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
+      semver: 7.6.3
+      set-cookie-parser: 2.7.1
+      valibot: 0.41.0(typescript@5.7.3)
+      vite: 6.0.11(@types/node@22.10.7)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(yaml@2.7.0)
+      vite-node: 3.0.0-beta.2(@types/node@22.10.7)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(yaml@2.7.0)
+    optionalDependencies:
+      '@react-router/serve': 7.1.3(react-router@7.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(typescript@5.7.3)
+      typescript: 5.7.3
+      wrangler: 3.104.0(@cloudflare/workers-types@4.20250121.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10)
+    transitivePeerDependencies:
+      - '@types/node'
+      - babel-plugin-macros
+      - bluebird
+      - jiti
+      - less
+      - lightningcss
+      - sass
+      - sass-embedded
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+      - tsx
+      - yaml
+
   '@react-router/express@7.1.3(express@4.21.2)(react-router@7.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(typescript@5.7.3)':
     dependencies:
       '@react-router/node': 7.1.3(react-router@7.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0))(typescript@5.7.3)
@@ -10482,7 +10506,7 @@ snapshots:
     dependencies:
       react: 19.0.0
 
-  '@remix-run/dev@2.15.2(@remix-run/react@2.15.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(typescript@5.7.3))(@types/node@22.10.7)(babel-plugin-macros@3.1.0)(bufferutil@4.0.9)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(typescript@5.7.3)(utf-8-validate@5.0.10)(vite@6.0.11(@types/node@22.10.7)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(yaml@2.7.0))(wrangler@3.103.2(@cloudflare/workers-types@4.20250121.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10))':
+  '@remix-run/dev@2.15.2(@remix-run/react@2.15.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0)(typescript@5.7.3))(@types/node@22.10.7)(babel-plugin-macros@3.1.0)(bufferutil@4.0.9)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(typescript@5.7.3)(utf-8-validate@5.0.10)(vite@6.0.11(@types/node@22.10.7)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(yaml@2.7.0))(wrangler@3.104.0(@cloudflare/workers-types@4.20250121.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10))':
     dependencies:
       '@babel/core': 7.26.0
       '@babel/generator': 7.26.3
@@ -10543,7 +10567,7 @@ snapshots:
     optionalDependencies:
       typescript: 5.7.3
       vite: 6.0.11(@types/node@22.10.7)(jiti@2.4.1)(less@4.2.1)(lightningcss@1.28.2)(sass@1.82.0)(stylus@0.62.0)(yaml@2.7.0)
-      wrangler: 3.103.2(@cloudflare/workers-types@4.20250121.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10)
+      wrangler: 3.104.0(@cloudflare/workers-types@4.20250121.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10)
     transitivePeerDependencies:
       - '@types/node'
       - babel-plugin-macros
@@ -12678,10 +12702,6 @@ snapshots:
       is-what: 3.14.1
     optional: true
 
-  copy-to-clipboard@3.3.3:
-    dependencies:
-      toggle-selection: 1.0.6
-
   core-util-is@1.0.3: {}
 
   cosmiconfig@7.1.0:
@@ -14527,16 +14547,9 @@ snapshots:
 
   isexe@2.0.0: {}
 
-  isomorphic-fetch@3.0.0:
-    dependencies:
-      node-fetch: 2.7.0
-      whatwg-fetch: 3.6.20
-    transitivePeerDependencies:
-      - encoding
-
   isomorphic-timers-promises@1.0.1: {}
 
-  isows@1.0.6(ws@8.18.0):
+  isows@1.0.6(ws@8.18.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)):
     dependencies:
       ws: 8.18.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
 
@@ -17021,8 +17034,6 @@ snapshots:
     dependencies:
       is-number: 7.0.0
 
-  toggle-selection@1.0.6: {}
-
   toidentifier@1.0.1: {}
 
   toml@3.0.0: {}
@@ -17208,6 +17219,15 @@ snapshots:
       node-fetch-native: 1.6.4
       pathe: 1.1.2
 
+  unenv@2.0.0-rc.0:
+    dependencies:
+      defu: 6.1.4
+      mlly: 1.7.4
+      ohash: 1.1.4
+      pathe: 1.1.2
+      ufo: 1.5.4
+    optional: true
+
   unified@10.1.2:
     dependencies:
       '@types/unist': 2.0.11
@@ -17398,7 +17418,7 @@ snapshots:
       '@scure/bip32': 1.6.0
       '@scure/bip39': 1.5.0
       abitype: 1.0.7(typescript@5.7.3)(zod@3.24.1)
-      isows: 1.0.6(ws@8.18.0)
+      isows: 1.0.6(ws@8.18.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))
       ox: 0.6.5(typescript@5.7.3)(zod@3.24.1)
       ws: 8.18.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
     optionalDependencies:
@@ -17415,7 +17435,7 @@ snapshots:
       '@scure/bip32': 1.6.0
       '@scure/bip39': 1.5.0
       abitype: 1.0.7(typescript@5.7.3)(zod@3.24.1)
-      isows: 1.0.6(ws@8.18.0)
+      isows: 1.0.6(ws@8.18.0(bufferutil@4.0.9)(utf-8-validate@5.0.10))
       ox: 0.6.0(typescript@5.7.3)(zod@3.24.1)
       webauthn-p256: 0.0.10
       ws: 8.18.0(bufferutil@4.0.9)(utf-8-validate@5.0.10)
@@ -17641,8 +17661,6 @@ snapshots:
     dependencies:
       iconv-lite: 0.6.3
 
-  whatwg-fetch@3.6.20: {}
-
   whatwg-mimetype@3.0.0: {}
 
   whatwg-mimetype@4.0.0: {}
@@ -17749,6 +17767,26 @@ snapshots:
       - supports-color
       - utf-8-validate
 
+  wrangler@3.104.0(@cloudflare/workers-types@4.20250121.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10):
+    dependencies:
+      '@cloudflare/kv-asset-handler': 0.3.4
+      '@esbuild-plugins/node-globals-polyfill': 0.2.3(esbuild@0.17.19)
+      '@esbuild-plugins/node-modules-polyfill': 0.2.2(esbuild@0.17.19)
+      blake3-wasm: 2.1.5
+      esbuild: 0.17.19
+      miniflare: 3.20241230.2(bufferutil@4.0.9)(utf-8-validate@5.0.10)
+      path-to-regexp: 6.3.0
+      unenv: 2.0.0-rc.0
+      workerd: 1.20241230.0
+    optionalDependencies:
+      '@cloudflare/workers-types': 4.20250121.0
+      fsevents: 2.3.3
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+    optional: true
+
   wrap-ansi@6.2.0:
     dependencies:
       ansi-styles: 4.3.0