diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3755377..10c4085 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,6 @@ set(CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake)
 include(CheckCXXSourceCompiles)
 include(${CMAKE_DIR}/functions.cmake)
 include(${CMAKE_DIR}/definitions.cmake)
-include(${CMAKE_DIR}/dependencies.cmake)
 
 add_option(ENABLE_UNIT_TESTS "Enables the building of the unit test modules")
 add_option(ENABLE_FUZZ_TESTS "Enables the building of the fuzz test modules")
diff --git a/conanfile.py b/conanfile.py
index 92c90ef..a9f4ef4 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -1,7 +1,5 @@
 from conan import ConanFile
 from conan.tools.cmake import CMakeToolchain, CMake, cmake_layout
-import shutil
-import os
 import git
 
 class LightRecipe(ConanFile):
@@ -28,9 +26,6 @@ class LightRecipe(ConanFile):
         "export_compile_commands": True,
     }
 
-    def requirements(self):
-        self.requires("entt/3.15.0")
-
     def layout(self):
         cmake_layout(self)
 
diff --git a/modules/ecs/CMakeLists.txt b/modules/ecs/CMakeLists.txt
index 28b2c30..5495f37 100644
--- a/modules/ecs/CMakeLists.txt
+++ b/modules/ecs/CMakeLists.txt
@@ -1,2 +1,4 @@
-add_library_module(ecs entity.cpp scene.cpp uuid.cpp)
-target_link_libraries(ecs PUBLIC logger lt_debug EnTT::EnTT camera math)
+add_library_module(ecs sparse_set.cpp)
+target_link_libraries(ecs PUBLIC logger lt_debug)
+
+add_test_module(ecs sparse_set.test.cpp registry.test.cpp)
diff --git a/modules/renderer/CMakeLists.txt b/modules/renderer/CMakeLists.txt
index 0cb87d9..946569e 100644
--- a/modules/renderer/CMakeLists.txt
+++ b/modules/renderer/CMakeLists.txt
@@ -30,7 +30,6 @@ target_link_libraries(
   PUBLIC logger
   PUBLIC imgui
   PUBLIC asset_parser
-  PUBLIC EnTT::EnTT
   PRIVATE lt_debug 
   PRIVATE window
   PUBLIC vulkan
diff --git a/modules/surface/CMakeLists.txt b/modules/surface/CMakeLists.txt
index ba78f7c..4ca36ca 100644
--- a/modules/surface/CMakeLists.txt
+++ b/modules/surface/CMakeLists.txt
@@ -10,6 +10,7 @@ endif()
 target_link_libraries(surface PUBLIC 
     ecs
     app
+    math
     PRIVATE
     logger 
     lt_debug
diff --git a/tools/cmake/dependencies.cmake b/tools/cmake/dependencies.cmake
deleted file mode 100644
index 1b961a9..0000000
--- a/tools/cmake/dependencies.cmake
+++ /dev/null
@@ -1 +0,0 @@
-find_package(EnTT REQUIRED)