diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
index c57bc427e..0aa6b0550 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
@@ -76,18 +76,13 @@ public:
 
     struct boss_gluthAI : public BossAI
     {
-        explicit boss_gluthAI(Creature* c) : BossAI(c, BOSS_GLUTH), summons(me)
+        explicit boss_gluthAI(Creature* c) : BossAI(c, BOSS_GLUTH)
         {}
 
-        EventMap events;
-        SummonList summons;
-
         void Reset() override
         {
             BossAI::Reset();
             me->ApplySpellImmune(SPELL_INFECTED_WOUND, IMMUNITY_ID, SPELL_INFECTED_WOUND, true);
-            events.Reset();
-            summons.DespawnAll();
             me->SetReactState(REACT_AGGRESSIVE);
         }
 
@@ -139,12 +134,6 @@ public:
                 instance->StorePersistentData(PERSISTENT_DATA_IMMORTAL_FAIL, 1);
         }
 
-        void JustDied(Unit*  killer) override
-        {
-            BossAI::JustDied(killer);
-            summons.DespawnAll();
-        }
-
         bool SelectPlayerInRoom()
         {
             if (me->IsInCombat())
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index f2be10718..f1a01bdde 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -186,11 +186,9 @@ public:
 
     struct boss_gothikAI : public BossAI
     {
-        explicit boss_gothikAI(Creature* c) : BossAI(c, BOSS_GOTHIK), summons(me)
+        explicit boss_gothikAI(Creature* c) : BossAI(c, BOSS_GOTHIK)
         {}
 
-        EventMap events;
-        SummonList summons;
         bool secondPhase{};
         bool gateOpened{};
         bool lastTeleportDead{};
@@ -209,8 +207,6 @@ public:
         void Reset() override
         {
             BossAI::Reset();
-            events.Reset();
-            summons.DespawnAll();
             me->RemoveUnitFlag(UNIT_FLAG_DISABLE_MOVE);
             me->SetImmuneToPC(false);
             me->SetReactState(REACT_PASSIVE);
@@ -275,11 +271,6 @@ public:
             }
         }
 
-        void SummonedCreatureDespawn(Creature* cr) override
-        {
-            summons.Despawn(cr);
-        }
-
         void KilledUnit(Unit* who) override
         {
             if (!who->IsPlayer())
@@ -293,7 +284,6 @@ public:
         {
             BossAI::JustDied(killer);
             Talk(SAY_DEATH);
-            summons.DespawnAll();
         }
 
         void SummonHelpers(uint32 entry)
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
index 672930c98..3ef6ab875 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
@@ -67,18 +67,14 @@ public:
 
     struct boss_grobbulusAI : public BossAI
     {
-        explicit boss_grobbulusAI(Creature* c) : BossAI(c, BOSS_GROBBULUS), summons(me)
+        explicit boss_grobbulusAI(Creature* c) : BossAI(c, BOSS_GROBBULUS)
         {}
 
-        EventMap events;
-        SummonList summons;
         uint32 dropSludgeTimer{};
 
         void Reset() override
         {
             BossAI::Reset();
-            events.Reset();
-            summons.DespawnAll();
             dropSludgeTimer = 0;
         }
 
@@ -114,17 +110,6 @@ public:
             summons.Summon(cr);
         }
 
-        void SummonedCreatureDespawn(Creature* summon) override
-        {
-            summons.Despawn(summon);
-        }
-
-        void JustDied(Unit*  killer) override
-        {
-            BossAI::JustDied(killer);
-            summons.DespawnAll();
-        }
-
         void KilledUnit(Unit* who) override
         {
             if (who->IsPlayer())
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
index 0a91706ea..48901fbe6 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
@@ -58,20 +58,16 @@ public:
 
     struct boss_loathebAI : public BossAI
     {
-        explicit boss_loathebAI(Creature* c) : BossAI(c, BOSS_LOATHEB), summons(me)
+        explicit boss_loathebAI(Creature* c) : BossAI(c, BOSS_LOATHEB)
         {
             me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
         }
 
         uint8 doomCounter;
-        EventMap events;
-        SummonList summons;
 
         void Reset() override
         {
             BossAI::Reset();
-            events.Reset();
-            summons.DespawnAll();
             doomCounter = 0;
         }
 
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
index 6d3361b38..fd2dc6103 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
@@ -101,12 +101,9 @@ public:
 
     struct boss_maexxnaAI : public BossAI
     {
-        explicit boss_maexxnaAI(Creature* c) : BossAI(c, BOSS_MAEXXNA), summons(me)
+        explicit boss_maexxnaAI(Creature* c) : BossAI(c, BOSS_MAEXXNA)
         {}
 
-        EventMap events;
-        SummonList summons;
-
         GuidList wraps;
 
         bool IsInRoom()
@@ -119,13 +116,6 @@ public:
             return true;
         }
 
-        void Reset() override
-        {
-            BossAI::Reset();
-            events.Reset();
-            summons.DespawnAll();
-        }
-
         void JustEngagedWith(Unit* who) override
         {
             BossAI::JustEngagedWith(who);
@@ -157,11 +147,6 @@ public:
                 instance->StorePersistentData(PERSISTENT_DATA_IMMORTAL_FAIL, 1);
         }
 
-        void JustDied(Unit*  killer) override
-        {
-            BossAI::JustDied(killer);
-        }
-
         void DoCastWebWrap()
         {
             std::list<Unit*> candidates;
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
index 33d6ff391..840c699cc 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
@@ -86,12 +86,10 @@ public:
 
     struct boss_nothAI : public BossAI
     {
-        explicit boss_nothAI(Creature* c) : BossAI(c, BOSS_NOTH), summons(me)
+        explicit boss_nothAI(Creature* c) : BossAI(c, BOSS_NOTH)
         {}
 
         uint8 timesInBalcony;
-        EventMap events;
-        SummonList summons;
 
         void StartGroundPhase()
         {
@@ -140,8 +138,6 @@ public:
         void Reset() override
         {
             BossAI::Reset();
-            events.Reset();
-            summons.DespawnAll();
             me->CastSpell(me, SPELL_TELEPORT_BACK, true);
             me->SetControlled(false, UNIT_STATE_ROOT);
             me->SetReactState(REACT_AGGRESSIVE);