diff --git a/src/servers/sapphire_zone/Framework.cpp b/src/servers/sapphire_zone/Framework.cpp
index d344a50c..81b52081 100644
--- a/src/servers/sapphire_zone/Framework.cpp
+++ b/src/servers/sapphire_zone/Framework.cpp
@@ -1,5 +1,4 @@
 #include <boost/make_shared.hpp>
-#include <common/Logging/Logger.h>
 
 #include "Framework.h"
 
diff --git a/src/servers/sapphire_zone/Framework.h b/src/servers/sapphire_zone/Framework.h
index b2023d2e..ef609948 100644
--- a/src/servers/sapphire_zone/Framework.h
+++ b/src/servers/sapphire_zone/Framework.h
@@ -6,25 +6,23 @@
 
 #include "Forwards.h"
 
+
 #include "ServerZone.h"
 
 #include <common/Logging/Logger.h>
 
 #include <common/Exd/ExdDataGenerated.h>
-#include <common/Database/DbLoader.h>
-#include <common/Database/CharaDbConnection.h>
-#include <common/Database/DbWorkerPool.h>
-#include <common/Database/PreparedStatement.h>
-
-#include "Zone/TerritoryMgr.h"
-
-#include "DebugCommand/DebugCommandHandler.h"
 
 #include "Script/ScriptMgr.h"
 
 #include "Linkshell/LinkshellMgr.h"
 
+#include "Zone/TerritoryMgr.h"
 
+#include "DebugCommand/DebugCommandHandler.h"
+
+#include <common/Database/CharaDbConnection.h>
+#include <common/Database/DbWorkerPool.h>
 
 namespace Core
 {
@@ -43,7 +41,6 @@ private:
 
 public:
 
-   bool init();
    Core::Logger& getLogger();
    Core::DebugCommandHandler& getDebugCommandHandler();
    Core::Scripting::ScriptMgr& getScriptMgr();
diff --git a/src/servers/sapphire_zone/Script/ScriptInfo.h b/src/servers/sapphire_zone/Script/ScriptInfo.h
index f57c1a7c..746824a4 100644
--- a/src/servers/sapphire_zone/Script/ScriptInfo.h
+++ b/src/servers/sapphire_zone/Script/ScriptInfo.h
@@ -1,5 +1,5 @@
-#ifndef SAPPHIRE_SCRIPTINFO_H
-#define SAPPHIRE_SCRIPTINFO_H
+#ifndef CORE_SCRIPTINFO_H
+#define CORE_SCRIPTINFO_H
 
 #include <vector>
 
diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.h b/src/servers/sapphire_zone/Script/ScriptLoader.h
index 1e99d86e..52d864db 100644
--- a/src/servers/sapphire_zone/Script/ScriptLoader.h
+++ b/src/servers/sapphire_zone/Script/ScriptLoader.h
@@ -1,5 +1,5 @@
-#ifndef SAPPHIRE_SCRIPTLOADER_H
-#define SAPPHIRE_SCRIPTLOADER_H
+#ifndef CORE_SCRIPTLOADER_H
+#define CORE_SCRIPTLOADER_H
 
 #include <string>
 #include <unordered_map>
@@ -51,4 +51,4 @@ namespace Scripting {
 
 
 
-#endif //SAPPHIRE_SCRIPTLOADER_H
+#endif // CORE_SCRIPTLOADER_H