diff --git a/src2/kiri-mode/cam/cl-stock.js b/src2/kiri-mode/cam/cl-stock.js
index 773203c9..4cb6850b 100644
--- a/src2/kiri-mode/cam/cl-stock.js
+++ b/src2/kiri-mode/cam/cl-stock.js
@@ -6,6 +6,8 @@ import { space as SPACE } from '../../moto/space.js';
 
 const { ui: UI } = api;
 
+let meshZTop, meshZBottom;
+
 export function updateStock() {
     if (env.isAnimate) {
         if (env.isIndexed) {
@@ -16,12 +18,12 @@ export function updateStock() {
     }
 
     if (!env.isCamMode) {
-        SPACE.world.remove(env.camZTop);
-        SPACE.world.remove(env.camZBottom);
+        SPACE.world.remove(meshZTop);
+        SPACE.world.remove(meshZBottom);
         SPACE.world.remove(env.camStock);
         env.camStock = null;
-        env.camZTop = null;
-        env.camZBottom = null;
+        meshZTop = null;
+        meshZBottom = null;
         return;
     }
 
@@ -85,7 +87,7 @@ export function updateStock() {
         lines.material.color = new THREE.Color(isDark() ? 0x555555 : 0xaaaaaa);
     }
 
-    SPACE.world.remove(env.camZTop);
+    SPACE.world.remove(meshZTop);
     if (process.camZTop && widgets.length) {
         let max = { x, y, z };
         for (let w of widgets) {
@@ -100,18 +102,18 @@ export function updateStock() {
             transparent: true,
             side: THREE.DoubleSide
         });
-        const camZTop = env.camZTop = new THREE.Mesh(geo, mat);
-        camZTop._max = max;
-        camZTop.renderOrder = 1;
-        camZTop.position.x = center.x;
-        camZTop.position.y = center.y;
-        camZTop.position.z = process.camZTop;
-        SPACE.world.add(camZTop);
+        meshZTop = new THREE.Mesh(geo, mat);
+        meshZTop._max = max;
+        meshZTop.renderOrder = 1;
+        meshZTop.position.x = center.x;
+        meshZTop.position.y = center.y;
+        meshZTop.position.z = process.camZTop;
+        SPACE.world.add(meshZTop);
     } else {
-        env.camZTop = undefined;
+        meshZTop = undefined;
     }
 
-    SPACE.world.remove(env.camZBottom);
+    SPACE.world.remove(meshZBottom);
     if (process.camZBottom && widgets.length) {
         let max = { x, y, z };
         for (let w of widgets) {
@@ -126,15 +128,15 @@ export function updateStock() {
             transparent: true,
             side: THREE.DoubleSide
         });
-        const camZBottom = env.camZBottom = new THREE.Mesh(geo, mat);
-        camZBottom._max = max;
-        camZBottom.renderOrder = 1;
-        camZBottom.position.x = center.x;
-        camZBottom.position.y = center.y;
-        camZBottom.position.z = process.camZBottom;
-        SPACE.world.add(camZBottom);
+        meshZBottom = new THREE.Mesh(geo, mat);
+        meshZBottom._max = max;
+        meshZBottom.renderOrder = 1;
+        meshZBottom.position.x = center.x;
+        meshZBottom.position.y = center.y;
+        meshZBottom.position.z = process.camZBottom;
+        SPACE.world.add(meshZBottom);
     } else {
-        env.camZBottom = undefined;
+        meshZBottom = undefined;
     }
 
     SPACE.update();
diff --git a/src2/kiri-mode/cam/client.js b/src2/kiri-mode/cam/client.js
index 263012e8..efa1e8f1 100644
--- a/src2/kiri-mode/cam/client.js
+++ b/src2/kiri-mode/cam/client.js
@@ -27,8 +27,6 @@ const { widgets: WIDGETS } = api;
 class Client {
     animVer = 0;
     camStock;
-    camZTop;
-    camZBottom;
     current;
     currentIndex;
     flipping;
diff --git a/src2/kiri/api.js b/src2/kiri/api.js
index 58cd30c4..fb24e170 100644
--- a/src2/kiri/api.js
+++ b/src2/kiri/api.js
@@ -2,6 +2,7 @@
 
 import alerts from './alerts.js';
 import settings from './settings.js'
+import STACKS from './stacks.js';
 
 import { broker } from '../moto/broker.js';
 import { client as work } from './client.js';
@@ -21,7 +22,6 @@ import { updateTool } from '../kiri-mode/cam/tools.js';
 import { LANG } from './lang.js';
 import { LOCAL, SETUP, SECURE } from './main.js';
 import { UI } from './ui.js';
-import STACKS from './stacks.js';
 
 let UC = UI.prefix('kiri').inputAction(settings.conf.update),
     und = undefined,
diff --git a/src2/kiri/main.js b/src2/kiri/main.js
index a4b423a1..13987d4e 100644
--- a/src2/kiri/main.js
+++ b/src2/kiri/main.js
@@ -36,13 +36,17 @@ let { parseOpt, o2js, js2o, ls2o } = utils,
     clone   = Object.clone,
     MODE    = MODES.FDM,
     viewMode = VIEWS.ARRANGE,
-    autoSaveTimer = null;
+    autoSaveTimer = null,
+    inits = parseInt(SDB.getItem('kiri-init') || stats.get('init') || 0) + 1;
+
+// update version and init count
+SDB.setItem('kiri-init', inits);
+stats.set('init', inits);
+stats.set('kiri', version);
 
 // allow widget to straddle client / worker FOR NOW
 self.kiri_catalog = FILES;
 
-// API completion
-
 export const dialog = {
     show: showModal,
     hide: hideModal,
@@ -247,12 +251,6 @@ function auto_save() {
     }, 1000);
 }
 
-// update version and init count
-let inits = parseInt(SDB.getItem('kiri-init') || stats.get('init') || 0) + 1;
-SDB.setItem('kiri-init', inits);
-stats.set('init', inits);
-stats.set('kiri', version);
-
 /** ******************************************************************
  * Utility Functions
  ******************************************************************* */