Scripts/Spells: Removed unneccessary PrepareSpellScript and PrepareAuraScript uses

34 files changed, 0 insertions, 222 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
index 5fecee52b14..456ceb98b0a 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
@@ -352,8 +352,6 @@ private:
 // 33326 - Stolen Soul Dispel
 class spell_exarch_maladaar_stolen_soul_dispel : public AuraScript
 {
-    PrepareAuraScript(spell_exarch_maladaar_stolen_soul_dispel);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_STOLEN_SOUL });
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
index e594ee7a6e6..24912ea91ee 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp
@@ -154,8 +154,6 @@ struct boss_talon_king_ikiss : public BossAI
 // 38194 - Blink
 class spell_talon_king_ikiss_blink : public SpellScript
 {
-    PrepareSpellScript(spell_talon_king_ikiss_blink);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_BLINK_TELEPORT });
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
index 50e8cc2d488..38a7fd78d66 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp
@@ -206,8 +206,6 @@ struct boss_blackheart_the_inciter_mc_dummy : public NullCreatureAI
 // 33676 - Incite Chaos
 class spell_blackheart_incite_chaos : public SpellScript
 {
-    PrepareSpellScript(spell_blackheart_incite_chaos);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_INCITE_CHAOS_B });
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
index c091efd21c9..47655500d92 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -156,8 +156,6 @@ struct boss_murmur : public BossAI
 // 33923, 38796 - Sonic Boom
 class spell_murmur_sonic_boom : public SpellScript
 {
-    PrepareSpellScript(spell_murmur_sonic_boom);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SONIC_BOOM_EFFECT });
@@ -177,8 +175,6 @@ class spell_murmur_sonic_boom : public SpellScript
 // 33666, 38795 - Sonic Boom Effect
 class spell_murmur_sonic_boom_effect : public SpellScript
 {
-    PrepareSpellScript(spell_murmur_sonic_boom_effect);
-
     void CalcDamage()
     {
         if (Unit* target = GetHitUnit())
@@ -209,8 +205,6 @@ class ThunderingStormCheck
 // 39365 - Thundering Storm
 class spell_murmur_thundering_storm : public SpellScript
 {
-    PrepareSpellScript(spell_murmur_thundering_storm);
-
     void FilterTarget(std::list<WorldObject*>& targets)
     {
         targets.remove_if(ThunderingStormCheck(GetCaster()));
@@ -225,8 +219,6 @@ class spell_murmur_thundering_storm : public SpellScript
 // 33711, 38794 - Murmur's Touch
 class spell_murmur_murmurs_touch : public AuraScript
 {
-    PrepareAuraScript(spell_murmur_murmurs_touch);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp
index 433c3ee1ba1..ce4eb611ed9 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp
@@ -27,8 +27,6 @@ enum Spells
 // 33493 - Mark of Malice
 class spell_mark_of_malice : public AuraScript
 {
-    PrepareAuraScript(spell_mark_of_malice);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MARK_OF_MALICE_TRIGGERED });
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
index 6b93face40a..c7af1be4c76 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -236,8 +236,6 @@ private:
 // 41986 - Anger
 class spell_soul_fragment_anger : public SpellScript
 {
-    PrepareSpellScript(spell_soul_fragment_anger);
-
     void HandleKill()
     {
         if (Creature* caster = GetCaster()->ToCreature())
@@ -253,8 +251,6 @@ class spell_soul_fragment_anger : public SpellScript
 // 39645 - Shadow Inferno
 class spell_illidari_nightlord_shadow_inferno : public AuraScript
 {
-    PrepareAuraScript(spell_illidari_nightlord_shadow_inferno);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SHADOW_INFERNO_DAMAGE });
diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
index 52b66895bfe..a8da948a5aa 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
@@ -317,8 +317,6 @@ struct npc_fel_geyser : public PassiveAI
 // 42005 - Bloodboil
 class spell_gurtogg_bloodboil_bloodboil : public SpellScript
 {
-    PrepareSpellScript(spell_gurtogg_bloodboil_bloodboil);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         if (targets.size() <= 5)
@@ -339,8 +337,6 @@ class spell_gurtogg_bloodboil_bloodboil : public SpellScript
 // 40618 - Insignificance
 class spell_gurtogg_bloodboil_insignificance : public SpellScript
 {
-    PrepareSpellScript(spell_gurtogg_bloodboil_insignificance);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_FEL_RAGE_TARGET });
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index eb4b585514a..ed26aa1867b 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -1848,8 +1848,6 @@ private:
 // 41077 - Akama Teleport
 class spell_illidan_akama_teleport : public SpellScript
 {
-    PrepareSpellScript(spell_illidan_akama_teleport);
-
     void SetDest(SpellDestination& dest)
     {
         if (Creature* caster = GetCaster()->ToCreature())
@@ -1868,8 +1866,6 @@ class spell_illidan_akama_teleport : public SpellScript
 // 41268 - Quest - Black Temple - Akama - Door Open
 class spell_illidan_akama_door_channel : public AuraScript
 {
-    PrepareAuraScript(spell_illidan_akama_door_channel);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_ARCANE_EXPLOSION });
@@ -1894,8 +1890,6 @@ class spell_illidan_akama_door_channel : public AuraScript
 // 40904 - Draw Soul
 class spell_illidan_draw_soul : public SpellScript
 {
-    PrepareSpellScript(spell_illidan_draw_soul);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_DRAW_SOUL_HEAL });
@@ -1917,8 +1911,6 @@ class spell_illidan_draw_soul : public SpellScript
    41914 - Parasitic Shadowfiend */
 class spell_illidan_parasitic_shadowfiend : public AuraScript
 {
-    PrepareAuraScript(spell_illidan_parasitic_shadowfiend);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_PARASITIC_SHADOWFIENDS });
@@ -1943,8 +1935,6 @@ class spell_illidan_parasitic_shadowfiend : public AuraScript
 // 41913 - Parasitic Shadowfiend Passive
 class spell_illidan_parasitic_shadowfiend_proc : public AuraScript
 {
-    PrepareAuraScript(spell_illidan_parasitic_shadowfiend_proc);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_PARASITIC_SHADOWFIEND, SPELL_PARASITIC_SHADOWFIEND_2 });
@@ -1965,8 +1955,6 @@ class spell_illidan_parasitic_shadowfiend_proc : public AuraScript
 // 41923 - Remove Parasitic Shadowfiends (SERVERSIDE)
 class spell_illidan_remove_parasitic_shadowfiend : public AuraScript
 {
-    PrepareAuraScript(spell_illidan_remove_parasitic_shadowfiend);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_PARASITIC_SHADOWFIEND, SPELL_PARASITIC_SHADOWFIEND_2 });
@@ -1988,8 +1976,6 @@ class spell_illidan_remove_parasitic_shadowfiend : public AuraScript
    39849 - Throw Glaive */
 class spell_illidan_throw_warglaive : public SpellScript
 {
-    PrepareSpellScript(spell_illidan_throw_warglaive);
-
     void HandleDummy(SpellEffIndex /*effIndex*/)
     {
         Unit* target = GetHitUnit();
@@ -2005,8 +1991,6 @@ class spell_illidan_throw_warglaive : public SpellScript
 // 39857 - Tear of Azzinoth Summon Channel
 class spell_illidan_tear_of_azzinoth_channel : public AuraScript
 {
-    PrepareAuraScript(spell_illidan_tear_of_azzinoth_channel);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_UNCAGED_WRATH });
@@ -2035,8 +2019,6 @@ class spell_illidan_tear_of_azzinoth_channel : public AuraScript
 // 40631 - Flame Blast
 class spell_illidan_flame_blast : public SpellScript
 {
-    PrepareSpellScript(spell_illidan_flame_blast);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_BLAZE_SUMMON });
@@ -2058,8 +2040,6 @@ class spell_illidan_flame_blast : public SpellScript
 // 39873 - Glaive Returns
 class spell_illidan_return_glaives : public SpellScript
 {
-    PrepareSpellScript(spell_illidan_return_glaives);
-
     void HandleScriptEffect(SpellEffIndex /*effIndex*/)
     {
         GetHitUnit()->SendPlaySpellVisualKit(SPELL_GLAIVE_VISUAL_KIT, 0, 0);
@@ -2076,8 +2056,6 @@ class spell_illidan_return_glaives : public SpellScript
 // 40834 - Agonizing Flames
 class spell_illidan_agonizing_flames : public SpellScript
 {
-    PrepareSpellScript(spell_illidan_agonizing_flames);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_AGONIZING_FLAMES });
@@ -2108,8 +2086,6 @@ class spell_illidan_agonizing_flames : public SpellScript
 // 40511 - Demon Transform 1
 class spell_illidan_demon_transform1 : public AuraScript
 {
-    PrepareAuraScript(spell_illidan_demon_transform1);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_DEMON_TRANSFORM_2 });
@@ -2131,8 +2107,6 @@ class spell_illidan_demon_transform1 : public AuraScript
 // 40398 - Demon Transform 2
 class spell_illidan_demon_transform2 : public AuraScript
 {
-    PrepareAuraScript(spell_illidan_demon_transform2);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_DEMON_FORM, SPELL_DEMON_TRANSFORM_3 });
@@ -2168,8 +2142,6 @@ class spell_illidan_demon_transform2 : public AuraScript
 // 41126 - Flame Burst
 class spell_illidan_flame_burst : public SpellScript
 {
-    PrepareSpellScript(spell_illidan_flame_burst);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FLAME_BURST_EFFECT });
@@ -2189,8 +2161,6 @@ class spell_illidan_flame_burst : public SpellScript
 // 41081 - Find Target
 class spell_illidan_find_target : public SpellScript
 {
-    PrepareSpellScript(spell_illidan_find_target);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_PARALYZE });
@@ -2228,8 +2198,6 @@ class spell_illidan_find_target : public SpellScript
 // 39908 - Eye Blast
 class spell_illidan_eye_blast : public AuraScript
 {
-    PrepareAuraScript(spell_illidan_eye_blast);
-
     void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (Creature* target = GetTarget()->ToCreature())
@@ -2245,8 +2213,6 @@ class spell_illidan_eye_blast : public AuraScript
 // 40761 - Cage Trap
 class spell_illidan_cage_trap : public SpellScript
 {
-    PrepareSpellScript(spell_illidan_cage_trap);
-
     void HandleScriptEffect(SpellEffIndex /*effIndex*/)
     {
         Creature* target = GetHitCreature();
@@ -2273,8 +2239,6 @@ class spell_illidan_cage_trap : public SpellScript
 // 40760 - Cage Trap
 class spell_illidan_caged : public AuraScript
 {
-    PrepareAuraScript(spell_illidan_caged);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_CAGED_DEBUFF });
@@ -2297,8 +2261,6 @@ class spell_illidan_caged : public AuraScript
 // 40409 - Maiev Down
 class spell_maiev_down : public AuraScript
 {
-    PrepareAuraScript(spell_maiev_down);
-
     bool Load() override
     {
         return GetUnitOwner()->GetTypeId() == TYPEID_UNIT;
@@ -2325,8 +2287,6 @@ class spell_maiev_down : public AuraScript
 // 40693 - Cage Trap
 class spell_illidan_cage_teleport : public SpellScript
 {
-    PrepareSpellScript(spell_illidan_cage_teleport);
-
     void SetDest(SpellDestination& dest)
     {
         Position offset = { 0.0f, 0.0f, GetCaster()->GetPositionZ(), 0.0f };
@@ -2342,8 +2302,6 @@ class spell_illidan_cage_teleport : public SpellScript
 // 41242 - Akama Despawn
 class spell_illidan_despawn_akama : public SpellScript
 {
-    PrepareSpellScript(spell_illidan_despawn_akama);
-
     void HandleDummy(SpellEffIndex /*effIndex*/)
     {
         if (Creature* target = GetHitCreature())
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
index d64b240104d..ae4fa8522c9 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp
@@ -563,8 +563,6 @@ private:
 // 41499 - Empyreal Balance
 class spell_illidari_council_empyreal_balance : public SpellScript
 {
-    PrepareSpellScript(spell_illidari_council_empyreal_balance);
-
     void HandleDummy(SpellEffIndex /*effIndex*/)
     {
         Unit* target = GetHitUnit();
@@ -582,8 +580,6 @@ class spell_illidari_council_empyreal_balance : public SpellScript
 // 41333 - Empyreal Equivalency
 class spell_illidari_council_empyreal_equivalency : public SpellScript
 {
-    PrepareSpellScript(spell_illidari_council_empyreal_equivalency);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         GetHitUnit()->SetHealth(GetCaster()->CountPctFromCurHealth(25));
@@ -598,8 +594,6 @@ class spell_illidari_council_empyreal_equivalency : public SpellScript
 // 41341 - Balance of Power
 class spell_illidari_council_balance_of_power : public AuraScript
 {
-    PrepareAuraScript(spell_illidari_council_balance_of_power);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SHARED_RULE });
@@ -620,8 +614,6 @@ class spell_illidari_council_balance_of_power : public AuraScript
 // 41480 - Deadly Strike
 class spell_illidari_council_deadly_strike : public AuraScript
 {
-    PrepareAuraScript(spell_illidari_council_deadly_strike);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_DEADLY_POISON });
@@ -644,8 +636,6 @@ class spell_illidari_council_deadly_strike : public AuraScript
 // 41485 - Deadly Poison
 class spell_illidari_council_deadly_poison : public AuraScript
 {
-    PrepareAuraScript(spell_illidari_council_deadly_poison);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ENVENOM, SPELL_ENVENOM_VISUAL });
@@ -670,8 +660,6 @@ class spell_illidari_council_deadly_poison : public AuraScript
 // 41476 - Vanish
 class spell_illidari_council_vanish : public AuraScript
 {
-    PrepareAuraScript(spell_illidari_council_vanish);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_VANISH_TELEPORT });
@@ -691,8 +679,6 @@ class spell_illidari_council_vanish : public AuraScript
 // 41475 - Reflective Shield
 class spell_illidari_council_reflective_shield : public AuraScript
 {
-    PrepareAuraScript(spell_illidari_council_reflective_shield);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_REFLECTIVE_SHIELD_DAMAGE });
@@ -716,8 +702,6 @@ class spell_illidari_council_reflective_shield : public AuraScript
 // 41467 - Judgement
 class spell_illidari_council_judgement : public SpellScript
 {
-    PrepareSpellScript(spell_illidari_council_judgement);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -754,8 +738,6 @@ class spell_illidari_council_judgement : public SpellScript
    41459 - Seal of Blood */
 class spell_illidari_council_seal : public AuraScript
 {
-    PrepareAuraScript(spell_illidari_council_seal);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -784,8 +766,6 @@ class spell_illidari_council_seal : public AuraScript
 // 41478 - Dampen Magic
 class spell_illidari_dampen_magic : public AuraScript
 {
-    PrepareAuraScript(spell_illidari_dampen_magic);
-
     void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (Creature* target = GetTarget()->ToCreature())
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index ab130530025..634aed72741 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -186,8 +186,6 @@ private:
 // 40869 - Fatal Attraction
 class spell_mother_shahraz_fatal_attraction : public SpellScript
 {
-    PrepareSpellScript(spell_mother_shahraz_fatal_attraction);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -223,8 +221,6 @@ class spell_mother_shahraz_fatal_attraction : public SpellScript
 // 40870 - Fatal Attraction Dummy Visual
 class spell_mother_shahraz_fatal_attraction_link : public SpellScript
 {
-    PrepareSpellScript(spell_mother_shahraz_fatal_attraction_link);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FATAL_ATTRACTION_DAMAGE });
@@ -244,8 +240,6 @@ class spell_mother_shahraz_fatal_attraction_link : public SpellScript
 // 40816 - Saber Lash
 class spell_mother_shahraz_saber_lash : public AuraScript
 {
-    PrepareAuraScript(spell_mother_shahraz_saber_lash);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } })
@@ -273,8 +267,6 @@ class spell_mother_shahraz_saber_lash : public AuraScript
    40862 - Sinful Periodic */
 class spell_mother_shahraz_generic_periodic : public AuraScript
 {
-    PrepareAuraScript(spell_mother_shahraz_generic_periodic);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } })
@@ -299,8 +291,6 @@ class spell_mother_shahraz_generic_periodic : public AuraScript
 // 40867 - Random Periodic
 class spell_mother_shahraz_random_periodic : public AuraScript
 {
-    PrepareAuraScript(spell_mother_shahraz_random_periodic);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(RandomBeam);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index d20264a015e..2deea39af21 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -715,8 +715,6 @@ private:
 // 41350 - Aura of Desire
 class spell_reliquary_of_souls_aura_of_desire : public AuraScript
 {
-    PrepareAuraScript(spell_reliquary_of_souls_aura_of_desire);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_AURA_OF_DESIRE_DAMAGE });
@@ -749,8 +747,6 @@ class spell_reliquary_of_souls_aura_of_desire : public AuraScript
 // 41337 - Aura of Anger
 class spell_reliquary_of_souls_aura_of_anger : public AuraScript
 {
-    PrepareAuraScript(spell_reliquary_of_souls_aura_of_anger);
-
     void HandleEffectPeriodicUpdate(AuraEffect* aurEff)
     {
         if (AuraEffect* aurEff1 = aurEff->GetBase()->GetEffect(EFFECT_1))
@@ -767,8 +763,6 @@ class spell_reliquary_of_souls_aura_of_anger : public AuraScript
 // 28819 - Submerge Visual
 class spell_reliquary_of_souls_submerge : public AuraScript
 {
-    PrepareAuraScript(spell_reliquary_of_souls_submerge);
-
     void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         GetTarget()->SetStandState(UNIT_STAND_STATE_SUBMERGED);
@@ -789,8 +783,6 @@ class spell_reliquary_of_souls_submerge : public AuraScript
 // 41376 - Spite
 class spell_reliquary_of_souls_spite : public AuraScript
 {
-    PrepareAuraScript(spell_reliquary_of_souls_spite);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SPITE_DAMAGE });
@@ -811,8 +803,6 @@ class spell_reliquary_of_souls_spite : public AuraScript
 // 41305 - Frenzy
 class spell_reliquary_of_souls_frenzy : public SpellScript
 {
-    PrepareSpellScript(spell_reliquary_of_souls_frenzy);
-
     void HandleAfterCast()
     {
         if (Creature* caster = GetCaster()->ToCreature())
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 399d32a19d9..e1c9b76bc48 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -1082,8 +1082,6 @@ private:
 // 40401 - Shade Soul Channel (serverside spell)
 class spell_shade_soul_channel_serverside : public AuraScript
 {
-    PrepareAuraScript(spell_shade_soul_channel_serverside);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_SHADE_SOUL_CHANNEL_2 });
@@ -1103,8 +1101,6 @@ class spell_shade_soul_channel_serverside : public AuraScript
 // 40520 - Shade Soul Channel
 class spell_shade_soul_channel : public AuraScript
 {
-    PrepareAuraScript(spell_shade_soul_channel);
-
     void OnApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
     {
         int32 const maxSlowEff = -99;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 8d6017741ca..366848cb07c 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -306,8 +306,6 @@ private:
 // 40251 - Shadow of Death
 class spell_teron_gorefiend_shadow_of_death : public AuraScript
 {
-    PrepareAuraScript(spell_teron_gorefiend_shadow_of_death);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -352,8 +350,6 @@ class spell_teron_gorefiend_shadow_of_death : public AuraScript
 // 40268 - Spiritual Vengeance
 class spell_teron_gorefiend_spiritual_vengeance : public AuraScript
 {
-    PrepareAuraScript(spell_teron_gorefiend_spiritual_vengeance);
-
     void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         GetTarget()->KillSelf();
@@ -368,8 +364,6 @@ class spell_teron_gorefiend_spiritual_vengeance : public AuraScript
 // 41999 - Shadow of Death Remove
 class spell_teron_gorefiend_shadow_of_death_remove : public SpellScript
 {
-    PrepareSpellScript(spell_teron_gorefiend_shadow_of_death_remove);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index 483fb69ffcc..cd3021848d4 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -203,8 +203,6 @@ private:
 // 39992 - Needle Spine Targeting
 class spell_najentus_needle_spine : public SpellScript
 {
-    PrepareSpellScript(spell_najentus_needle_spine);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_NEEDLE_SPINE });
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index 72623c68ace..3eb49532f94 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -659,8 +659,6 @@ struct boss_fathomguard_caribdis : public ScriptedAI
 // 38358 - Tidal Surge
 class spell_fathomlord_karathress_tidal_surge : public SpellScript
 {
-    PrepareSpellScript(spell_fathomlord_karathress_tidal_surge);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_TIDAL_SURGE_EFFECT });
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
index 4ed1fa4af22..e384bb3a078 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp
@@ -667,8 +667,6 @@ private:
 // 46430 - Synch Health
 class spell_ahune_synch_health : public SpellScript
 {
-    PrepareSpellScript(spell_ahune_synch_health);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         GetHitUnit()->SetHealth(GetCaster()->GetHealth());
@@ -683,8 +681,6 @@ class spell_ahune_synch_health : public SpellScript
 // 45926 - Summoning Rhyme Aura
 class spell_summoning_rhyme_aura : public AuraScript
 {
-    PrepareAuraScript(spell_summoning_rhyme_aura);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FORCE_WHISP_FLIGHT, SPELL_SUMMONING_RHYME_BONFIRE });
@@ -727,8 +723,6 @@ class spell_summoning_rhyme_aura : public AuraScript
 // 46878 - Summon Ice Spear Delayer
 class spell_summon_ice_spear_delayer : public AuraScript
 {
-    PrepareAuraScript(spell_summon_ice_spear_delayer);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ICE_SPEAR_KNOCKBACK });
@@ -750,8 +744,6 @@ class spell_summon_ice_spear_delayer : public AuraScript
 // 46371 - Ice Spear Control Aura
 class spell_ice_spear_control_aura : public AuraScript
 {
-    PrepareAuraScript(spell_ice_spear_control_aura);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ICE_SPEAR_TARGET_PICKER });
@@ -772,8 +764,6 @@ class spell_ice_spear_control_aura : public AuraScript
 // 46372 - Ice Spear Target Picker
 class spell_ice_spear_target_picker : public SpellScript
 {
-    PrepareSpellScript(spell_ice_spear_target_picker);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_ICE_SPEAR_BUNNY });
@@ -804,8 +794,6 @@ class spell_ice_spear_target_picker : public SpellScript
 // 46320 - Spell Slippery Floor Periodic
 class spell_slippery_floor_periodic : public SpellScript
 {
-    PrepareSpellScript(spell_slippery_floor_periodic);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SLIPPERY_FLOOR_SLIP });
@@ -830,8 +818,6 @@ class spell_slippery_floor_periodic : public SpellScript
 // 46146 - Ahune Spanky Hands
 class spell_ahune_spanky_hands : public AuraScript
 {
-    PrepareAuraScript(spell_ahune_spanky_hands);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_COLD_SLAP });
@@ -852,8 +838,6 @@ class spell_ahune_spanky_hands : public AuraScript
 // 46843 - Minion Despawner
 class spell_ahune_minion_despawner : public SpellScript
 {
-    PrepareSpellScript(spell_ahune_minion_despawner);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         if (GetHitCreature())
@@ -869,8 +853,6 @@ class spell_ahune_minion_despawner : public SpellScript
 // 46398 - Spell Ice Bombardment Dest Picker
 class spell_ice_bombardment_dest_picker : public SpellScript
 {
-    PrepareSpellScript(spell_ice_bombardment_dest_picker);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ICE_BOMBARDMENT });
diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
index 6a04a457345..2330a2f75ba 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
@@ -138,8 +138,6 @@ private:
 // 31704 - Levitate
 class spell_the_black_stalker_levitate : public SpellScript
 {
-    PrepareSpellScript(spell_the_black_stalker_levitate);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_LEVITATION_PULSE });
@@ -159,8 +157,6 @@ class spell_the_black_stalker_levitate : public SpellScript
 // 31701 - Levitation Pulse
 class spell_the_black_stalker_levitation_pulse : public SpellScript
 {
-    PrepareSpellScript(spell_the_black_stalker_levitation_pulse);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SOMEONE_GRAB_ME });
@@ -180,8 +176,6 @@ class spell_the_black_stalker_levitation_pulse : public SpellScript
 // 31702 - Someone Grab Me
 class spell_the_black_stalker_someone_grab_me : public SpellScript
 {
-    PrepareSpellScript(spell_the_black_stalker_someone_grab_me);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MAGNETIC_PULL, SPELL_SUSPENSION });
@@ -202,8 +196,6 @@ class spell_the_black_stalker_someone_grab_me : public SpellScript
 // 31703 - Magnetic Pull
 class spell_the_black_stalker_magnetic_pull : public SpellScript
 {
-    PrepareSpellScript(spell_the_black_stalker_magnetic_pull);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUSPENSION_PRIMER });
@@ -223,8 +215,6 @@ class spell_the_black_stalker_magnetic_pull : public SpellScript
 // 38756 - Summon Spore Strider
 class spell_the_black_stalker_summon_spore_strider : public SpellScript
 {
-    PrepareSpellScript(spell_the_black_stalker_summon_spore_strider);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_SPORE_STRIDER });
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
index c88f98b937a..d2a3aaa3ed6 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -276,8 +276,6 @@ class spell_gruul_shatter : public SpellScriptLoader
 
         class spell_gruul_shatter_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gruul_shatter_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_STONED, SPELL_SHATTER_EFFECT });
@@ -311,8 +309,6 @@ class spell_gruul_shatter_effect : public SpellScriptLoader
 
         class spell_gruul_shatter_effect_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_gruul_shatter_effect_SpellScript);
-
             bool Validate(SpellInfo const* spellInfo) override
             {
                 return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } });
diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
index d564283af30..2c281a65d43 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
@@ -282,8 +282,6 @@ class spell_broggok_poison_cloud : public SpellScriptLoader
 
         class spell_broggok_poison_cloud_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_broggok_poison_cloud_AuraScript);
-
             bool Validate(SpellInfo const* spellInfo) override
             {
                 return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell });
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index 90d24c23b51..b6f9ffbc92d 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -452,8 +452,6 @@ struct go_manticron_cube : public GameObjectAI
 // 30541 - Blaze
 class spell_magtheridon_blaze_target : public SpellScript
 {
-    PrepareSpellScript(spell_magtheridon_blaze_target);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_BLAZE });
@@ -473,8 +471,6 @@ class spell_magtheridon_blaze_target : public SpellScript
 // 30410 - Shadow Grasp
 class spell_magtheridon_shadow_grasp : public AuraScript
 {
-    PrepareAuraScript(spell_magtheridon_shadow_grasp);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_MIND_EXHAUSTION });
@@ -496,8 +492,6 @@ class spell_magtheridon_shadow_grasp : public AuraScript
 // 30166 - Shadow Grasp (Visual Effect)
 class spell_magtheridon_shadow_grasp_visual : public AuraScript
 {
-    PrepareAuraScript(spell_magtheridon_shadow_grasp_visual);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo(
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
index e1da5cc09bd..3fca93a1a44 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp
@@ -191,8 +191,6 @@ class spell_kargath_executioner : public SpellScriptLoader
 
         class spell_kargath_executioner_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_kargath_executioner_AuraScript);
-
             bool AreaCheck(Unit* target)
             {
                 if (target->GetMap()->GetId() != 540)
@@ -226,8 +224,6 @@ class spell_remove_kargath_executioner : public SpellScriptLoader
 
         class spell_remove_kargath_executioner_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_remove_kargath_executioner_SpellScript);
-
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 Unit* target = GetCaster();
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index 12ae2319eb6..aa42fe49dfa 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -552,8 +552,6 @@ struct npc_flame_patch_alar : public ScriptedAI
 // 34229 - Flame Quills
 class spell_alar_flame_quills : public AuraScript
 {
-    PrepareAuraScript(spell_alar_flame_quills);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(flameQuillsSpells);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index dee825dd272..806d379c0fc 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -478,8 +478,6 @@ struct npc_solarium_priest : public ScriptedAI
 // 42783 - Wrath of the Astromancer
 class spell_astromancer_wrath_of_the_astromancer : public AuraScript
 {
-    PrepareAuraScript(spell_astromancer_wrath_of_the_astromancer);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ SPELL_WRATH_OF_THE_ASTROMANCER_DOT })
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index f0264e3599c..4a9c11101c7 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -1327,8 +1327,6 @@ struct npc_phoenix_egg_tk : public ScriptedAI
 // 35941 - Gravity Lapse
 class spell_kael_gravity_lapse : public SpellScript
 {
-    PrepareSpellScript(spell_kael_gravity_lapse);
-
 public:
     spell_kael_gravity_lapse()
     {
@@ -1360,8 +1358,6 @@ private:
 // 36730 - Flame Strike
 class spell_kaelthas_flame_strike : public AuraScript
 {
-    PrepareAuraScript(spell_kaelthas_flame_strike);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FLAME_STRIKE_DAMAGE });
@@ -1382,8 +1378,6 @@ class spell_kaelthas_flame_strike : public AuraScript
 // 36976 - Summon Weapons
 class spell_kaelthas_summon_weapons : public SpellScript
 {
-    PrepareSpellScript(spell_kaelthas_summon_weapons);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(SummonWeaponsSpells);
@@ -1405,8 +1399,6 @@ class spell_kaelthas_summon_weapons : public SpellScript
 // 39497 - Remove Enchanted Weapons
 class spell_kaelthas_remove_weapons : public SpellScript
 {
-    PrepareSpellScript(spell_kaelthas_remove_weapons);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(RemoveWeaponsSpells);
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
index 9a83dd61c3b..cc13773a290 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp
@@ -161,8 +161,6 @@ struct boss_mechano_lord_capacitus : public BossAI
 // 39093 - Negative Charge
 class spell_capacitus_polarity_charge : public SpellScript
 {
-    PrepareSpellScript(spell_capacitus_polarity_charge);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo(
@@ -217,8 +215,6 @@ class spell_capacitus_polarity_charge : public SpellScript
 // 39096 - Polarity Shift
 class spell_capacitus_polarity_shift : public SpellScript
 {
-    PrepareSpellScript(spell_capacitus_polarity_shift);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_POSITIVE_POLARITY, SPELL_NEGATIVE_POLARITY });
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index 6f8c5b06e50..3ca064382e3 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -204,8 +204,6 @@ private:
 // 35268, 39346 - Inferno
 class spell_nethermancer_sepethrea_inferno : public AuraScript
 {
-    PrepareAuraScript(spell_nethermancer_sepethrea_inferno);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_INFERNO_DAMAGE });
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
index a637298c64e..896df533363 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
@@ -154,8 +154,6 @@ private:
 // 34799 - Arcane Devastation
 class spell_commander_sarannis_arcane_devastation : public AuraScript
 {
-    PrepareAuraScript(spell_commander_sarannis_arcane_devastation);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_ARCANE_RESONANCE });
@@ -175,8 +173,6 @@ class spell_commander_sarannis_arcane_devastation : public AuraScript
 // 34803 - Summon Reinforcements
 class spell_commander_sarannis_summon_reinforcements : public SpellScript
 {
-    PrepareSpellScript(spell_commander_sarannis_summon_reinforcements);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(SummonReinforcementsSpells);
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
index 939c035a122..9d1a56f7dec 100644
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
@@ -166,8 +166,6 @@ private:
 // 32960 - Mark of Kazzak
 class spell_mark_of_kazzak : public AuraScript
 {
-    PrepareAuraScript(spell_mark_of_kazzak);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_MARK_OF_KAZZAK_DAMAGE });
@@ -201,8 +199,6 @@ class spell_mark_of_kazzak : public AuraScript
 // 21063 - Twisted Reflection
 class spell_twisted_reflection : public AuraScript
 {
-    PrepareAuraScript(spell_twisted_reflection);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_TWISTED_REFLECTION_HEAL });
diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
index fe34876d400..5b66e7e43cc 100644
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -990,8 +990,6 @@ class spell_oscillating_field : public SpellScriptLoader
 
         class spell_oscillating_field_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_oscillating_field_SpellScript);
-
             void HandleEffect(SpellEffIndex /*effIndex*/)
             {
                 if (Player* player = GetHitPlayer())
diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
index 9ede3ffc95d..3766425e621 100644
--- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
@@ -809,8 +809,6 @@ enum FelSpirits
 // 39190 - Send Vengeance
 class spell_hellfire_peninsula_send_vengeance : public SpellScript
 {
-    PrepareSpellScript(spell_hellfire_peninsula_send_vengeance);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SEND_VENGEANCE_TO_PLAYER });
@@ -832,8 +830,6 @@ class spell_hellfire_peninsula_send_vengeance : public SpellScript
 // 39202 - Send Vengeance to Player
 class spell_hellfire_peninsula_send_vengeance_to_player : public SpellScript
 {
-    PrepareSpellScript(spell_hellfire_peninsula_send_vengeance_to_player);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_FEL_SPIRIT });
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index a4395a2fb04..1bbf80b84e9 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -716,8 +716,6 @@ enum FireBomb
 // 31959 - Fire Bomb Target Summon Trigger
 class spell_nagrand_fire_bomb_target_summon_trigger : public SpellScript
 {
-    PrepareSpellScript(spell_nagrand_fire_bomb_target_summon_trigger);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FIRE_BOMB_TARGET_SUMMON_EFFECT });
@@ -739,8 +737,6 @@ class spell_nagrand_fire_bomb_target_summon_trigger : public SpellScript
 // 31960 - Fire Bomb Target Summon Effect
 class spell_nagrand_fire_bomb_target_summon_effect : public SpellScript
 {
-    PrepareSpellScript(spell_nagrand_fire_bomb_target_summon_effect);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FIRE_BOMB_DAMAGE_MISSILE });
@@ -760,8 +756,6 @@ class spell_nagrand_fire_bomb_target_summon_effect : public SpellScript
 // 31961 - Fire Bomb
 class spell_nagrand_fire_bomb_damage_missile : public SpellScript
 {
-    PrepareSpellScript(spell_nagrand_fire_bomb_damage_missile);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FIRE_BOMB_SUMMON_CATAPULT_BLAZE, SPELL_FIRE_BOMB_FLAMES });
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index a42eb0e2f77..631be8101ac 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -477,8 +477,6 @@ enum DetonateTeleporter
 // 38920 - Detonate Teleporter
 class spell_detonate_teleporter : public SpellScript
 {
-    PrepareSpellScript(spell_detonate_teleporter);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
index 4e75ab30f24..3d849c5ce95 100644
--- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp
@@ -1517,8 +1517,6 @@ class spell_unlocking_zuluheds_chains : public SpellScriptLoader
 
         class spell_unlocking_zuluheds_chains_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_unlocking_zuluheds_chains_SpellScript);
-
             void HandleAfterHit()
             {
                 if (Player* caster = GetCaster()->ToPlayer())
@@ -1609,8 +1607,6 @@ enum DissensionAmongstTheRanks
 // 38224 - Illidari Agent Illusion
 class spell_shadowmoon_illidari_agent_illusion : public AuraScript
 {
-    PrepareAuraScript(spell_shadowmoon_illidari_agent_illusion);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ILLIDARI_DISGUISE_MALE, SPELL_ILLIDARI_DISGUISE_FEMALE });
@@ -1640,8 +1636,6 @@ class spell_shadowmoon_illidari_agent_illusion : public AuraScript
 // 38223 - Quest Credit: Crazed Colossus
 class spell_shadowmoon_quest_credit_crazed_colossus : public SpellScript
 {
-    PrepareSpellScript(spell_shadowmoon_quest_credit_crazed_colossus);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo(
diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp
index 2d09310aa8d..41e4b00661a 100644
--- a/src/server/scripts/Outland/zone_terokkar_forest.cpp
+++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp
@@ -151,8 +151,6 @@ public:
 // 40655 - Skyguard Flare
 class spell_skyguard_flare : public SpellScript
 {
-    PrepareSpellScript(spell_skyguard_flare);
-
     void ModDestHeight(SpellDestination& dest)
     {
         dest._position.m_positionZ = GetCaster()->GetMap()->GetHeight(GetCaster()->GetPhaseShift(), dest._position.GetPositionX(), dest._position.GetPositionY(), MAX_HEIGHT);
@@ -186,8 +184,6 @@ std::array<uint32, 5> const CocoonSummonSpells =
 // 38949 - Terrokar Free Webbed Creature
 class spell_terokkar_free_webbed : public SpellScript
 {
-    PrepareSpellScript(spell_terokkar_free_webbed);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(CocoonSummonSpells);
@@ -207,8 +203,6 @@ class spell_terokkar_free_webbed : public SpellScript
 // 38950 - Terokkar Free Webbed Creature ON QUEST
 class spell_terokkar_free_webbed_on_quest : public SpellScript
 {
-    PrepareSpellScript(spell_terokkar_free_webbed_on_quest);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(CocoonSummonSpells) && ValidateSpellInfo({ SPELL_FREE_WEBBED_6 });
@@ -245,8 +239,6 @@ enum WhoAreThey
 // 48917 - Who Are They: Cast from Questgiver
 class spell_terokkar_shadowy_disguise_cast_from_questgiver : public SpellScript
 {
-    PrepareSpellScript(spell_terokkar_shadowy_disguise_cast_from_questgiver);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SHADOWY_DISGUISE });
@@ -266,8 +258,6 @@ class spell_terokkar_shadowy_disguise_cast_from_questgiver : public SpellScript
 // 32756 - Shadowy Disguise
 class spell_terokkar_shadowy_disguise : public AuraScript
 {
-    PrepareAuraScript(spell_terokkar_shadowy_disguise);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MALE_SHADOWY_DISGUISE, SPELL_FEMALE_SHADOWY_DISGUISE });
@@ -296,8 +286,6 @@ class spell_terokkar_shadowy_disguise : public AuraScript
 // 32780 - Cancel Shadowy Disguise
 class spell_terokkar_cancel_shadowy_disguise : public SpellScript
 {
-    PrepareSpellScript(spell_terokkar_cancel_shadowy_disguise);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SHADOWY_DISGUISE });