diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb79470a..078ae4d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,14 +47,6 @@ set_property(TARGET SmartHeap::SmartHeap PROPERTY IMPORTED_LOCATION "${CMAKE_SOU
 set_property(TARGET SmartHeap::SmartHeap PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/3rdparty/smartheap")
 set_property(TARGET SmartHeap::SmartHeap PROPERTY INTERFACE_COMPILE_OPTIONS "/FI${CMAKE_SOURCE_DIR}/3rdparty/smartheap/SMRTHEAP.HPP")
 
-add_library(mxgeometry STATIC
-  LEGO1/mxgeometry/mxgeometry3d.cpp
-  LEGO1/mxgeometry/mxmatrix.cpp
-)
-register_lego1_target(mxgeometry)
-set_property(TARGET mxgeometry PROPERTY ARCHIVE_OUTPUT_NAME "geom$<$<CONFIG:Debug>:d>")
-target_include_directories(mxgeometry PRIVATE "${CMAKE_SOURCE_DIR}/LEGO1" "${CMAKE_SOURCE_DIR}/util")
-
 add_library(tglrl STATIC
   LEGO1/tgl/d3drm/camera.cpp
   LEGO1/tgl/d3drm/device.cpp
@@ -361,7 +353,7 @@ target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/sources"
 target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni/include")
 
 # Link libraries
-target_link_libraries(lego1 PRIVATE tglrl realtime viewmanager mxgeometry mxdirectx roi FLIC::FLIC Vec::Vec dinput dxguid Smacker::Smacker misc 3dmanager omni)
+target_link_libraries(lego1 PRIVATE tglrl realtime viewmanager mxdirectx roi FLIC::FLIC Vec::Vec dinput dxguid Smacker::Smacker misc 3dmanager omni)
 
 if (ISLE_USE_SMARTHEAP)
   foreach(tgt IN LISTS lego1_targets)
diff --git a/LEGO1/lego/legoomni/src/build/helicopter.cpp b/LEGO1/lego/legoomni/src/build/helicopter.cpp
index 9f5cc843..adfb1692 100644
--- a/LEGO1/lego/legoomni/src/build/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/build/helicopter.cpp
@@ -13,6 +13,9 @@
 #include "mxtransitionmanager.h"
 
 DECOMP_SIZE_ASSERT(Helicopter, 0x230)
+DECOMP_SIZE_ASSERT(Mx3DPointFloat, 0x14)
+DECOMP_SIZE_ASSERT(Mx4DPointFloat, 0x18)
+DECOMP_SIZE_ASSERT(MxMatrix, 0x48)
 
 // FUNCTION: LEGO1 0x10001e60
 Helicopter::Helicopter()
diff --git a/LEGO1/mxgeometry/mxgeometry3d.cpp b/LEGO1/mxgeometry/mxgeometry3d.cpp
deleted file mode 100644
index 03ce60eb..00000000
--- a/LEGO1/mxgeometry/mxgeometry3d.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "mxgeometry3d.h"
-
-#include "decomp.h"
-
-DECOMP_SIZE_ASSERT(Mx3DPointFloat, 0x14);
-DECOMP_SIZE_ASSERT(Mx4DPointFloat, 0x18);
diff --git a/LEGO1/mxgeometry/mxmatrix.cpp b/LEGO1/mxgeometry/mxmatrix.cpp
deleted file mode 100644
index fc768f38..00000000
--- a/LEGO1/mxgeometry/mxmatrix.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "mxmatrix.h"
-
-#include "decomp.h"
-
-DECOMP_SIZE_ASSERT(MxMatrix, 0x48);