diff --git a/frontend/viewer/ModelViewerWrapper.vue b/frontend/viewer/ModelViewerWrapper.vue
index fcfa65f..66e044b 100644
--- a/frontend/viewer/ModelViewerWrapper.vue
+++ b/frontend/viewer/ModelViewerWrapper.vue
@@ -3,7 +3,6 @@ import {settings} from "../misc/settings";
 import {inject, onMounted, type Ref, ref, watch} from "vue";
 import {VList, VListItem} from "vuetify/lib/components/index.mjs";
 import {$renderer, $scene} from "@google/model-viewer/lib/model-viewer-base";
-import Loading from "../misc/Loading.vue";
 import {ModelViewerElement} from '@google/model-viewer';
 import type {ModelScene} from "@google/model-viewer/lib/three-components/ModelScene";
 import {Hotspot} from "@google/model-viewer/lib/three-components/Hotspot";
@@ -154,7 +153,7 @@ watch(disableTap, (value) => {
       <v-list v-for="src in settings.preload" :key="src">
         <v-list-item>{{ src }}</v-list-item>
       </v-list>
-      <loading></loading>
+      <!-- Too much idle CPU usage: <loading></loading> -->
     </div>
   </model-viewer>
 
diff --git a/yacv_server/gltf.py b/yacv_server/gltf.py
index 7f62ebb..c271987 100644
--- a/yacv_server/gltf.py
+++ b/yacv_server/gltf.py
@@ -26,6 +26,8 @@ class GLTFMgr:
             textures=[Texture(source=0, sampler=0)],
             images=[Image(bufferView=0, mimeType=image[1])],
         )
+        # TODO: Reduce the number of draw calls by merging all faces into a single primitive, and using
+        #  color attributes + extension? to differentiate them (same for edges and vertices)
         self.gltf.set_binary_blob(image[0])
 
     def add_face(self, vertices_raw: List[Tuple[float, float, float]], indices_raw: List[Tuple[int, int, int]],