diff --git a/ElunaConfig.cpp b/ElunaConfig.cpp
index e5657bdc0a..7fad4f2185 100644
--- a/ElunaConfig.cpp
+++ b/ElunaConfig.cpp
@@ -4,9 +4,9 @@
 * Please see the included DOCS/LICENSE.md for more information
 */
 
-#if defined TRINITY || defined MANGOS
+#if defined TRINITY
 #include "Config.h"
-#elif defined CMANGOS || defined VMANGOS
+#else
 #include "Config/Config.h"
 #endif
 #include "ElunaConfig.h"
diff --git a/ElunaCreatureAI.h b/ElunaCreatureAI.h
index a1623b5c2b..8475b8ba0c 100644
--- a/ElunaCreatureAI.h
+++ b/ElunaCreatureAI.h
@@ -67,11 +67,7 @@ struct ElunaCreatureAI : NativeScriptedAI
 
         if (!me->GetEluna()->UpdateAI(me, diff))
         {
-#if defined MANGOS
-            if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PASSIVE))
-#else
             if (!me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC))
-#endif
                 NativeScriptedAI::UpdateAI(diff);
         }
     }
@@ -269,7 +265,7 @@ struct ElunaCreatureAI : NativeScriptedAI
     }
 #endif
 
-#if defined MANGOS || defined CMANGOS
+#if defined CMANGOS
 #undef me
 #endif
 };
diff --git a/ElunaIncludes.h b/ElunaIncludes.h
index 105e386c1b..605c2d478b 100644
--- a/ElunaIncludes.h
+++ b/ElunaIncludes.h
@@ -120,14 +120,6 @@ typedef Opcodes OpcodesList;
  * Note: if you add or change a CORE_NAME or CORE_VERSION #define,
  *   please update LuaGlobalFunctions::GetCoreName or LuaGlobalFunctions::GetCoreVersion documentation example string.
  */
-#if defined MANGOS
-#define CORE_NAME               "MaNGOS"
-#define CORE_VERSION            REVISION_NR
-#if EXPANSION == CATA
-#define NUM_MSG_TYPES           NUM_OPCODE_HANDLERS
-#endif
-#endif
-
 #if defined CMANGOS
 #define CORE_NAME               "cMaNGOS"
 #define CORE_VERSION            REVISION_DATE " " REVISION_ID
diff --git a/ElunaUtility.cpp b/ElunaUtility.cpp
index 84a04633bc..930ca585b2 100644
--- a/ElunaUtility.cpp
+++ b/ElunaUtility.cpp
@@ -19,13 +19,10 @@
 #include "Server/DBCStores.h"
 #include "Util/Timer.h"
 #endif
-#if defined MANGOS
-#include "Timer.h"
-#endif
 
 uint32 ElunaUtil::GetCurrTime()
 {
-#if !defined CMANGOS && !defined VMANGOS
+#if defined TRINITY
     return getMSTime();
 #else
     return WorldTimer::getMSTime();
@@ -34,7 +31,7 @@ uint32 ElunaUtil::GetCurrTime()
 
 uint32 ElunaUtil::GetTimeDiff(uint32 oldMSTime)
 {
-#if !defined CMANGOS && !defined VMANGOS
+#if defined TRINITY
     return GetMSTimeDiffToNow(oldMSTime);
 #else
     return WorldTimer::getMSTimeDiff(oldMSTime, WorldTimer::getMSTime());
diff --git a/ElunaUtility.h b/ElunaUtility.h
index c3338cb8d7..0b1bc13ff7 100644
--- a/ElunaUtility.h
+++ b/ElunaUtility.h
@@ -38,7 +38,7 @@
 #include <mutex>
 #include <memory>
 
-#if !defined MANGOS && !defined VMANGOS
+#if !defined VMANGOS
 #define USING_BOOST
 #endif
 
diff --git a/LuaEngine.h b/LuaEngine.h
index e68dd042ea..89e53152d6 100644
--- a/LuaEngine.h
+++ b/LuaEngine.h
@@ -77,7 +77,7 @@ struct ItemTemplate;
 typedef Battleground BattleGround;
 typedef BattlegroundTypeId BattleGroundTypeId;
 typedef InstanceScript InstanceData;
-#else // MANGOS && CMANGOS && VMANGOS
+#else
 class InstanceData;
 struct ItemPrototype;
 struct SpellEntry;