diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 28a76ad92d..008c81dbb6 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,14 +1,10 @@
 {
   "recommendations": [
     "dbaeumer.vscode-eslint",
-    "esbenp.prettier-vscode",
     "heybourn.headwind",
     "bradlc.vscode-tailwindcss",
-    "NomicFoundation.hardhat-solidity",
     "VisualStudioExptTeam.vscodeintellicode",
-    "wix.vscode-import-cost",
     "GraphQL.vscode-graphql",
-    "bierner.markdown-mermaid",
     "biomejs.biome"
   ]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
index d32a0f6a77..b8ace22845 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,8 +5,8 @@
       "name": "Next.js: debug server-side",
       "type": "node-terminal",
       "request": "launch",
-      "cwd": "${workspaceFolder}/apps/web",
-      "command": "npm run dev"
+      "command": "pnpm exec turbo run dev --filter web",
+      "cwd": "${workspaceFolder}/apps/web"
     },
     {
       "name": "Next.js: debug client-side",
@@ -18,8 +18,8 @@
       "name": "Next.js: debug full stack",
       "type": "node",
       "request": "launch",
-      "cwd": "${workspaceFolder}/apps/web",
       "program": "${workspaceFolder}/node_modules/.bin/next",
+      "cwd": "${workspaceFolder}/apps/web",
       "runtimeArgs": ["--inspect"],
       "skipFiles": ["<node_internals>/**"],
       "serverReadyAction": {
diff --git a/apps/web/src/app/(non-evm)/aptos/swap/ui/simple/simple-swap-header.tsx b/apps/web/src/app/(non-evm)/aptos/swap/ui/simple/simple-swap-header.tsx
index 0841eea95e..b349e1e3d5 100644
--- a/apps/web/src/app/(non-evm)/aptos/swap/ui/simple/simple-swap-header.tsx
+++ b/apps/web/src/app/(non-evm)/aptos/swap/ui/simple/simple-swap-header.tsx
@@ -4,7 +4,7 @@ import { typographyVariants } from '@sushiswap/ui'
 
 export const SimpleSwapHeader = () => {
   return (
-    <div className="flex flex-col items-start gap-2 mb-11 sm:mt-10 mt-2">
+    <div className="flex flex-col items-start gap-2">
       <h1 className={typographyVariants({ variant: 'h1' })}>Trade</h1>
     </div>
   )
diff --git a/apps/web/src/app/(non-evm)/tron/swap/page.tsx b/apps/web/src/app/(non-evm)/tron/swap/page.tsx
index 24c3323778..1316550143 100644
--- a/apps/web/src/app/(non-evm)/tron/swap/page.tsx
+++ b/apps/web/src/app/(non-evm)/tron/swap/page.tsx
@@ -17,8 +17,7 @@ export default function SwapSimplePage() {
   return (
     <Container maxWidth="lg" className="px-4">
       <div className="flex flex-col gap-4">
-        <div />
-        <div className="flex flex-col items-start gap-2 mb-11 sm:mt-10 mt-2">
+        <div className="flex flex-col items-start gap-2">
           <h1 className={typographyVariants({ variant: 'h1' })}>Trade</h1>
         </div>
         <div className="flex items-center justify-between">
diff --git a/packages/ui/src/components/network-selector.tsx b/packages/ui/src/components/network-selector.tsx
index c299ad0003..91b94f732e 100644
--- a/packages/ui/src/components/network-selector.tsx
+++ b/packages/ui/src/components/network-selector.tsx
@@ -121,7 +121,7 @@ const NetworkSelector = <T extends number>({
             {showNonEvm ? (
               <>
                 <Aptos />
-                <Tron />
+                {/* <Tron /> */}
               </>
             ) : null}
             {_networks
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d6fc80f6fa..6273fad30f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -953,10 +953,6 @@ importers:
         specifier: 5.5.4
         version: 5.5.4
 
-  packages/sushi/dist/_cjs: {}
-
-  packages/sushi/dist/_esm: {}
-
   packages/telemetry:
     devDependencies:
       '@tsconfig/esm':
@@ -22676,7 +22672,7 @@ snapshots:
       nocache: 3.0.4
       pretty-format: 26.6.2
       serve-static: 1.15.0
-      ws: 7.5.9(bufferutil@4.0.8)(utf-8-validate@5.0.10)
+      ws: 7.5.10(bufferutil@4.0.8)(utf-8-validate@5.0.10)
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -22937,7 +22933,7 @@ snapshots:
 
   '@react-three/fiber@8.16.2(react-dom@18.2.0(react@18.2.0))(react-native@0.73.7(@babel/core@7.24.4)(@babel/preset-env@7.24.4(@babel/core@7.24.4))(bufferutil@4.0.8)(encoding@0.1.13)(react@18.2.0)(utf-8-validate@5.0.10))(react@18.2.0)(three@0.163.0)':
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.25.6
       '@types/react-reconciler': 0.26.7
       '@types/webxr': 0.5.15
       base64-js: 1.5.1
@@ -27716,7 +27712,7 @@ snapshots:
 
   babel-plugin-macros@3.1.0:
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.25.6
       cosmiconfig: 7.1.0
       resolve: 1.22.8
     optional: true
@@ -33211,7 +33207,7 @@ snapshots:
 
   metro-runtime@0.80.8:
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.25.6
 
   metro-source-map@0.80.8:
     dependencies:
@@ -33310,7 +33306,7 @@ snapshots:
       source-map: 0.5.7
       strip-ansi: 6.0.1
       throat: 5.0.0
-      ws: 7.5.9(bufferutil@4.0.8)(utf-8-validate@5.0.10)
+      ws: 7.5.10(bufferutil@4.0.8)(utf-8-validate@5.0.10)
       yargs: 17.7.2
     transitivePeerDependencies:
       - bufferutil
@@ -34921,7 +34917,7 @@ snapshots:
   react-devtools-core@4.28.5(bufferutil@4.0.8)(utf-8-validate@5.0.10):
     dependencies:
       shell-quote: 1.8.1
-      ws: 7.5.9(bufferutil@4.0.8)(utf-8-validate@5.0.10)
+      ws: 7.5.10(bufferutil@4.0.8)(utf-8-validate@5.0.10)
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate