diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66397683..83ada955 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -111,7 +111,6 @@
 - support readdir for directory symlinks ([7f1b870](https://github.com/HeyPuter/puter/commit/7f1b870d302421972c4f6221ae6d93b5979d51dd))
 - allow passing cli args via url ([5317adf](https://github.com/HeyPuter/puter/commit/5317adf8a4961be3f0ca2a8c403c922633f934fa))
 - add -c flag for phoenix ([b6c0cb6](https://github.com/HeyPuter/puter/commit/b6c0cb6abc1c29846b4b7e696812476bea24bbc7))
-- progress indicator for emulator ([08601ae](https://github.com/HeyPuter/puter/commit/08601ae2af7b1f564690e6a9cae7e689cb7ba48a))
 - translate README.md to Dutch ([31e2773](https://github.com/HeyPuter/puter/commit/31e2773743c336630c917e893b0148441f5fc515))
 - add connectToInstance method to puter.ui ([62634b0](https://github.com/HeyPuter/puter/commit/62634b0afe4d33da08768975322d4deb23041442))
 - add method to list models ([fd86934](https://github.com/HeyPuter/puter/commit/fd86934bc9021541810447cf7e2a5f33b3e283b3))
diff --git a/doc/contributors/structure.md b/doc/contributors/structure.md
index c939fdd4..5e144439 100644
--- a/doc/contributors/structure.md
+++ b/doc/contributors/structure.md
@@ -35,8 +35,6 @@ Some of these modules are core pieces of Puter:
 Some of these modules are apps:
 - **Puter's Terminal**: [`/src/terminal`](/src/terminal)
 - **Puter's Shell**: [`/src/phoenix`](/src/phoenix)
-- **Experimental v86 Integration**: [`/src/emulator`](/src/emulator)
-  - **Note:** development is focused on Puter PDE files instead (docs pending)
 
 Some of these modules are libraries:
 - **common javascript**: [`/src/putility`](/src/putility)
diff --git a/eslint.config.js b/eslint.config.js
index 9c33f141..8a95c304 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -157,7 +157,6 @@ const frontendConfig = {
         '**/*.min.mjs',
         '**/socket.io.js',
         '**/dist/*.js',
-        'src/phoenix/**',
         'src/gui/src/lib/**',
         'src/gui/dist/**',
     ],
diff --git a/package.json b/package.json
index c9844851..79e65153 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "yaml": "^2.8.1"
   },
   "scripts": {
-    "test": "npx mocha src/phoenix/test && npx vitest run --config=src/backend/vitest.config.ts && node src/backend/tools/test.mjs",
+    "test": "npx vitest run --config=src/backend/vitest.config.ts && node src/backend/tools/test.mjs",
     "test:puterjs-api": "vitest run tests/puterJsApiTests",
     "test:backend": "npm run build:ts; vitest run --config=src/backend/vitest.config.ts",
     "test:backend-coverage": "npm run build:ts; vitest run --config=src/backend/vitest.config.ts",
diff --git a/src/backend/src/services/database/SqliteDatabaseAccessService.js b/src/backend/src/services/database/SqliteDatabaseAccessService.js
index 2fc9f682..313eb51b 100644
--- a/src/backend/src/services/database/SqliteDatabaseAccessService.js
+++ b/src/backend/src/services/database/SqliteDatabaseAccessService.js
@@ -128,15 +128,9 @@ class SqliteDatabaseAccessService extends BaseDatabaseAccessService {
             [23, [
                 '0026_user-groups.dbmig.js',
             ]],
-            [24, [
-                '0027_emulator-app.dbmig.js',
-            ]],
             [25, [
                 '0028_clean-email.sql',
             ]],
-            [26, [
-                '0029_emulator_priv.sql',
-            ]],
             [27, [
                 '0030_comments.sql',
             ]],
diff --git a/tools/build_v86.sh b/tools/build_v86.sh
index 34a5701c..a8da7d2f 100755
--- a/tools/build_v86.sh
+++ b/tools/build_v86.sh
@@ -12,6 +12,12 @@ echo -e "\x1B[36;1m<<< Adding Targets >>>\x1B[0m"
 rustup target add wasm32-unknown-unknown
 rustup target add i686-unknown-linux-gnu
 
+# Emulator assets were removed from this fork; exit early to avoid failing.
+if [ ! -d "src/emulator" ]; then
+    echo -e "\x1B[33;1mEmulator directory missing; skipping v86 image build.\x1B[0m"
+    exit 0
+fi
+
 echo -e "\x1B[36;1m<<< Building v86 >>>\x1B[0m"
 
 cd submodules/v86