diff --git a/VC100/100ScriptDev0.vcxproj b/VC100/100ScriptDev0.vcxproj
index 49f2f766..bcdb0aa9 100644
--- a/VC100/100ScriptDev0.vcxproj
+++ b/VC100/100ScriptDev0.vcxproj
@@ -336,7 +336,6 @@
-
diff --git a/VC100/100ScriptDev0.vcxproj.filters b/VC100/100ScriptDev0.vcxproj.filters
index d82c8bd2..84ee321f 100644
--- a/VC100/100ScriptDev0.vcxproj.filters
+++ b/VC100/100ScriptDev0.vcxproj.filters
@@ -453,9 +453,6 @@
scripts\eastern_kingdoms\uldaman
-
- scripts\eastern_kingdoms\uldaman
-
scripts\eastern_kingdoms\uldaman
diff --git a/VC90/90ScriptDev0.vcproj b/VC90/90ScriptDev0.vcproj
index ac3595e3..372285a0 100644
--- a/VC90/90ScriptDev0.vcproj
+++ b/VC90/90ScriptDev0.vcproj
@@ -1302,10 +1302,6 @@
RelativePath="..\scripts\eastern_kingdoms\uldaman\boss_archaedas.cpp"
>
-
-
diff --git a/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp b/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp
deleted file mode 100644
index 46820957..00000000
--- a/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2006-2011 ScriptDev2
- * Copyright (C) 2010-2011 ScriptDev0
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-/* ScriptData
-SDName: Boss_Ironaya
-SD%Complete: 100
-SDComment:
-SDCategory: Uldaman
-EndScriptData */
-
-#include "precompiled.h"
-
-#define SAY_AGGRO -1070000
-
-#define SPELL_ARCINGSMASH 8374
-#define SPELL_KNOCKAWAY 10101
-#define SPELL_WSTOMP 11876
-
-struct MANGOS_DLL_DECL boss_ironayaAI : public ScriptedAI
-{
- boss_ironayaAI(Creature* pCreature) : ScriptedAI(pCreature) {Reset();}
-
- uint32 Arcing_Timer;
- bool hasCastedWstomp;
- bool hasCastedKnockaway;
-
- void Reset()
- {
- Arcing_Timer = 3000;
- hasCastedKnockaway = false;
- hasCastedWstomp = false;
- }
-
- void Aggro(Unit *who)
- {
- DoScriptText(SAY_AGGRO, m_creature);
- }
-
- void UpdateAI(const uint32 diff)
- {
- //Return since we have no target
- if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
- return;
-
- //If we are <50% hp do knockaway ONCE
- if (!hasCastedKnockaway && m_creature->GetHealthPercent() < 50.0f)
- {
- m_creature->CastSpell(m_creature->getVictim(),SPELL_KNOCKAWAY, true);
-
- // current aggro target is knocked away pick new target
- Unit* Target = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 0);
-
- if (!Target || Target == m_creature->getVictim())
- Target = m_creature->SelectAttackingTarget(ATTACKING_TARGET_TOPAGGRO, 1);
-
- if (Target)
- m_creature->TauntApply(Target);
-
- //Shouldn't cast this agian
- hasCastedKnockaway = true;
- }
-
- //Arcing_Timer
- if (Arcing_Timer < diff)
- {
- DoCastSpellIfCan(m_creature,SPELL_ARCINGSMASH);
- Arcing_Timer = 13000;
- }else Arcing_Timer -= diff;
-
- if (!hasCastedWstomp && m_creature->GetHealthPercent() < 25.0f)
- {
- DoCastSpellIfCan(m_creature,SPELL_WSTOMP);
- hasCastedWstomp = true;
- }
-
- DoMeleeAttackIfReady();
- }
-};
-
-CreatureAI* GetAI_boss_ironaya(Creature* pCreature)
-{
- return new boss_ironayaAI(pCreature);
-}
-
-void AddSC_boss_ironaya()
-{
- Script *newscript;
- newscript = new Script;
- newscript->Name = "boss_ironaya";
- newscript->GetAI = &GetAI_boss_ironaya;
- newscript->RegisterSelf();
-}
diff --git a/sql/Updates/z0471_rxxxx_mangoszero.sql b/sql/Updates/z0471_rxxxx_mangoszero.sql
new file mode 100644
index 00000000..4d1dad6f
--- /dev/null
+++ b/sql/Updates/z0471_rxxxx_mangoszero.sql
@@ -0,0 +1 @@
+UPDATE creature_template SET ScriptName='' WHERE entry=7228;
diff --git a/system/ScriptLoader.cpp b/system/ScriptLoader.cpp
index d2105e10..8dfbf37c 100644
--- a/system/ScriptLoader.cpp
+++ b/system/ScriptLoader.cpp
@@ -134,7 +134,6 @@ extern void AddSC_stratholme();
extern void AddSC_instance_sunken_temple(); //sunken_temple
extern void AddSC_sunken_temple();
extern void AddSC_boss_archaedas(); //uldaman
-extern void AddSC_boss_ironaya();
extern void AddSC_uldaman();
extern void AddSC_instance_uldaman();
extern void AddSC_boss_arlokk(); //zulgurub
@@ -353,7 +352,6 @@ void AddScripts()
AddSC_instance_sunken_temple(); //sunken_temple
AddSC_sunken_temple();
AddSC_boss_archaedas(); //uldaman
- AddSC_boss_ironaya();
AddSC_uldaman();
AddSC_instance_uldaman();
AddSC_boss_arlokk(); //zulgurub
diff --git a/system/revision_nr.h b/system/revision_nr.h
index aa96c059..35a02a18 100644
--- a/system/revision_nr.h
+++ b/system/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
- #define REVISION_NR "0470"
+ #define REVISION_NR "0471"
#endif // __REVISION_NR_H__