diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp
index abc643bfb6..6203efc684 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp
@@ -488,11 +488,11 @@ struct boss_madness_of_deathwing : public BossAI
         DespawnLimbs();
         instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
 
-        if (Creature* health = instance->GetCreature(DATA_DEATHWING_MADNESS_OF_DEATHWING))
+        if (Creature* deathwing = GetPhaseTwoDeathwing())
         {
-            health->InterruptNonMeleeSpells(true);
-            if (!health->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
-                instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, health);
+            deathwing->InterruptNonMeleeSpells(true);
+            if (!deathwing->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
+                instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, deathwing);
         }
 
         if (Creature* thrall = instance->GetCreature(DATA_THRALL_MADNESS_OF_DEATHWING))
@@ -503,10 +503,6 @@ struct boss_madness_of_deathwing : public BossAI
                 if (corruption->IsAIEnabled)
                     corruption->AI()->EnterEvadeMode();
 
-        if (events.IsInPhase(PHASE_TWO))
-            if (Creature* deathwing = GetPhaseTwoDeathwing())
-                instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, deathwing);
-
         for (uint8 i = 0; i < MAX_DRAGON_ASPECTS; i++)
             if (Creature* aspect = GetDragonAspect(i))
                 aspect->DespawnOrUnsummon(0ms, 30s);
@@ -1019,7 +1015,7 @@ private:
                     PhasingHandler::AddPhaseGroup(fragment, PHASE_GROUP_ENCOUNTER_1, false);
         }
 
-        instance->SetBossState(DATA_DEATHWING_MADNESS_OF_DEATHWING, DONE);
+        instance->SetBossState(DATA_MADNESS_OF_DEATHWING, DONE);
     }
 };
 
diff --git a/src/server/worldserver/RemoteAccess/RASession.cpp b/src/server/worldserver/RemoteAccess/RASession.cpp
index ca265fffb0..93fd8f843f 100644
--- a/src/server/worldserver/RemoteAccess/RASession.cpp
+++ b/src/server/worldserver/RemoteAccess/RASession.cpp
@@ -71,7 +71,6 @@ void RASession::Start()
 
     TC_LOG_INFO("commands.ra", "User %s (IP: %s) authenticated correctly to RA", username.c_str(), GetRemoteIpAddress().c_str());
 
-    // Authentication successful, send the motd
     // Authentication successful, send the motd
     for (std::string const& line : sWorld->GetMotd())
         Send(line.c_str());