diff --git a/src/components/WorkflowCanvas.tsx b/src/components/WorkflowCanvas.tsx
index 28e42c67..2ae6d4fd 100644
--- a/src/components/WorkflowCanvas.tsx
+++ b/src/components/WorkflowCanvas.tsx
@@ -1152,9 +1152,6 @@ export function WorkflowCanvas() {
             easeCurve: { width: 340, height: 480 },
             videoTrim: { width: 360, height: 360 },
             videoFrameGrab: { width: 320, height: 320 },
-            router: { width: 200, height: 80 },
-            switch: { width: 220, height: 120 },
-            conditionalSwitch: { width: 260, height: 180 },
             glbViewer: { width: 360, height: 380 },
           };
           const dims = defaultDimensions[nodeType];
diff --git a/src/lib/quickstart/validation.ts b/src/lib/quickstart/validation.ts
index 39cbcb24..4afce636 100644
--- a/src/lib/quickstart/validation.ts
+++ b/src/lib/quickstart/validation.ts
@@ -387,12 +387,6 @@ function createDefaultNodeData(type: NodeType): WorkflowNodeData {
         status: "idle",
         error: null,
       };
-    case "router":
-      return {};
-    case "switch":
-      return { inputType: null, switches: [{ id: "sw-1", name: "Output 1", enabled: true }] };
-    case "conditionalSwitch":
-      return { incomingText: null, rules: [{ id: "rule-1", value: "", mode: "contains", label: "Rule 1", isMatched: false }] };
     case "glbViewer":
       return {
         glbUrl: null,
diff --git a/src/store/utils/nodeDefaults.ts b/src/store/utils/nodeDefaults.ts
index c3ab6832..84d079c1 100644
--- a/src/store/utils/nodeDefaults.ts
+++ b/src/store/utils/nodeDefaults.ts
@@ -1,5 +1,6 @@
 import {
   NodeType,
+  ModelType,
   ImageInputNodeData,
   AudioInputNodeData,
   AnnotationNodeData,
@@ -128,7 +129,7 @@ export const createDefaultNodeData = (type: NodeType): WorkflowNodeData => {
       if (nodeDefaults.generateImage?.selectedModel) {
         selectedModel = nodeDefaults.generateImage.selectedModel;
       } else {
-        const modelDisplayName = MODEL_DISPLAY_NAMES[legacyDefaults.model] || legacyDefaults.model;
+        const modelDisplayName = MODEL_DISPLAY_NAMES[legacyDefaults.model as ModelType] || legacyDefaults.model;
         selectedModel = {
           provider: "gemini",
           modelId: legacyDefaults.model,