diff --git a/frontend/src/lib/components/Dev.svelte b/frontend/src/lib/components/Dev.svelte
index a4ab0a9b9e..c78eb2afc0 100644
--- a/frontend/src/lib/components/Dev.svelte
+++ b/frontend/src/lib/components/Dev.svelte
@@ -489,9 +489,7 @@
 	setContext<TriggerContext>('TriggerContext', {
 		httpTriggers: httpTriggersStore,
 		schedule: scheduleStore,
-		primarySchedule: primaryScheduleStore,
-		selectedTrigger: selectedTriggerStore,
-		schedules: schedulesStore
+		primarySchedule: primaryScheduleStore
 	})
 	setContext<FlowEditorContext>('FlowEditorContext', {
 		selectedId: selectedIdStore,
diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
index 57e6ee0a7c..7f22e0e544 100644
--- a/frontend/src/lib/components/FlowBuilder.svelte
+++ b/frontend/src/lib/components/FlowBuilder.svelte
@@ -83,7 +83,7 @@
 	import Summary from './Summary.svelte'
 	import type { FlowBuilderWhitelabelCustomUi } from './custom_ui'
 	import FlowYamlEditor from './flows/header/FlowYamlEditor.svelte'
-	import type { TriggerContext } from './triggers'
+
 	export let initialPath: string = ''
 	export let pathStoreInit: string | undefined = undefined
 	export let newFlow: boolean
@@ -405,15 +405,6 @@
 	const schedulesStore = writable<Schedule[] | undefined>(undefined)
 	let insertButtonOpen = writable<boolean>(false)
 	const primaryScheduleStore = writable<Schedule | undefined | boolean>(undefined)
-	setContext<TriggerContext>('TriggerContext', {
-		httpTriggers: httpTriggersStore,
-		schedule: scheduleStore,
-		primarySchedule: primaryScheduleStore,
-		triggerModule: writable(undefined),
-		selectedTrigger: selectedTriggerStore,
-		schedules: schedulesStore
-	})
-
 	setContext<FlowEditorContext>('FlowEditorContext', {
 		selectedId: selectedIdStore,
 		selectedTrigger: selectedTriggerStore,
diff --git a/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte b/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
index c59968eff2..aa08b54646 100644
--- a/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
+++ b/frontend/src/lib/components/flows/content/FlowEditorPanel.svelte
@@ -12,6 +12,7 @@
 	import { initFlowStepWarnings } from '../utils'
 	import { dfs } from '../dfs'
 	import FlowPreprocessorModule from './FlowPreprocessorModule.svelte'
+
 	export let noEditor = false
 	export let enableAi = false
 	export let newFlow = false
diff --git a/frontend/src/lib/components/flows/content/FlowTriggers.svelte b/frontend/src/lib/components/flows/content/FlowTriggers.svelte
index 156f1cc430..8673d09c1f 100644
--- a/frontend/src/lib/components/flows/content/FlowTriggers.svelte
+++ b/frontend/src/lib/components/flows/content/FlowTriggers.svelte
@@ -10,6 +10,7 @@
 	import FlowCard from '../common/FlowCard.svelte'
 	import { getContext } from 'svelte'
 	import type { FlowEditorContext } from '../types'
+
 	export let noEditor: boolean
 	export let newFlow = false
 	let path = ''
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
index 1a4d657451..9d52077a23 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
@@ -381,8 +381,7 @@
 									detail.flow,
 									detail.inlineScript
 								)
-								//$selectedId = detail.modules[detail.index ?? 0].id
-								console.log('Modules', detail.modules)
+								$selectedId = detail.modules[detail.index ?? 0].id
 							}
 						}
 
diff --git a/frontend/src/lib/components/flows/map/InsertModuleButton.svelte b/frontend/src/lib/components/flows/map/InsertModuleButton.svelte
index 9d00f9bbfe..a737520ba8 100644
--- a/frontend/src/lib/components/flows/map/InsertModuleButton.svelte
+++ b/frontend/src/lib/components/flows/map/InsertModuleButton.svelte
@@ -22,6 +22,7 @@
 	export let disableAi = false
 	export let kind: 'script' | 'trigger' | 'preprocessor' | 'failure' = 'script'
 	export let allowTrigger = true
+	export let buttonClasses = ''
 
 	type Alignment = 'start' | 'end' | 'center'
 	type Side = 'top' | 'bottom'
@@ -69,12 +70,14 @@ shouldUsePortal={true} -->
 			}`}
 			id={`flow-editor-add-step-${index}`}
 			type="button"
-			class={twMerge(
-				'w-5 h-5 flex items-center justify-center',
-				'outline-[1px] outline dark:outline-gray-500 outline-gray-300',
-				'text-secondary',
-				'bg-surface focus:outline-none hover:bg-surface-hover rounded '
-			)}
+			class={buttonClasses !== ''
+				? buttonClasses
+				: twMerge(
+						'w-5 h-5 flex items-center justify-center',
+						'outline-[1px] outline dark:outline-gray-500 outline-gray-300',
+						'text-secondary',
+						'bg-surface focus:outline-none hover:bg-surface-hover rounded '
+				  )}
 			on:pointerdown|preventDefault|stopPropagation={pointerdown}
 			on:pointerup={pointerup}
 		>
diff --git a/frontend/src/lib/components/flows/map/InsertTriggersButton.svelte b/frontend/src/lib/components/flows/map/InsertTriggersButton.svelte
deleted file mode 100644
index 0a9bc15b9b..0000000000
--- a/frontend/src/lib/components/flows/map/InsertTriggersButton.svelte
+++ /dev/null
@@ -1,128 +0,0 @@
-<script lang="ts">
-	import { Cross, Zap } from 'lucide-svelte'
-	import StepGenQuick from '$lib/components/copilot/StepGenQuick.svelte'
-	import FlowInputsQuick from '../content/FlowInputsQuick.svelte'
-	import type { FlowModule } from '$lib/gen'
-	import ToggleHubWorkspaceQuick from '$lib/components/ToggleHubWorkspaceQuick.svelte'
-	import { twMerge } from 'tailwind-merge'
-	import type { ComputeConfig } from 'svelte-floating-ui'
-	import PopupV2 from '$lib/components/common/popup/PopupV2.svelte'
-	import { flip, offset } from 'svelte-floating-ui/dom'
-	import { createEventDispatcher } from 'svelte'
-
-	// import type { Writable } from 'svelte/store'
-
-	export let index: number = 0
-	export let funcDesc = ''
-	export let modules: FlowModule[] = []
-	export let disableAi = false
-	export let kind: 'script' | 'trigger' | 'preprocessor' | 'failure' = 'script'
-	export let buttonClasses: string = twMerge(
-		'w-5 h-5 flex items-center justify-center',
-		'outline-[1px] outline dark:outline-gray-500 outline-gray-300',
-		'text-secondary',
-		'bg-surface focus:outline-none hover:bg-surface-hover rounded '
-	)
-
-	type Alignment = 'start' | 'end' | 'center'
-	type Side = 'top' | 'bottom'
-	type Placement = `${Side}-${Alignment}`
-
-	export let placement: Placement = 'bottom-center'
-
-	let floatingConfig: ComputeConfig = {
-		strategy: 'fixed',
-		// @ts-ignore
-		placement,
-		middleware: [offset(8), flip()],
-		autoUpdate: true
-	}
-	$: !open && (funcDesc = '')
-	let preFilter: 'all' | 'workspace' | 'hub' = 'all'
-	let loading = false
-	let small = false
-	let open = false
-	let dispatch = createEventDispatcher()
-
-	$: small = kind === 'preprocessor' || kind === 'failure'
-</script>
-
-<!-- <Menu transitionDuration={0} pointerDown bind:show={open} noMinW {placement} let:close> -->
-
-<!-- {floatingConfig}
-floatingClasses="mt-2"
-containerClasses="border rounded-lg shadow-lg  bg-surface"
-noTransition
-shouldUsePortal={true} -->
-
-<PopupV2 {floatingConfig} bind:open let:close target="#flow-editor">
-	<svelte:fragment let:pointerdown let:pointerup slot="button">
-		<button
-			title={`Add ${
-				kind === 'failure'
-					? ' failure module '
-					: kind === 'preprocessor'
-					? 'preprocessor step'
-					: kind === 'trigger'
-					? 'trigger'
-					: 'step'
-			}`}
-			id={`flow-editor-add-step-${index}`}
-			type="button"
-			class={buttonClasses}
-			on:pointerdown|preventDefault|stopPropagation={pointerdown}
-			on:pointerup={pointerup}
-		>
-			{#if kind === 'trigger'}
-				<Zap size={12} />
-			{:else}
-				<Cross size={12} />
-			{/if}
-		</button>
-	</svelte:fragment>
-	<!-- FOO -->
-	<div
-		id="flow-editor-insert-module"
-		class="flex flex-col h-[400px] {small ? 'w-[450px]' : 'w-[650px]'}  pt-1 pr-1 pl-1 gap-1.5"
-		on:wheel={(e) => {
-			e.stopPropagation()
-		}}
-		role="none"
-	>
-		<div class="flex flex-row items-center gap-2">
-			<StepGenQuick {disableAi} on:insert bind:funcDesc {preFilter} {loading} />
-
-			<ToggleHubWorkspaceQuick bind:selected={preFilter} />
-		</div>
-
-		<div class="flex flex-row grow min-h-0">
-			<div class="flex-none flex flex-col text-xs text-primary">
-				<slot name="topLevelNodes" {close} />
-			</div>
-
-			<FlowInputsQuick
-				selectedKind={'trigger'}
-				bind:loading
-				filter={funcDesc}
-				{modules}
-				{index}
-				{disableAi}
-				{funcDesc}
-				{kind}
-				on:close={() => {
-					close(null)
-				}}
-				on:new={(event) => {
-					dispatch('new', event.detail)
-					close(null)
-				}}
-				on:pickScript={(event) => {
-					dispatch('pickScript', event.detail)
-					close(null)
-				}}
-				{preFilter}
-				{small}
-			/>
-		</div>
-	</div>
-</PopupV2>
diff --git a/frontend/src/lib/components/graph/FlowGraphV2.svelte b/frontend/src/lib/components/graph/FlowGraphV2.svelte
index 68d77ad73c..a577d86d3f 100644
--- a/frontend/src/lib/components/graph/FlowGraphV2.svelte
+++ b/frontend/src/lib/components/graph/FlowGraphV2.svelte
@@ -270,7 +270,6 @@
 		newGraph = removeInputNode(newGraph.nodes, newGraph.edges, 'Input')
 		newGraph = removeInputNode(newGraph.nodes, newGraph.edges, simplifiable.forLoopNode.id)
 		newGraph = removeInputNode(newGraph.nodes, newGraph.edges, simplifiable.triggerNode.id)
-		//newGraph.edges = replaceEdge(newGraph.edges, forloopEdge)
 		return newGraph
 	}
 
diff --git a/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte
index 6c71bb956f..f5c7cb506a 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/TriggersNode.svelte
@@ -3,6 +3,7 @@
 	import TriggersWrapper from '../triggers/TriggersWrapper.svelte'
 	import type { GraphEventHandlers } from '../../graphBuilder'
 	import type { FlowModule } from '$lib/gen'
+
 	export let data: {
 		path: string
 		openSchedules: () => void
@@ -24,7 +25,6 @@
 		{data}
 		path={data.path}
 		on:new={(e) => {
-			console.log('new', e)
 			data?.eventHandlers.insert({
 				modules: data.modules,
 				index: 0,
diff --git a/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte b/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
index 6ef69429e6..67dfe32483 100644
--- a/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
+++ b/frontend/src/lib/components/graph/renderers/triggers/TriggersWrapper.svelte
@@ -11,7 +11,7 @@
 	import { canWrite } from '$lib/utils'
 	import { getContext } from 'svelte'
 	import type { FlowEditorContext } from '../../../flows/types'
-	import InsertModuleButton from '../../../flows/map/InsertTriggersButton.svelte'
+	import InsertModuleButton from '../../../flows/map/InsertModuleButton.svelte'
 	import type { FlowModule } from '$lib/gen'
 	import type { GraphEventHandlers } from '../../graphBuilder'
 	import { twMerge } from 'tailwind-merge'
@@ -65,7 +65,7 @@
 				return { canWrite: canWrite(x.path, x.extra_perms!, $userStore), ...x }
 			})
 		} catch (e) {
-			console.error('impossible to load routes')
+			console.error('impossible to load http routes')
 		}
 	}
 
@@ -85,8 +85,6 @@
 	let triggerScriptModule: FlowModule | undefined = undefined
 	$: triggerScriptModule = data.modules.find((mod) => mod.isTrigger)
 
-	$: console.log('triggerScriptModule', triggerScriptModule)
-
 	$: data.eventHandlers.simplifyFlow(simplifiedTriggers)
 
 	$: items = [
diff --git a/frontend/src/routes/flows/dev/+page.svelte b/frontend/src/routes/flows/dev/+page.svelte
index 5d6c6d181f..db330b4a01 100644
--- a/frontend/src/routes/flows/dev/+page.svelte
+++ b/frontend/src/routes/flows/dev/+page.svelte
@@ -17,7 +17,7 @@
 	import { getUserExt } from '$lib/user'
 	import DarkModeToggle from '$lib/components/sidebar/DarkModeToggle.svelte'
 	import type { Schedule as ScheduleUtils } from '$lib/components/flows/scheduleUtils'
-	import type { TriggerContext } from '$lib/components/triggers'
+
 	let token = $page.url.searchParams.get('wm_token') ?? undefined
 	let workspace = $page.url.searchParams.get('workspace') ?? undefined
 	let themeDarkRaw = $page.url.searchParams.get('activeColorTheme')
@@ -86,14 +86,6 @@
 	// 	selectedIdStore.set(selectedId)
 	// }
 
-	setContext<TriggerContext>('TriggerContext', {
-		httpTriggers: httpTriggersStore,
-		schedule: scheduleStore,
-		primarySchedule: primaryScheduleStore,
-		selectedTrigger: selectedTriggerStore,
-		schedules: schedulesStore
-	})
-
 	setContext<FlowEditorContext>('FlowEditorContext', {
 		selectedId: selectedIdStore,
 		selectedTrigger: selectedTriggerStore,