diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasFilterModule.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasFilterModule.ts
index 03e238e044..3f1274c530 100644
--- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasFilterModule.ts
+++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasFilterModule.ts
@@ -1,4 +1,4 @@
-import type { SerializableObject, SerializableObject } from 'common/types';
+import type { SerializableObject } from 'common/types';
 import type { CanvasLayerAdapter } from 'features/controlLayers/konva/CanvasLayerAdapter';
 import type { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
 import { getPrefixedId } from 'features/controlLayers/konva/util';
@@ -7,8 +7,7 @@ import { IMAGE_FILTERS, imageDTOToImageObject } from 'features/controlLayers/sto
 import { atom } from 'nanostores';
 import type { Logger } from 'roarr';
 import { getImageDTO } from 'services/api/endpoints/images';
-import type { BatchConfig, ImageDTO } from 'services/api/types';
-import type { InvocationCompleteEvent } from 'services/events/types';
+import type { BatchConfig, ImageDTO, S } from 'services/api/types';
 import { assert } from 'tsafe';
 
 const TYPE = 'entity_filter_preview';
@@ -63,7 +62,7 @@ export class CanvasFilterModule {
     const batch = this.buildBatchConfig(imageDTO, config, nodeId);
 
     // Listen for the filter processing completion event
-    const listener = async (event: InvocationCompleteEvent) => {
+    const listener = async (event: S['InvocationCompleteEvent']) => {
       if (event.origin !== this.id || event.invocation_source_id !== nodeId) {
         return;
       }
diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayerAdapter.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayerAdapter.ts
index ed14e9a89c..af9d8462bb 100644
--- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayerAdapter.ts
+++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasLayerAdapter.ts
@@ -1,4 +1,4 @@
-import type { SerializableObject, SerializableObject } from 'common/types';
+import type { SerializableObject } from 'common/types';
 import { deepClone } from 'common/util/deepClone';
 import type { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
 import { CanvasObjectRenderer } from 'features/controlLayers/konva/CanvasObjectRenderer';
diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasMaskAdapter.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasMaskAdapter.ts
index 94324d26de..3573a79a17 100644
--- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasMaskAdapter.ts
+++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasMaskAdapter.ts
@@ -1,4 +1,4 @@
-import type { SerializableObject, SerializableObject } from 'common/types';
+import type { SerializableObject } from 'common/types';
 import { deepClone } from 'common/util/deepClone';
 import type { CanvasManager } from 'features/controlLayers/konva/CanvasManager';
 import { CanvasObjectRenderer } from 'features/controlLayers/konva/CanvasObjectRenderer';
diff --git a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasProgressImageModule.ts b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasProgressImageModule.ts
index bc4967ccca..b2b8a6977d 100644
--- a/invokeai/frontend/web/src/features/controlLayers/konva/CanvasProgressImageModule.ts
+++ b/invokeai/frontend/web/src/features/controlLayers/konva/CanvasProgressImageModule.ts
@@ -5,7 +5,7 @@ import type { CanvasPreviewModule } from 'features/controlLayers/konva/CanvasPre
 import { getPrefixedId, loadImage } from 'features/controlLayers/konva/util';
 import Konva from 'konva';
 import type { Logger } from 'roarr';
-import type { InvocationDenoiseProgressEvent } from 'services/events/types';
+import type { S } from 'services/api/types';
 
 export class CanvasProgressImageModule {
   readonly type = 'progress_image';
@@ -30,7 +30,7 @@ export class CanvasProgressImageModule {
   isError: boolean = false;
   imageElement: HTMLImageElement | null = null;
 
-  lastProgressEvent: InvocationDenoiseProgressEvent | null = null;
+  lastProgressEvent: S['InvocationDenoiseProgressEvent'] | null = null;
 
   mutex: Mutex = new Mutex();
 
diff --git a/invokeai/frontend/web/src/features/dnd/util/isValidDrop.ts b/invokeai/frontend/web/src/features/dnd/util/isValidDrop.ts
index 73c28545e7..4aab4ab74e 100644
--- a/invokeai/frontend/web/src/features/dnd/util/isValidDrop.ts
+++ b/invokeai/frontend/web/src/features/dnd/util/isValidDrop.ts
@@ -13,8 +13,6 @@ export const isValidDrop = (overData?: TypesafeDroppableData | null, activeData?
   }
 
   switch (actionType) {
-    case 'SET_CURRENT_IMAGE':
-    case 'SET_CA_IMAGE':
     case 'SET_IPA_IMAGE':
     case 'SET_RG_IP_ADAPTER_IMAGE':
     case 'ADD_RASTER_LAYER_FROM_IMAGE':