diff --git a/src/worldshaperStudio/runtime.ts b/src/worldshaperStudio/runtime.ts
index 336973b..8b2579b 100644
--- a/src/worldshaperStudio/runtime.ts
+++ b/src/worldshaperStudio/runtime.ts
@@ -4755,16 +4755,14 @@ export function startWorldshaperStudio(bootstrap: WorldshaperStudioBootstrap, in
       worldRuntimeState,
       syncWorldNeighborhoodForViewport,
       drawNow,
-      setControllerRefs: (controllerRefs) => {
-        historyController = controllerRefs.historyController;
-        npcController = controllerRefs.npcController;
-        sidebarController = controllerRefs.sidebarController;
-        renderController = controllerRefs.renderController;
-        persistenceController = controllerRefs.persistenceController;
-        importController = controllerRefs.importController;
-        interactionController = controllerRefs.interactionController;
-      },
     });
+    historyController = runtimeControllerBootstrap.historyController;
+    npcController = runtimeControllerBootstrap.npcController;
+    sidebarController = runtimeControllerBootstrap.sidebarController;
+    renderController = runtimeControllerBootstrap.renderController;
+    persistenceController = runtimeControllerBootstrap.persistenceController;
+    importController = runtimeControllerBootstrap.importController;
+    interactionController = runtimeControllerBootstrap.interactionController;
     statusLogWindowController = runtimeControllerBootstrap.statusLogWindowController;
     runtimeLogging.setStatusLogWindowController(statusLogWindowController);
 }
diff --git a/src/worldshaperStudio/runtimeControllerBootstrap.ts b/src/worldshaperStudio/runtimeControllerBootstrap.ts
index 4a192f0..465c53c 100644
--- a/src/worldshaperStudio/runtimeControllerBootstrap.ts
+++ b/src/worldshaperStudio/runtimeControllerBootstrap.ts
@@ -48,7 +48,6 @@ export function initializeRuntimeControllers(config) {
     worldRuntimeState,
     syncWorldNeighborhoodForViewport,
     drawNow,
-    setControllerRefs,
   } = config;
 
   const toolWindowController = createToolWindowController(scope);
@@ -151,19 +150,6 @@ export function initializeRuntimeControllers(config) {
   const persistenceController = createPersistenceController(scope);
   const importController = createImportController(scope);
   const interactionController = createInteractionController(scope);
-  const controllerRefs = {
-    historyController,
-    npcController,
-    sidebarController,
-    renderController,
-    persistenceController,
-    importController,
-    interactionController,
-  };
-
-  if (typeof setControllerRefs === "function") {
-    setControllerRefs(controllerRefs);
-  }
 
   const persistPopupBoundsDeferred = createDebouncedCallback(() => {
     persistPopupBounds();
@@ -207,7 +193,13 @@ export function initializeRuntimeControllers(config) {
   });
 
   return {
-    ...controllerRefs,
+    historyController,
+    npcController,
+    sidebarController,
+    renderController,
+    persistenceController,
+    importController,
+    interactionController,
     statusLogWindowController,
     changelogSplashWindowController,
     persistPopupBoundsDeferred,