diff --git a/.bazelignore b/.bazelignore
index 4c373e4d17f..01f1586e6b7 100644
--- a/.bazelignore
+++ b/.bazelignore
@@ -2,3 +2,11 @@ bazel-bin
 bazel-out
 bazel-testlogs
 node_modules
+.git
+.cache
+.idea
+.vscode
+build
+/build-*
+node_modules
+.cxx
diff --git a/.gitignore b/.gitignore
index aa5f392d329..8e5e2b2abb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,10 @@
-/mapbox-gl-native-android/MapLibreAndroid/mapbox-gl-native
-/mapbox-gl-native-android/MapLibreAndroidTestApp/mapbox-gl-native
 /platform/android/MapLibreAndroidTestApp/src/main/res/values/developer-config.xml
 
 /platform/android/gradle/configuration.gradle
 /platform/android/arm64-v8a
 /platform/android/armeabi-v7a
-/platform/android/MapLibreAndroid/.cxx
 /platform/android/MapLibreAndroid/build
 /platform/android/MapLibrePlugin/build
-/platform/android/MapLibreAndroidTestApp/.cxx
 /platform/android/MapLibreAndroidTestApp/build
 /platform/android/buildSrc/build
 /platform/android/x86
@@ -16,7 +12,6 @@
 /cmake-build-debug
 /platform/android/build
 /platform/android/MapLibreAndroid/src/main/assets/sdk_versions/com.mapbox.mapboxsdk
-/platform/ios/platform/ios/Mapbox.playground/build/
 /platform/windows/vendor/mesa3d/
 *.code-workspace
 
@@ -35,14 +30,11 @@ compile_commands.json
 /platform/android/signing-key.text
 /platform/android/.java-version
 *.hprof
-/platform/ios/platform/ios/benchmark/assets/tiles/tiles
-/platform/ios/platform/ios/benchmark/assets/glyphs/Roboto Regular,Noto Sans Regular
-/platform/ios/platform/ios/benchmark/assets/glyphs/Roboto Medium,Noto Sans Regular
-/platform/ios/platform/ios/benchmark/assets/glyphs/Roboto Condensed Italic,Noto Sans Italic
-/platform/ios/platform/ios/benchmark/assets/glyphs/Noto Sans Regular
 /platform/android/key.json
 /platform/android/site
 node_modules
+.cxx
+
 # Node binaries.
 /lib
 
@@ -59,5 +51,4 @@ __generated__
 cache.sqlite
 cache.sqlite-journal
 out.png
-/test/android/app/.cxx
 /test/android/app/build
diff --git a/platform/android/MapLibreAndroid/src/vulkan/java/org/maplibre/android/maps/renderer/textureview/VulkanTextureViewRenderThread.java b/platform/android/MapLibreAndroid/src/vulkan/java/org/maplibre/android/maps/renderer/textureview/VulkanTextureViewRenderThread.java
index 3b8a0715ba0..6b11c1569b4 100644
--- a/platform/android/MapLibreAndroid/src/vulkan/java/org/maplibre/android/maps/renderer/textureview/VulkanTextureViewRenderThread.java
+++ b/platform/android/MapLibreAndroid/src/vulkan/java/org/maplibre/android/maps/renderer/textureview/VulkanTextureViewRenderThread.java
@@ -15,6 +15,16 @@ public VulkanTextureViewRenderThread(@NonNull TextureView textureView, @NonNull
     super(textureView, mapRenderer);
   }
 
+  void cleanup() {
+    if (surface == null) {
+      return;
+    }
+
+    mapRenderer.onSurfaceDestroyed();
+    surface.release();
+    surface = null;
+  }
+
   // Thread implementation
 
   @Override
@@ -121,6 +131,7 @@ public void run() {
 
       // Signal we're done
       synchronized (lock) {
+        cleanup();
         this.exited = true;
         lock.notifyAll();
       }
diff --git a/platform/node/.gitignore b/platform/node/.gitignore
new file mode 100644
index 00000000000..502167fa0b8
--- /dev/null
+++ b/platform/node/.gitignore
@@ -0,0 +1 @@
+/lib