diff --git a/src/services/impl/graphics_service.cpp b/src/services/impl/graphics_service.cpp
index 6c842ff..5a811cc 100644
--- a/src/services/impl/graphics_service.cpp
+++ b/src/services/impl/graphics_service.cpp
@@ -46,13 +46,6 @@ void GraphicsService::Shutdown() noexcept {
     initialized_ = false;
 }
 
-void GraphicsService::Shutdown() {
-    logging::TraceGuard trace("GraphicsService::Shutdown (IGraphicsService)");
-
-    // Services are shutdown individually by the registry
-    initialized_ = false;
-}
-
 void GraphicsService::InitializeDevice(SDL_Window* window, const GraphicsConfig& config) {
     logging::TraceGuard trace("GraphicsService::InitializeDevice");
 
diff --git a/src/services/impl/graphics_service.hpp b/src/services/impl/graphics_service.hpp
index db76467..cf5fae1 100644
--- a/src/services/impl/graphics_service.hpp
+++ b/src/services/impl/graphics_service.hpp
@@ -38,7 +38,7 @@ public:
     void InitializeDevice(SDL_Window* window, const GraphicsConfig& config) override;
     void InitializeSwapchain() override;
     void RecreateSwapchain() override;
-    void Shutdown() override;
+    void Shutdown() noexcept override;
     void LoadShaders(const std::unordered_map<std::string, ShaderPaths>& shaders) override;
     void UploadVertexData(const std::vector<core::Vertex>& vertices) override;
     void UploadIndexData(const std::vector<uint16_t>& indices) override;
diff --git a/src/services/impl/lua_script_service.cpp b/src/services/impl/lua_script_service.cpp
index 5697d04..abd0f00 100644
--- a/src/services/impl/lua_script_service.cpp
+++ b/src/services/impl/lua_script_service.cpp
@@ -66,7 +66,7 @@ std::array<float, 16> LuaScriptService::GetViewProjectionMatrix(float aspect) {
     return engine_->GetViewProjectionMatrix(aspect);
 }
 
-std::unordered_map<std::string, script::ShaderManager::ShaderPaths> LuaScriptService::LoadShaderPathsMap() {
+std::unordered_map<std::string, sdl3cpp::services::ShaderPaths> LuaScriptService::LoadShaderPathsMap() {
     logging::TraceGuard trace;
 
     if (!engine_) {
diff --git a/src/services/impl/lua_script_service.hpp b/src/services/impl/lua_script_service.hpp
index 20997ea..90aeef0 100644
--- a/src/services/impl/lua_script_service.hpp
+++ b/src/services/impl/lua_script_service.hpp
@@ -30,7 +30,7 @@ public:
     std::array<float, 16> ComputeModelMatrix(int functionRef, float time) override;
     std::array<float, 16> GetViewProjectionMatrix(float aspect) override;
 
-    std::unordered_map<std::string, script::ShaderManager::ShaderPaths> LoadShaderPathsMap() override;
+    std::unordered_map<std::string, sdl3cpp::services::ShaderPaths> LoadShaderPathsMap() override;
 
     std::vector<script::GuiCommand> LoadGuiCommands() override;
     void UpdateGuiInput(const script::GuiInputSnapshot& input) override;
diff --git a/src/services/impl/vulkan_device_service.hpp b/src/services/impl/vulkan_device_service.hpp
index 5761f7b..956ed8b 100644
--- a/src/services/impl/vulkan_device_service.hpp
+++ b/src/services/impl/vulkan_device_service.hpp
@@ -51,7 +51,6 @@ private:
 
     // Helper methods
     void CreateInstance(const std::vector<const char*>& requiredExtensions);
-    void CreateSurface(SDL_Window* window);
     void PickPhysicalDevice();
     bool IsDeviceSuitable(VkPhysicalDevice device) const;
     QueueFamilyIndices FindQueueFamilies(VkPhysicalDevice device) const;
diff --git a/src/services/interfaces/i_graphics_service.hpp b/src/services/interfaces/i_graphics_service.hpp
index e60263a..a8462b5 100644
--- a/src/services/interfaces/i_graphics_service.hpp
+++ b/src/services/interfaces/i_graphics_service.hpp
@@ -64,7 +64,7 @@ public:
     /**
      * @brief Shutdown and release all Vulkan resources.
      */
-    virtual void Shutdown() = 0;
+    virtual void Shutdown() noexcept = 0;
 
     /**
      * @brief Load and compile shader programs.
diff --git a/src/services/interfaces/i_pipeline_service.hpp b/src/services/interfaces/i_pipeline_service.hpp
index 659c08f..e059fff 100644
--- a/src/services/interfaces/i_pipeline_service.hpp
+++ b/src/services/interfaces/i_pipeline_service.hpp
@@ -8,6 +8,9 @@
 #include <vulkan/vulkan.h>
 
 namespace sdl3cpp::services {
+
+/**
+ * @brief Pipeline service interface.
  *
  * Manages Vulkan graphics pipelines and shader compilation.
  * Small, focused service (~200 lines) for pipeline management.