diff --git a/components/core/include/fggl/services/module.hpp b/components/core/include/fggl/services/module.hpp
index 1e32642f3d935af7e54003c1dcc625b4199b844a..6278cfd852dc5eebc1d4a47834163622d890f08b 100644
--- a/components/core/include/fggl/services/module.hpp
+++ b/components/core/include/fggl/services/module.hpp
@@ -21,8 +21,8 @@
#define FGGL_MODULE(id, ...) constexpr static const auto MODULE_ID = fggl::services::ModuleID::make(#id); \
constexpr static const auto MODULE_DEPS = fggl::services::mod_extract_names<__VA_ARGS__>(); \
- inline fggl::services::ModuleID getName() const override { return MODULE_ID; } \
- inline fggl::services::Module::ServiceList getDepends() const override { return fggl::services::mod_svc_list( MODULE_DEPS ); }
+ inline auto getName() const -> fggl::services::ModuleID override { return MODULE_ID; } \
+ inline auto getDepends() const -> fggl::services::Module::ServiceList override { return fggl::services::mod_svc_list( MODULE_DEPS ); }
#define FGGL_MODULE_CONTRACT(name, id) struct name { constexpr static const auto MODULE_ID = fggl::services::ModuleID::make(#id); };
diff --git a/fggl/CMakeLists.txt b/fggl/CMakeLists.txt
index 30e4ee531ab81ee9365778bda408a8b461cbe545..644f5b5eb1963333b3dc75aad7aa95a81d7fa7e8 100644
--- a/fggl/CMakeLists.txt
+++ b/fggl/CMakeLists.txt
@@ -50,7 +50,6 @@ target_sources(${PROJECT_NAME}
data/model.cpp
data/procedural.cpp
data/heightmap.cpp
- data/module.cpp
scenes/menu.cpp
scenes/game.cpp
diff --git a/fggl/data/module.cpp b/fggl/data/module.cpp
deleted file mode 100644
index 27941b1d6632f2177cc57af20b5d12c875caced1..0000000000000000000000000000000000000000
--- a/fggl/data/module.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of FGGL.
- *
- * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with FGGL.
- * If not, see <https://www.gnu.org/licenses/>.
- */
-
-//
-// Created by webpigeon on 20/08/22.
-//
-
-#include "fggl/data/module.hpp"
-
-namespace fggl::data {
-
- /*
- auto LocalStorage::factory(modules::ServiceName service, modules::Services &data) -> bool {
- if (service == SERVICE_STORAGE) {
- // FIXME: no easy way to set the application name
- auto pathConfig = fggl::platform::calc_engine_paths("fggl-demo");
- data.create<Storage>(pathConfig);
- return true;
- }
- return false;
- }*/
-
-} // namespace fggl::data
\ No newline at end of file
diff --git a/include/fggl/assets/module.hpp b/include/fggl/assets/module.hpp
index 7e150ac631ae51d0cacd8e444169c70d113f6f68..a3353758b22512b982661824f10fd77f4be90b8f 100644
--- a/include/fggl/assets/module.hpp
+++ b/include/fggl/assets/module.hpp
@@ -20,9 +20,7 @@
#define FGGL_ASSETS_MODULE_HPP
#include "fggl/modules/module.hpp"
- #include "fggl/services/module.hpp"
-
-#include "fggl/data/module.hpp"
+#include "fggl/services/module.hpp"
#include "fggl/assets/packed/module.hpp"
#include "fggl/assets/manager.hpp"
diff --git a/include/fggl/assets/packed/module.hpp b/include/fggl/assets/packed/module.hpp
index fb25fe0819a6a68d0ae75926eabed70275f1c050..089372c51b793fcd6f6f23c9ae98cec6b6883b19 100644
--- a/include/fggl/assets/packed/module.hpp
+++ b/include/fggl/assets/packed/module.hpp
@@ -22,7 +22,6 @@
#include "fggl/modules/module.hpp"
#include "fggl/services/module.hpp"
-#include "fggl/data/module.hpp"
#include "fggl/assets/loader.hpp"
#include "fggl/assets/packed/adapter.hpp"
diff --git a/include/fggl/data/module.hpp b/include/fggl/data/module.hpp
deleted file mode 100644
index 5c72d9933c71e56f1c6a12eff93db26c8267109f..0000000000000000000000000000000000000000
--- a/include/fggl/data/module.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is part of FGGL.
- *
- * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along with FGGL.
- * If not, see <https://www.gnu.org/licenses/>.
- */
-
-//
-// Created by webpigeon on 27/06/22.
-//
-
-#ifndef FGGL_DATA_MODULE_HPP
-#define FGGL_DATA_MODULE_HPP
-
-#include "fggl/modules/module.hpp"
-#include "fggl/filesystem/Finder.hpp"
-#include "fggl/data/storage.hpp"
-
-namespace fggl::data {
-
- using Storage = fggl::filesystem::Locator;
-
- /*
- struct LocalStorage {
- constexpr static const char *name = "fggl::data::Storage";
- constexpr static const std::array<modules::ServiceName, 1> provides = {
- SERVICE_STORAGE
- };
- constexpr static const std::array<modules::ServiceName, 0> depends = {};
- static bool factory(modules::ServiceName service, modules::Services &serviceManager);
- };*/
-
-} // namespace fggl::data
-
-#endif //FGGL_DATA_MODULE_HPP
diff --git a/include/fggl/fggl.hpp b/include/fggl/fggl.hpp
index 67eda43877116a57f8b64753b3d754af7a3be912..c3f96b9f57e45dcfbc79b1548e10cc0f20b690b0 100644
--- a/include/fggl/fggl.hpp
+++ b/include/fggl/fggl.hpp
@@ -19,7 +19,6 @@
// module system
#include "fggl/modules/manager.hpp"
-#include "fggl/data/module.hpp"
#include "fggl/input/module.hpp"
#include "fggl/gui/module.hpp"
diff --git a/include/fggl/gui/module.hpp b/include/fggl/gui/module.hpp
index ad2b3634752c444c4dd8c15beb0cc7b4f71af8d9..f8e08e47fe4a9d088a7d2f971f99d7492a4ddc9f 100644
--- a/include/fggl/gui/module.hpp
+++ b/include/fggl/gui/module.hpp
@@ -22,7 +22,6 @@
#include "fggl/gui/fonts.hpp"
#include "fggl/gui/model/parser.hpp"
-#include "fggl/data/module.hpp"
#include "fggl/assets/packed/module.hpp"
namespace fggl::gui {
diff --git a/integrations/lua/include/fggl/script/lua/module.hpp b/integrations/lua/include/fggl/script/lua/module.hpp
index 22593f53bae27dc7e4baead0913abd31eb4ffe18..e99d8ed0044af78d1d2a29408a1f217580b503b8 100644
--- a/integrations/lua/include/fggl/script/lua/module.hpp
+++ b/integrations/lua/include/fggl/script/lua/module.hpp
@@ -26,7 +26,6 @@
#include "fggl/entity/module.hpp"
#include "fggl/script/engine.hpp"
- #include "fggl/data/module.hpp"
#include "fggl/assets/packed/adapter.hpp"
namespace fggl::script::lua {