Scripts/Spells: Removed unneccessary PrepareSpellScript and PrepareAuraScript uses

115 files changed, 0 insertions, 1168 deletions

diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.cpp
index 53bec1821d0..e6527f59799 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.cpp
@@ -25,8 +25,6 @@
 // 56584 - Combined Toxins
 class spell_ahnkahet_combined_toxins : public AuraScript
 {
-    PrepareAuraScript(spell_ahnkahet_combined_toxins);
-
     bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo)
     {
         // only procs on poisons (damage class check to exclude stuff like Envenom)
@@ -43,8 +41,6 @@ class spell_ahnkahet_combined_toxins : public AuraScript
 // 56698, 59102 - Shadow Blast
 class spell_ahnkahet_shadow_blast : public SpellScript
 {
-    PrepareSpellScript(spell_ahnkahet_shadow_blast);
-
     void HandleDamageCalc(SpellEffIndex /*effIndex*/)
     {
         Unit* target = GetHitUnit();
@@ -69,8 +65,6 @@ enum ShadowSickle
 // 56702, 59103 - Shadow Sickle
 class spell_ahnkahet_shadow_sickle : public AuraScript
 {
-    PrepareAuraScript(spell_ahnkahet_shadow_sickle);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SHADOW_SICKLE_TRIGGERED });
@@ -108,8 +102,6 @@ class spell_ahnkahet_shadow_sickle : public AuraScript
 // 58906, 58908, 58909, 58910 - Creature - Yogg-Saron Whisper
 class spell_ahnkahet_yogg_saron_whisper : public SpellScript
 {
-    PrepareSpellScript(spell_ahnkahet_yogg_saron_whisper);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return sBroadcastTextStore.HasRecord(uint32(spellInfo->GetEffect(EFFECT_0).CalcValue())) &&
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
index 278f68b1364..03214e40768 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp
@@ -266,8 +266,6 @@ private:
 // 56648 - Potent Fungus
 class spell_amanitar_potent_fungus : public AuraScript
 {
-    PrepareAuraScript(spell_amanitar_potent_fungus);
-
     void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         Unit* target = GetTarget();
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
index 888edb38a77..5085bfd36cd 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
@@ -217,8 +217,6 @@ private:
 // 56159 - Swarm
 class spell_ahn_kahet_swarm : public SpellScript
 {
-    PrepareSpellScript(spell_ahn_kahet_swarm);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SWARM_BUFF });
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
index f83f323ab65..4a7b9cd7a80 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
@@ -785,8 +785,6 @@ private:
    60297 - Volazj Whisper: Death 02 */
 class spell_volazj_whisper : public SpellScript
 {
-    PrepareSpellScript(spell_volazj_whisper);
-
     void HandleScriptEffect(SpellEffIndex /* effIndex */)
     {
         Player* target = GetHitPlayer();
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
index 6c899e46faf..386a7622c49 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -468,8 +468,6 @@ private:
 // 56328 - Random Lightning Visual Effect
 class spell_random_lightning_visual_effect : public SpellScript
 {
-    PrepareSpellScript(spell_random_lightning_visual_effect);
-
     void ModDestHeight(SpellDestination& dest)
     {
         Position const offset = { 0.0f, 0.0f, -19.0f, 0.0f };
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
index 668c2a21d63..296cb50e0e4 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
@@ -410,8 +410,6 @@ struct go_prince_taldaram_sphere : public GameObjectAI
 // 55931 - Conjure Flame Sphere
 class spell_prince_taldaram_conjure_flame_sphere : public SpellScript
 {
-    PrepareSpellScript(spell_prince_taldaram_conjure_flame_sphere);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FLAME_SPHERE_SUMMON_1, SPELL_FLAME_SPHERE_SUMMON_2, SPELL_FLAME_SPHERE_SUMMON_3 });
@@ -438,8 +436,6 @@ class spell_prince_taldaram_conjure_flame_sphere : public SpellScript
 // 55895, 59511, 59512 - Flame Sphere Summon
 class spell_prince_taldaram_flame_sphere_summon : public SpellScript
 {
-    PrepareSpellScript(spell_prince_taldaram_flame_sphere_summon);
-
     void SetDest(SpellDestination& dest)
     {
         Position offset = { 0.0f, 0.0f, 5.5f, 0.0f };
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
index 858229803b0..7d35ecef46f 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp
@@ -606,8 +606,6 @@ struct npc_anubarak_impale_target : public NullCreatureAI
 // 53472, 59433 - Pound
 class spell_anubarak_pound : public AuraScript
 {
-    PrepareAuraScript(spell_anubarak_pound);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_POUND_DAMAGE });
@@ -628,8 +626,6 @@ class spell_anubarak_pound : public AuraScript
 // 53520 - Carrion Beetles
 class spell_anubarak_carrion_beetles : public AuraScript
 {
-    PrepareAuraScript(spell_anubarak_carrion_beetles);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_CARRION_BEETLE });
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
index 30c672d3d6c..d9bd21691f2 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
@@ -855,7 +855,6 @@ class spell_hadronox_periodic_summon_template_AuraScript : public AuraScript
 {
     public:
         spell_hadronox_periodic_summon_template_AuraScript(uint32 topSpellId, uint32 bottomSpellId) : AuraScript(), _topSpellId(topSpellId), _bottomSpellId(bottomSpellId) { }
-        PrepareAuraScript(spell_hadronox_periodic_summon_template_AuraScript);
 
     private:
         bool Validate(SpellInfo const* /*spell*/) override
@@ -957,8 +956,6 @@ class spell_hadronox_periodic_summon_necromancer : public SpellScriptLoader
 // 53030, 59417 - Leech Poison
 class spell_hadronox_leeching_poison : public AuraScript
 {
-    PrepareAuraScript(spell_hadronox_leeching_poison);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_LEECH_POISON_HEAL });
@@ -986,8 +983,6 @@ class spell_hadronox_leeching_poison : public AuraScript
 // 53185 - Web Side Door
 class spell_hadronox_web_doors : public SpellScript
 {
-    PrepareSpellScript(spell_hadronox_web_doors);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_CHAMPION_PERIODIC, SPELL_SUMMON_CRYPT_FIEND_PERIODIC, SPELL_SUMMON_NECROMANCER_PERIODIC });
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
index 7e744bd8cc8..a7358a52b90 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp
@@ -807,8 +807,6 @@ struct npc_gatewatcher_web_wrap : public NullCreatureAI
 // 52343 - Krik'Thir Subboss Aggro Trigger
 class spell_gatewatcher_subboss_trigger : public SpellScript
 {
-    PrepareSpellScript(spell_gatewatcher_subboss_trigger);
-
     void HandleTargets(std::list<WorldObject*>& targetList)
     {
         // Remove any Watchers that are already in combat
@@ -849,8 +847,6 @@ class spell_gatewatcher_subboss_trigger : public SpellScript
 // 52536 - Fixate Trigger
 class spell_anub_ar_skirmisher_fixate : public SpellScript
 {
-    PrepareSpellScript(spell_anub_ar_skirmisher_fixate);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_FIXATE_TRIGGERED });
@@ -871,8 +867,6 @@ class spell_anub_ar_skirmisher_fixate : public SpellScript
 // 52086 - Web Wrap
 class spell_gatewatcher_web_wrap : public AuraScript
 {
-    PrepareAuraScript(spell_gatewatcher_web_wrap);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_WEB_WRAP_WRAPPED });
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
index 5f795d585ae..9a13a69a664 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp
@@ -306,8 +306,6 @@ struct npc_baltharus_the_warborn_clone : public BossAI
 // 74505 - Enervating Brand
 class spell_baltharus_enervating_brand_trigger : public SpellScript
 {
-    PrepareSpellScript(spell_baltharus_enervating_brand_trigger);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_SIPHONED_MIGHT });
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
index 6e063194dd3..9636bc45fae 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -1412,8 +1412,6 @@ class spell_halion_meteor_strike_marker : public SpellScriptLoader
 
         class spell_halion_meteor_strike_marker_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_halion_meteor_strike_marker_AuraScript);
-
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
                 if (!GetCaster())
@@ -1443,8 +1441,6 @@ class spell_halion_combustion_consumption : public SpellScriptLoader
 
         class spell_halion_combustion_consumption_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_halion_combustion_consumption_AuraScript);
-
         public:
             spell_halion_combustion_consumption_AuraScript(uint32 spellID) : AuraScript(), _markSpell(spellID) { }
 
@@ -1501,8 +1497,6 @@ class spell_halion_combustion_consumption_periodic : public SpellScriptLoader
 
         class spell_halion_combustion_consumption_periodic_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_halion_combustion_consumption_periodic_AuraScript);
-
             bool Validate(SpellInfo const* spellInfo) override
             {
                 return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell });
@@ -1544,8 +1538,6 @@ class spell_halion_marks : public SpellScriptLoader
 
         class spell_halion_marks_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_halion_marks_AuraScript);
-
         public:
             spell_halion_marks_AuraScript(uint32 summonSpell, uint32 removeSpell) : AuraScript(),
                 _summonSpellId(summonSpell), _removeSpellId(removeSpell) { }
@@ -1608,8 +1600,6 @@ class spell_halion_damage_aoe_summon : public SpellScriptLoader
 
         class spell_halion_damage_aoe_summon_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_halion_damage_aoe_summon_SpellScript);
-
             void HandleSummon(SpellEffIndex effIndex)
             {
                 PreventHitDefaultEffect(effIndex);
@@ -1645,8 +1635,6 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader
 
         class spell_halion_twilight_realm_handlers_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_halion_twilight_realm_handlers_AuraScript);
-
         public:
             spell_halion_twilight_realm_handlers_AuraScript(uint32 beforeHitSpell, bool isApplyHandler) : AuraScript(),
                 _isApply(isApplyHandler), _beforeHitSpellId(beforeHitSpell)
@@ -1709,8 +1697,6 @@ class spell_halion_clear_debuffs : public SpellScriptLoader
 
         class spell_halion_clear_debuffs_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_halion_clear_debuffs_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_CLEAR_DEBUFFS, SPELL_TWILIGHT_REALM });
@@ -1757,8 +1743,6 @@ class spell_halion_twilight_cutter : public SpellScriptLoader
 
         class spell_halion_twilight_cutter_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_halion_twilight_cutter_SpellScript);
-
             void RemoveNotBetween(std::list<WorldObject*>& unitList)
             {
                 if (unitList.empty())
@@ -1796,8 +1780,6 @@ class spell_halion_twilight_phasing : public SpellScriptLoader
 
         class spell_halion_twilight_phasing_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_halion_twilight_phasing_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SUMMON_TWILIGHT_PORTAL });
@@ -1830,8 +1812,6 @@ class spell_halion_summon_exit_portals : public SpellScriptLoader
 
         class spell_halion_summon_exit_portals_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_halion_summon_exit_portals_SpellScript);
-
             void SetDest0(SpellDestination& dest)
             {
                 Position const offset = { 0.0f, 20.0f, 0.0f, 0.0f };
@@ -1865,8 +1845,6 @@ class spell_halion_spawn_living_embers : public SpellScriptLoader
 
         class spell_halion_spawn_living_embers_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_halion_spawn_living_embers_SpellScript);
-
             void SelectMeteorFlames(std::list<WorldObject*>& unitList)
             {
                 if (!unitList.empty())
@@ -1899,8 +1877,6 @@ class spell_halion_blazing_aura : public SpellScriptLoader
 
         class spell_halion_blazing_aura_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_halion_blazing_aura_SpellScript);
-
             void HandleScript(SpellEffIndex effIndex)
             {
                 PreventHitDefaultEffect(effIndex);
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
index 17ea9738393..fe7be970774 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp
@@ -210,8 +210,6 @@ class ConflagrationTargetSelector
 // 74452 - Conflagration
 class spell_saviana_conflagration_init : public SpellScript
 {
-    PrepareSpellScript(spell_saviana_conflagration_init);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_FLAME_BEACON, SPELL_CONFLAGRATION_2 });
@@ -242,8 +240,6 @@ class spell_saviana_conflagration_init : public SpellScript
 // 74455 - Conflagration
 class spell_saviana_conflagration_throwback : public SpellScript
 {
-    PrepareSpellScript(spell_saviana_conflagration_throwback);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp
index 75761b20a2e..ec81d8719e1 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp
@@ -166,8 +166,6 @@ class at_baltharus_plateau : public OnlyOnceAreaTriggerScript
 // 75415 - Rallying Shout
 class spell_ruby_sanctum_rallying_shout : public SpellScript
 {
-    PrepareSpellScript(spell_ruby_sanctum_rallying_shout);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_RALLY });
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
index c613fd4f5e1..fd83e5064c1 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
@@ -133,8 +133,6 @@ class spell_eadric_radiance : public SpellScriptLoader
         spell_eadric_radiance() : SpellScriptLoader("spell_eadric_radiance") { }
         class spell_eadric_radiance_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_eadric_radiance_SpellScript);
-
             void FilterTargets(std::list<WorldObject*>& unitList)
             {
                 unitList.remove_if(OrientationCheck(GetCaster()));
@@ -651,8 +649,6 @@ class spell_paletress_summon_memory : public SpellScriptLoader
 
         class spell_paletress_summon_memory_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_paletress_summon_memory_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo(memorySpellId);
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
index 0343a09db55..6b308410f64 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp
@@ -384,8 +384,6 @@ public:
 // 67751 - Ghoul Explode
 class spell_black_knight_ghoul_explode : public SpellScript
 {
-    PrepareSpellScript(spell_black_knight_ghoul_explode);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
@@ -406,8 +404,6 @@ class spell_black_knight_ghoul_explode : public SpellScript
 // 67889 - Ghoul Explode
 class spell_black_knight_ghoul_explode_risen_ghoul : public SpellScript
 {
-    PrepareSpellScript(spell_black_knight_ghoul_explode_risen_ghoul);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_1).CalcValue()) });
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index 9ffe975f38e..17c36044f66 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -791,8 +791,6 @@ struct npc_anubarak_spike : public ScriptedAI
 // 65923 - Pursuing Spikes
 class spell_pursuing_spikes : public AuraScript
 {
-    PrepareAuraScript(spell_pursuing_spikes);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_PERMAFROST, SPELL_SPIKE_FAIL });
@@ -832,8 +830,6 @@ class spell_pursuing_spikes : public AuraScript
 // 65919 - Impale
 class spell_impale : public SpellScript
 {
-    PrepareSpellScript(spell_impale);
-
     void HandleDamageCalc(SpellEffIndex /*effIndex*/)
     {
         Unit* target = GetHitUnit();
@@ -853,8 +849,6 @@ class spell_impale : public SpellScript
 // 66118, 67630, 68646, 68647 - Leeching Swarm
 class spell_anubarak_leeching_swarm : public AuraScript
 {
-    PrepareAuraScript(spell_anubarak_leeching_swarm);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_LEECHING_SWARM_DMG, SPELL_LEECHING_SWARM_HEAL });
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
index 0cc2f909a6e..eafc61b849a 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
@@ -2063,8 +2063,6 @@ struct npc_toc_pet_hunter : public boss_faction_championsAI
 // 65812, 68154, 68155, 68156 - Unstable Affliction
 class spell_faction_champion_warl_unstable_affliction : public AuraScript
 {
-    PrepareAuraScript(spell_faction_champion_warl_unstable_affliction);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_UNSTABLE_AFFLICTION_DISPEL });
@@ -2085,8 +2083,6 @@ class spell_faction_champion_warl_unstable_affliction : public AuraScript
 // 66017, 68753, 68754, 68755 - Death Grip
 class spell_faction_champion_death_grip : public SpellScript
 {
-    PrepareSpellScript(spell_faction_champion_death_grip);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_DEATH_GRIP_PULL });
@@ -2110,8 +2106,6 @@ class spell_faction_champion_death_grip : public SpellScript
 // 65980 - Bloodlust
 class spell_toc_bloodlust : public SpellScript
 {
-    PrepareSpellScript(spell_toc_bloodlust);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ AURA_SATED });
@@ -2139,8 +2133,6 @@ class spell_toc_bloodlust : public SpellScript
 // 65983 - Heroism
 class spell_toc_heroism : public SpellScript
 {
-    PrepareSpellScript(spell_toc_heroism);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ AURA_EXHAUSTION });
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
index bc744e47769..240bf370bd6 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -468,8 +468,6 @@ private:
 // 66334, 67905, 67906, 67907 - Mistress' Kiss
 class spell_mistress_kiss : public AuraScript
 {
-    PrepareAuraScript(spell_mistress_kiss);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MISTRESS_KISS_DAMAGE_SILENCE });
@@ -495,8 +493,6 @@ class spell_mistress_kiss : public AuraScript
 // 66336, 67076, 67077, 67078 - Mistress' Kiss
 class spell_mistress_kiss_area : public SpellScript
 {
-    PrepareSpellScript(spell_mistress_kiss_area);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
@@ -533,8 +529,6 @@ class spell_mistress_kiss_area : public SpellScript
 // 66493 - Fel Streak
 class spell_fel_streak_visual : public SpellScript
 {
-    PrepareSpellScript(spell_fel_streak_visual);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index 895aa70a5d3..837872c398d 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -1068,8 +1068,6 @@ struct boss_icehowl : public boss_northrend_beastsAI
 // 66342 - Jump to Hand
 class spell_gormok_jump_to_hand : public AuraScript
 {
-    PrepareAuraScript(spell_gormok_jump_to_hand);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_RIDE_PLAYER });
@@ -1099,8 +1097,6 @@ class spell_gormok_jump_to_hand : public AuraScript
 // 66245 - Ride Vehicle
 class spell_gormok_ride_player : public AuraScript
 {
-    PrepareAuraScript(spell_gormok_ride_player);
-
     void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         Unit* target = GetTarget();
@@ -1121,8 +1117,6 @@ class spell_gormok_ride_player : public AuraScript
 // 66406 - Snobolled!
 class spell_gormok_snobolled : public AuraScript
 {
-    PrepareAuraScript(spell_gormok_snobolled);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_RIDE_PLAYER });
@@ -1143,8 +1137,6 @@ class spell_gormok_snobolled : public AuraScript
 // 66823, 67618, 67619, 67620 - Paralytic Toxin
 class spell_jormungars_paralytic_toxin : public AuraScript
 {
-    PrepareAuraScript(spell_jormungars_paralytic_toxin);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_PARALYSIS });
@@ -1197,8 +1189,6 @@ class spell_jormungars_paralytic_toxin : public AuraScript
 // 66870, 67621, 67622, 67623 - Burning Bile
 class spell_jormungars_burning_bile : public SpellScript
 {
-    PrepareSpellScript(spell_jormungars_burning_bile);
-
     void HandleScriptEffect(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -1214,8 +1204,6 @@ class spell_jormungars_burning_bile : public SpellScript
 // 66882 - Slime Pool
 class spell_jormungars_slime_pool : public AuraScript
 {
-    PrepareAuraScript(spell_jormungars_slime_pool);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell });
@@ -1241,8 +1229,6 @@ class spell_jormungars_slime_pool : public AuraScript
    66823 - Paralytic Toxin */
 class spell_jormungars_snakes_spray : public SpellScript
 {
-    PrepareSpellScript(spell_jormungars_snakes_spray);
-
 public:
     spell_jormungars_snakes_spray(uint32 spellId) : SpellScript(), _spellId(spellId) { }
 
@@ -1268,8 +1254,6 @@ private:
 // 66830 - Paralysis
 class spell_jormungars_paralysis : public AuraScript
 {
-    PrepareAuraScript(spell_jormungars_paralysis);
-
     void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (Unit* caster = GetCaster())
@@ -1289,8 +1273,6 @@ class spell_jormungars_paralysis : public AuraScript
 // 66688 - Arctic Breath
 class spell_icehowl_arctic_breath : public SpellScript
 {
-    PrepareSpellScript(spell_icehowl_arctic_breath);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
@@ -1311,8 +1293,6 @@ class spell_icehowl_arctic_breath : public SpellScript
 // 66734 - Trample
 class spell_icehowl_trample : public SpellScript
 {
-    PrepareSpellScript(spell_icehowl_trample);
-
     void CheckTargets(std::list<WorldObject*>& targets)
     {
         Creature* caster = GetCaster()->ToCreature();
@@ -1334,8 +1314,6 @@ class spell_icehowl_trample : public SpellScript
 // 66683 - Massive Crash
 class spell_icehowl_massive_crash : public AuraScript
 {
-    PrepareAuraScript(spell_icehowl_massive_crash);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_SURGE_OF_ADRENALINE });
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index 06eadcb3e39..dca2b5d81c3 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -650,8 +650,6 @@ struct npc_bullet_controller : public ScriptedAI
 // 66149, 68396 - Bullet Controller Periodic
 class spell_bullet_controller : public AuraScript
 {
-    PrepareAuraScript(spell_bullet_controller);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_PERIODIC_LIGHT, SPELL_SUMMON_PERIODIC_DARK });
@@ -679,8 +677,6 @@ class spell_bullet_controller : public AuraScript
 // 67590, 67602, 67603, 67604 - Powering Up
 class spell_powering_up : public SpellScript
 {
-    PrepareSpellScript(spell_powering_up);
-
     uint32 spellId = 0;
     uint32 poweringUp = 0;
 
@@ -727,8 +723,6 @@ class spell_powering_up : public SpellScript
 // 65686, 67222, 67223, 67224 - Light Essence
 class spell_valkyr_essences : public AuraScript
 {
-    PrepareAuraScript(spell_valkyr_essences);
-
 public:
     spell_valkyr_essences()
     {
@@ -816,8 +810,6 @@ private:
 // 65916, 67248, 67249, 67250 - Power of the Twins
 class spell_power_of_the_twins : public AuraScript
 {
-    PrepareAuraScript(spell_power_of_the_twins);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index d9190a6ed5a..a24f4be8d3f 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -884,8 +884,6 @@ private:
 // 69016 - Corpse Teleport
 class spell_lich_king_teleport_corpse : public SpellScript
 {
-    PrepareSpellScript(spell_lich_king_teleport_corpse);
-
     void HandleTeleport(SpellEffIndex /*effIndex*/)
     {
         GetHitUnit()->NearTeleportTo(CorpseTeleportPosition);
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
index 93a846c2ca2..d24c8560a6f 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp
@@ -368,8 +368,6 @@ public:
 // 59910 - Summon Minions
 class spell_novos_summon_minions : public SpellScript
 {
-    PrepareSpellScript(spell_novos_summon_minions);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_COPY_OF_MINIONS });
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
index ff4b55924bd..05fd38c38e5 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp
@@ -198,8 +198,6 @@ struct boss_tharon_ja : public BossAI
 // 53242 - Clear Gift of Tharon'ja
 class spell_tharon_ja_clear_gift_of_tharon_ja : public SpellScript
 {
-    PrepareSpellScript(spell_tharon_ja_clear_gift_of_tharon_ja);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_GIFT_OF_THARON_JA });
diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
index 5beacdc444f..397ae7597a1 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp
@@ -207,8 +207,6 @@ struct npc_drakkari_invader : public ScriptedAI
 // 49380, 59803 - Consume
 class spell_trollgore_consume : public SpellScript
 {
-    PrepareSpellScript(spell_trollgore_consume);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_CONSUME_BUFF });
@@ -229,8 +227,6 @@ class spell_trollgore_consume : public SpellScript
 // 49555, 59807 - Corpse Explode
 class spell_trollgore_corpse_explode : public AuraScript
 {
-    PrepareAuraScript(spell_trollgore_corpse_explode);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_CORPSE_EXPLODE_DAMAGE });
@@ -259,8 +255,6 @@ class spell_trollgore_corpse_explode : public AuraScript
 // 49405 - Invader Taunt Trigger
 class spell_trollgore_invader_taunt : public SpellScript
 {
-    PrepareSpellScript(spell_trollgore_invader_taunt);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
diff --git a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.cpp
index dd578dad0f6..f59488d7189 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.cpp
@@ -29,8 +29,6 @@ enum SummonRandomDrakkari
 // 49960 - Summon Random Drakkari
 class spell_summon_random_drakkari : public SpellScript
 {
-    PrepareSpellScript(spell_summon_random_drakkari);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_DRAKKARI_SHAMAN, SPELL_SUMMON_DRAKKARI_GUARDIAN });
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
index 75b55d566d5..9bafcb59c1a 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp
@@ -241,8 +241,6 @@ private:
 // 68793, 69050 - Magic's Bane
 class spell_bronjahm_magic_bane : public SpellScript
 {
-    PrepareSpellScript(spell_bronjahm_magic_bane);
-
     void RecalculateDamage(SpellEffIndex /*effIndex*/)
     {
         if (GetHitUnit()->GetPowerType() != POWER_MANA)
@@ -262,8 +260,6 @@ class spell_bronjahm_magic_bane : public SpellScript
 // 68861 - Consume Soul
 class spell_bronjahm_consume_soul : public SpellScript
 {
-    PrepareSpellScript(spell_bronjahm_consume_soul);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -290,8 +286,6 @@ static uint32 const SoulstormVisualSpells[] =
 
 class spell_bronjahm_soulstorm_visual : public AuraScript
 {
-    PrepareAuraScript(spell_bronjahm_soulstorm_visual);
-
     void HandlePeriodicTick(AuraEffect const* aurEff)
     {
         PreventDefaultAction();
@@ -307,8 +301,6 @@ class spell_bronjahm_soulstorm_visual : public AuraScript
 // 68921, 69049 - Soulstorm
 class spell_bronjahm_soulstorm_targeting : public SpellScript
 {
-    PrepareSpellScript(spell_bronjahm_soulstorm_targeting);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         Unit* caster = GetCaster();
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
index f3182d82b3a..6ac0a779725 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
@@ -342,8 +342,6 @@ private:
 // 69051 - Mirrored Soul
 class spell_devourer_of_souls_mirrored_soul : public SpellScript
 {
-    PrepareSpellScript(spell_devourer_of_souls_mirrored_soul);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MIRRORED_SOUL_PROC_AURA });
@@ -364,8 +362,6 @@ class spell_devourer_of_souls_mirrored_soul : public SpellScript
 // 69023 - Mirrored Soul (Proc)
 class spell_devourer_of_souls_mirrored_soul_proc : public AuraScript
 {
-    PrepareAuraScript(spell_devourer_of_souls_mirrored_soul_proc);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MIRRORED_SOUL_DAMAGE });
@@ -398,8 +394,6 @@ class spell_devourer_of_souls_mirrored_soul_proc : public AuraScript
 // 69048 - Mirrored Soul (Target Selector)
 class spell_devourer_of_souls_mirrored_soul_target_selector : public SpellScript
 {
-    PrepareSpellScript(spell_devourer_of_souls_mirrored_soul_target_selector);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MIRRORED_SOUL_BUFF });
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
index 486b65cdea6..49987063278 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
@@ -263,8 +263,6 @@ struct npc_jaina_fos: public ScriptedAI
 // 69131 - Soul Sickness
 class spell_forge_of_souls_soul_sickness : public AuraScript
 {
-    PrepareAuraScript(spell_forge_of_souls_soul_sickness);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_LETHARGY });
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
index 67097c872dd..fb933ba1a6a 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp
@@ -140,8 +140,6 @@ class spell_marwyn_shared_suffering : public SpellScriptLoader
 
         class spell_marwyn_shared_suffering_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_marwyn_shared_suffering_AuraScript);
-
             void HandleEffectRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
             {
                 if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_ENEMY_SPELL)
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
index d71381dbf53..b2db3a91b4a 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
@@ -2757,8 +2757,6 @@ class spell_hor_start_halls_of_reflection_quest_ae : public SpellScriptLoader
 
         class spell_hor_start_halls_of_reflection_quest_ae_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hor_start_halls_of_reflection_quest_ae_SpellScript);
-
             void StartQuests(SpellEffIndex /*effIndex*/)
             {
                 if (Player* target = GetHitPlayer())
@@ -2791,8 +2789,6 @@ class spell_hor_evasion : public SpellScriptLoader
 
         class spell_hor_evasion_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_hor_evasion_SpellScript);
-
             bool Load() override
             {
                 return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -2835,8 +2831,6 @@ class spell_hor_gunship_cannon_fire : public SpellScriptLoader
 
         class spell_hor_gunship_cannon_fire_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_hor_gunship_cannon_fire_AuraScript);
-
             void HandlePeriodic(AuraEffect const* /*aurEff*/)
             {
                 if (!urand(0, 2))
@@ -2863,8 +2857,6 @@ class spell_hor_gunship_cannon_fire : public SpellScriptLoader
 // 70698 - Quel'Delar's Will
 class spell_hor_quel_delars_will : public SpellScript
 {
-    PrepareSpellScript(spell_hor_quel_delars_will);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell });
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
index d34a99d67b6..d07bd4f55fc 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
@@ -250,8 +250,6 @@ private:
 // 68786, 70336 - Permafrost
 class spell_garfrost_permafrost : public SpellScript
 {
-    PrepareSpellScript(spell_garfrost_permafrost);
-
 public:
     spell_garfrost_permafrost()
     {
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
index fae90261770..e645e2310cc 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
@@ -516,8 +516,6 @@ private:
 // 69012 - Explosive Barrage
 class spell_krick_explosive_barrage : public AuraScript
 {
-    PrepareAuraScript(spell_krick_explosive_barrage);
-
     void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
     {
         PreventDefaultAction();
@@ -543,8 +541,6 @@ class spell_krick_explosive_barrage : public AuraScript
 // 69263 - Explosive Barrage
 class spell_ick_explosive_barrage : public AuraScript
 {
-    PrepareAuraScript(spell_ick_explosive_barrage);
-
     void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         Unit* caster = GetCaster();
@@ -575,8 +571,6 @@ class spell_ick_explosive_barrage : public AuraScript
 // 44851 - Hasty Grow
 class spell_exploding_orb_hasty_grow : public AuraScript
 {
-    PrepareAuraScript(spell_exploding_orb_hasty_grow);
-
     void OnStackChange(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (GetStackAmount() == 15)
@@ -600,8 +594,6 @@ class spell_exploding_orb_hasty_grow : public AuraScript
 // 68987 - Pursuit
 class spell_krick_pursuit : public SpellScript
 {
-    PrepareSpellScript(spell_krick_pursuit);
-
     void HandleScriptEffect(SpellEffIndex /*effIndex*/)
     {
         Unit* target = GetHitUnit();
@@ -623,8 +615,6 @@ class spell_krick_pursuit : public SpellScript
 
 class spell_krick_pursuit_AuraScript : public AuraScript
 {
-    PrepareAuraScript(spell_krick_pursuit_AuraScript);
-
     void HandleExtraEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         Unit* caster = GetCaster();
@@ -643,8 +633,6 @@ class spell_krick_pursuit_AuraScript : public AuraScript
 // 69029, 70850 - Pursuit Confusion
 class spell_krick_pursuit_confusion : public AuraScript
 {
-    PrepareAuraScript(spell_krick_pursuit_confusion);
-
     void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         GetTarget()->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
index 86f56279dff..1383bc1a827 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
@@ -410,8 +410,6 @@ class player_overlord_brandAI : public PlayerAI
 // 69172 - Overlord's Brand
 class spell_tyrannus_overlord_brand : public AuraScript
 {
-    PrepareAuraScript(spell_tyrannus_overlord_brand);
-
     bool Load() override
     {
         return GetCaster() && GetCaster()->GetEntry() == NPC_TYRANNUS;
@@ -444,8 +442,6 @@ class spell_tyrannus_overlord_brand : public AuraScript
 // 69275 - Mark of Rimefang
 class spell_tyrannus_mark_of_rimefang : public AuraScript
 {
-    PrepareAuraScript(spell_tyrannus_mark_of_rimefang);
-
     void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         Unit* caster = GetCaster();
@@ -466,8 +462,6 @@ class spell_tyrannus_mark_of_rimefang : public AuraScript
 // 69232 - Icy Blast
 class spell_tyrannus_rimefang_icy_blast : public SpellScript
 {
-    PrepareSpellScript(spell_tyrannus_rimefang_icy_blast);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ICY_BLAST_AURA });
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
index 61fd509cdf4..2e14fdef1e9 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
@@ -233,8 +233,6 @@ private:
 // 70827 - Ice Shards
 class spell_pos_ice_shards : public SpellScript
 {
-    PrepareSpellScript(spell_pos_ice_shards);
-
     bool Load() override
     {
         // This script should execute only in Pit of Saron
diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
index 56b4ce8b369..fefc0ed8ffe 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp
@@ -237,8 +237,6 @@ private:
 // 54956, 59827 - Impaling Charge
 class spell_gal_darah_impaling_charge : public SpellScript
 {
-    PrepareSpellScript(spell_gal_darah_impaling_charge);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_IMPALING_CHARGE_CONTROL_VEHICLE });
@@ -269,8 +267,6 @@ class spell_gal_darah_impaling_charge : public SpellScript
 // 59823 - Stampede (Rhino Spirit Charge)
 class spell_gal_darah_stampede_charge : public SpellScript
 {
-    PrepareSpellScript(spell_gal_darah_stampede_charge);
-
     void OnHit(SpellEffIndex /*effIndex*/)
     {
         if (Creature* caster = GetCaster()->ToCreature())
@@ -286,8 +282,6 @@ class spell_gal_darah_stampede_charge : public SpellScript
 // 60022 - Clear Puncture
 class spell_gal_darah_clear_puncture : public SpellScript
 {
-    PrepareSpellScript(spell_gal_darah_clear_puncture);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_PUNCTURE, SPELL_PUNCTURE_HEROIC });
diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
index f8c3fc1a8ee..79a6d240d04 100644
--- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
+++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
@@ -205,8 +205,6 @@ class achievement_less_rabi : public AchievementCriteriaScript
 // 55163 - Mojo Frenzy
 class spell_moorabi_mojo_frenzy : public AuraScript
 {
-    PrepareAuraScript(spell_moorabi_mojo_frenzy);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_MOJO_FRENZY_CAST_SPEED });
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
index 84b422fdf30..4781352a380 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
@@ -1091,8 +1091,6 @@ private:
 // 71806 - Glittering Sparks
 class spell_taldaram_glittering_sparks : public SpellScript
 {
-    PrepareSpellScript(spell_taldaram_glittering_sparks);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -1109,8 +1107,6 @@ class spell_taldaram_glittering_sparks : public SpellScript
    72040 - Conjure Empowered Flame */
 class spell_taldaram_summon_flame_ball : public SpellScript
 {
-    PrepareSpellScript(spell_taldaram_summon_flame_ball);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -1127,8 +1123,6 @@ class spell_taldaram_summon_flame_ball : public SpellScript
    55947 - Flame Sphere Death Effect */
 class spell_taldaram_flame_ball_visual : public AuraScript
 {
-    PrepareAuraScript(spell_taldaram_flame_ball_visual);
-
     bool Load() override
     {
         if (GetCaster()->GetEntry() == NPC_BALL_OF_FLAME || GetCaster()->GetEntry() == NPC_BALL_OF_INFERNO_FLAME)
@@ -1169,8 +1163,6 @@ class spell_taldaram_flame_ball_visual : public AuraScript
    72784 - Ball of Flames Proc */
 class spell_taldaram_ball_of_inferno_flame : public SpellScript
 {
-    PrepareSpellScript(spell_taldaram_ball_of_inferno_flame);
-
     void ModAuraStack()
     {
         if (Aura* aur = GetHitAura())
@@ -1185,8 +1177,6 @@ class spell_taldaram_ball_of_inferno_flame : public SpellScript
 
 class spell_taldaram_ball_of_inferno_flame_aura : public AuraScript
 {
-    PrepareAuraScript(spell_taldaram_ball_of_inferno_flame_aura);
-
     void HandleStackDrop(ProcEventInfo& /*eventInfo*/)
     {
         ModStackAmount(-1);
@@ -1201,8 +1191,6 @@ class spell_taldaram_ball_of_inferno_flame_aura : public AuraScript
 // 72080 - Kinetic Bomb
 class spell_valanar_kinetic_bomb : public SpellScript
 {
-    PrepareSpellScript(spell_valanar_kinetic_bomb);
-
     void SetDest(SpellDestination& dest)
     {
         Position const offset = { 0.0f, 0.0f, 20.0f, 0.0f };
@@ -1217,8 +1205,6 @@ class spell_valanar_kinetic_bomb : public SpellScript
 
 class spell_valanar_kinetic_bomb_aura : public AuraScript
 {
-    PrepareAuraScript(spell_valanar_kinetic_bomb_aura);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_KINETIC_BOMB_EXPLOSION, SPELL_KINETIC_BOMB_VISUAL });
@@ -1248,8 +1234,6 @@ class spell_valanar_kinetic_bomb_aura : public AuraScript
 // 72087 - Kinetic Bomb Knockback
 class spell_valanar_kinetic_bomb_knockback : public SpellScript
 {
-    PrepareSpellScript(spell_valanar_kinetic_bomb_knockback);
-
     void KnockIntoAir(SpellMissInfo missInfo)
     {
         if (missInfo != SPELL_MISS_NONE)
@@ -1268,8 +1252,6 @@ class spell_valanar_kinetic_bomb_knockback : public SpellScript
 // 72054 - Kinetic Bomb Visual
 class spell_valanar_kinetic_bomb_absorb : public AuraScript
 {
-    PrepareAuraScript(spell_valanar_kinetic_bomb_absorb);
-
     void OnAbsorb(AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount)
     {
         absorbAmount = CalculatePct(dmgInfo.GetDamage(), aurEff->GetAmount());
@@ -1286,8 +1268,6 @@ class spell_valanar_kinetic_bomb_absorb : public AuraScript
 // 73001 - Shadow Prison
 class spell_blood_council_shadow_prison : public AuraScript
 {
-    PrepareAuraScript(spell_blood_council_shadow_prison);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_SHADOW_PRISON_DAMAGE });
@@ -1308,8 +1288,6 @@ class spell_blood_council_shadow_prison : public AuraScript
 // 72999 - Shadow Prison
 class spell_blood_council_shadow_prison_damage : public SpellScript
 {
-    PrepareSpellScript(spell_blood_council_shadow_prison_damage);
-
     void AddExtraDamage(SpellEffIndex /*effIndex*/)
     {
         if (Aura* aur = GetHitUnit()->GetAura(GetSpellInfo()->Id))
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
index a98a839653c..6aedfefafae 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp
@@ -466,8 +466,6 @@ typedef boss_blood_queen_lana_thel LanaThelAI;
 // 70946, 71475, 71476, 71477 - Vampiric Bite
 class spell_blood_queen_vampiric_bite : public SpellScript
 {
-    PrepareSpellScript(spell_blood_queen_vampiric_bite);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR, SPELL_FRENZIED_BLOODTHIRST, SPELL_PRESENCE_OF_THE_DARKFALLEN });
@@ -526,8 +524,6 @@ class spell_blood_queen_vampiric_bite : public SpellScript
 // 70877, 71474 - Frenzied Bloodthirst
 class spell_blood_queen_frenzied_bloodthirst : public AuraScript
 {
-    PrepareAuraScript(spell_blood_queen_frenzied_bloodthirst);
-
     void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (InstanceScript* instance = GetTarget()->GetInstanceScript())
@@ -575,8 +571,6 @@ class BloodboltHitCheck
 // 71899, 71900, 71901, 71902 - Bloodbolt Whirl
 class spell_blood_queen_bloodbolt : public SpellScript
 {
-    PrepareSpellScript(spell_blood_queen_bloodbolt);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_TWILIGHT_BLOODBOLT });
@@ -613,8 +607,6 @@ class spell_blood_queen_bloodbolt : public SpellScript
 // 70871 - Essence of the Blood Queen
 class spell_blood_queen_essence_of_the_blood_queen : public AuraScript
 {
-    PrepareAuraScript(spell_blood_queen_essence_of_the_blood_queen);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL });
@@ -641,8 +633,6 @@ class spell_blood_queen_essence_of_the_blood_queen : public AuraScript
 // 71390 - Pact of the Darkfallen
 class spell_blood_queen_pact_of_the_darkfallen : public SpellScript
 {
-    PrepareSpellScript(spell_blood_queen_pact_of_the_darkfallen);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN));
@@ -679,8 +669,6 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScript
 // 71340 - Pact of the Darkfallen
 class spell_blood_queen_pact_of_the_darkfallen_dmg : public AuraScript
 {
-    PrepareAuraScript(spell_blood_queen_pact_of_the_darkfallen_dmg);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE });
@@ -708,8 +696,6 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public AuraScript
 // 71341 - Pact of the Darkfallen
 class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScript
 {
-    PrepareSpellScript(spell_blood_queen_pact_of_the_darkfallen_dmg_target);
-
     void FilterTargets(std::list<WorldObject*>& unitList)
     {
         unitList.remove_if(Trinity::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN));
@@ -725,8 +711,6 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScript
 // 71446, 71478, 71479, 71480 - Twilight Bloodbolt
 class spell_blood_queen_twilight_bloodbolt : public SpellScript
 {
-    PrepareSpellScript(spell_blood_queen_twilight_bloodbolt);
-
     void HandleResistance(DamageInfo const& damageInfo, uint32& resistAmount, int32& /*absorbAmount*/)
     {
         Unit* caster = damageInfo.GetAttacker();;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
index ca69c1d8145..3357f25086f 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
@@ -987,8 +987,6 @@ private:
 // 72202 - Blood Link
 class spell_deathbringer_blood_link : public SpellScript
 {
-    PrepareSpellScript(spell_deathbringer_blood_link);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_BLOOD_LINK_POWER, SPELL_BLOOD_POWER });
@@ -1011,8 +1009,6 @@ class spell_deathbringer_blood_link : public SpellScript
 // 72178 - Blood Link
 class spell_deathbringer_blood_link_aura : public AuraScript
 {
-    PrepareAuraScript(spell_deathbringer_blood_link_aura);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MARK_OF_THE_FALLEN_CHAMPION });
@@ -1035,8 +1031,6 @@ class spell_deathbringer_blood_link_aura : public AuraScript
 // 72371 - Blood Power
 class spell_deathbringer_blood_power : public SpellScript
 {
-    PrepareSpellScript(spell_deathbringer_blood_power);
-
     void ModAuraValue()
     {
         if (Aura* aura = GetHitAura())
@@ -1051,8 +1045,6 @@ class spell_deathbringer_blood_power : public SpellScript
 
 class spell_deathbringer_blood_power_aura : public AuraScript
 {
-    PrepareAuraScript(spell_deathbringer_blood_power_aura);
-
     void RecalculateHook(AuraEffect const* /*aurEffect*/, int32& amount, bool& canBeRecalculated)
     {
         amount = int32(GetUnitOwner()->GetPower(POWER_ENERGY));
@@ -1069,8 +1061,6 @@ class spell_deathbringer_blood_power_aura : public AuraScript
 // 72409, 72447, 72448, 72449 - Rune of Blood
 class spell_deathbringer_rune_of_blood : public SpellScript
 {
-    PrepareSpellScript(spell_deathbringer_rune_of_blood);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_BLOOD_LINK_DUMMY });
@@ -1091,8 +1081,6 @@ class spell_deathbringer_rune_of_blood : public SpellScript
 // 72176 - Blood Beast's Blood Link
 class spell_deathbringer_blood_beast_blood_link : public AuraScript
 {
-    PrepareAuraScript(spell_deathbringer_blood_beast_blood_link);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_BLOOD_LINK_DUMMY });
@@ -1113,8 +1101,6 @@ class spell_deathbringer_blood_beast_blood_link : public AuraScript
 // 72380, 72438, 72439, 72440 - Blood Nova
 class spell_deathbringer_blood_nova : public SpellScript
 {
-    PrepareSpellScript(spell_deathbringer_blood_nova);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_BLOOD_LINK_DUMMY });
@@ -1135,8 +1121,6 @@ class spell_deathbringer_blood_nova : public SpellScript
 // 72378, 73058 - Blood Nova
 class spell_deathbringer_blood_nova_targeting : public SpellScript
 {
-    PrepareSpellScript(spell_deathbringer_blood_nova_targeting);
-
 public:
     spell_deathbringer_blood_nova_targeting()
     {
@@ -1198,8 +1182,6 @@ private:
 // 72385, 72441, 72442, 72443 - Boiling Blood
 class spell_deathbringer_boiling_blood : public SpellScript
 {
-    PrepareSpellScript(spell_deathbringer_boiling_blood);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1225,8 +1207,6 @@ class spell_deathbringer_boiling_blood : public SpellScript
 // 72257 - Remove Marks of the Fallen Champion
 class spell_deathbringer_remove_marks : public SpellScript
 {
-    PrepareSpellScript(spell_deathbringer_remove_marks);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
index e10c1069fcb..e6bdd11aa7f 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp
@@ -350,8 +350,6 @@ private:
 // 69195, 71219, 73031, 73032 - Pungent Blight
 class spell_festergut_pungent_blight : public SpellScript
 {
-    PrepareSpellScript(spell_festergut_pungent_blight);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -372,8 +370,6 @@ class spell_festergut_pungent_blight : public SpellScript
 // 72219, 72551, 72552, 72553 - Gastric Bloat
 class spell_festergut_gastric_bloat : public SpellScript
 {
-    PrepareSpellScript(spell_festergut_gastric_bloat);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_GASTRIC_EXPLOSION });
@@ -398,8 +394,6 @@ class spell_festergut_gastric_bloat : public SpellScript
 // 69290, 71222, 73033, 73034 - Blighted Spores
 class spell_festergut_blighted_spores : public AuraScript
 {
-    PrepareAuraScript(spell_festergut_blighted_spores);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_INOCULATED, SPELL_ORANGE_BLIGHT_RESIDUE });
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
index 3a5457e82ba..84a20b7b4a9 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
@@ -1729,8 +1729,6 @@ struct npc_gunship_cannon : public PassiveAI
 // 68721 - Rocket Pack
 class spell_igb_rocket_pack : public AuraScript
 {
-    PrepareAuraScript(spell_igb_rocket_pack);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ROCKET_PACK_DAMAGE, SPELL_ROCKET_BURST })
@@ -1763,8 +1761,6 @@ class spell_igb_rocket_pack : public AuraScript
 // 70348 - Rocket Pack Useable
 class spell_igb_rocket_pack_useable : public AuraScript
 {
-    PrepareAuraScript(spell_igb_rocket_pack_useable);
-
     bool Load() override
     {
         return GetOwner()->GetInstanceScript() != nullptr;
@@ -1803,8 +1799,6 @@ class spell_igb_rocket_pack_useable : public AuraScript
 // 70121 - On Orgrim's Hammer Deck
 class spell_igb_on_gunship_deck : public AuraScript
 {
-    PrepareAuraScript(spell_igb_on_gunship_deck);
-
 public:
     spell_igb_on_gunship_deck()
     {
@@ -1846,8 +1840,6 @@ private:
 // 69487 - Overheat
 class spell_igb_periodic_trigger_with_power_cost : public AuraScript
 {
-    PrepareAuraScript(spell_igb_periodic_trigger_with_power_cost);
-
     void HandlePeriodicTick(AuraEffect const* aurEff)
     {
         PreventDefaultAction();
@@ -1863,8 +1855,6 @@ class spell_igb_periodic_trigger_with_power_cost : public AuraScript
 // 69399, 70172 - Cannon Blast
 class spell_igb_cannon_blast : public SpellScript
 {
-    PrepareSpellScript(spell_igb_cannon_blast);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1890,8 +1880,6 @@ class spell_igb_cannon_blast : public SpellScript
 // 69402, 70175 - Incinerating Blast
 class spell_igb_incinerating_blast : public SpellScript
 {
-    PrepareSpellScript(spell_igb_incinerating_blast);
-
 public:
     spell_igb_incinerating_blast()
     {
@@ -1927,8 +1915,6 @@ private:
 // 69487 - Overheat
 class spell_igb_overheat : public AuraScript
 {
-    PrepareAuraScript(spell_igb_overheat);
-
     bool Load() override
     {
         if (GetAura()->GetType() != UNIT_AURA_TYPE)
@@ -1973,8 +1959,6 @@ class spell_igb_overheat : public AuraScript
 // 69705 - Below Zero
 class spell_igb_below_zero : public SpellScript
 {
-    PrepareSpellScript(spell_igb_below_zero);
-
     void RemovePassengers(SpellMissInfo missInfo)
     {
         if (missInfo != SPELL_MISS_NONE)
@@ -1992,8 +1976,6 @@ class spell_igb_below_zero : public SpellScript
 // 70104 - Teleport to Enemy Ship
 class spell_igb_teleport_to_enemy_ship : public SpellScript
 {
-    PrepareSpellScript(spell_igb_teleport_to_enemy_ship);
-
     void RelocateTransportOffset(SpellEffIndex /*effIndex*/)
     {
         WorldLocation const* dest = GetHitDest();
@@ -2016,8 +1998,6 @@ class spell_igb_teleport_to_enemy_ship : public SpellScript
 // 70397, 70403 - Burning Pitch
 class spell_igb_burning_pitch_selector : public SpellScript
 {
-    PrepareSpellScript(spell_igb_burning_pitch_selector);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         uint32 team = HORDE;
@@ -2055,8 +2035,6 @@ class spell_igb_burning_pitch_selector : public SpellScript
 // 71335, 71339 - Burning Pitch
 class spell_igb_burning_pitch : public SpellScript
 {
-    PrepareSpellScript(spell_igb_burning_pitch);
-
     void HandleDummy(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -2075,8 +2053,6 @@ class spell_igb_burning_pitch : public SpellScript
 // 69678, 70609 - Rocket Artillery
 class spell_igb_rocket_artillery : public SpellScript
 {
-    PrepareSpellScript(spell_igb_rocket_artillery);
-
     void SelectRandomTarget(std::list<WorldObject*>& targets)
     {
         if (!targets.empty())
@@ -2103,8 +2079,6 @@ class spell_igb_rocket_artillery : public SpellScript
 // 69679 - Rocket Artillery
 class spell_igb_rocket_artillery_explosion : public SpellScript
 {
-    PrepareSpellScript(spell_igb_rocket_artillery_explosion);
-
     void DamageGunship(SpellEffIndex /*effIndex*/)
     {
         if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -2124,8 +2098,6 @@ class spell_igb_rocket_artillery_explosion : public SpellScript
 // 67335 - Gunship Fall Teleport
 class spell_igb_gunship_fall_teleport : public SpellScript
 {
-    PrepareSpellScript(spell_igb_gunship_fall_teleport);
-
     bool Load() override
     {
         return GetCaster()->GetInstanceScript() != nullptr;
@@ -2155,8 +2127,6 @@ class spell_igb_gunship_fall_teleport : public SpellScript
 // 70331 - Check for Players
 class spell_igb_check_for_players : public SpellScript
 {
-    PrepareSpellScript(spell_igb_check_for_players);
-
 public:
     spell_igb_check_for_players()
     {
@@ -2199,8 +2169,6 @@ private:
 // 72340 - Teleport Players on Victory
 class spell_igb_teleport_players_on_victory : public SpellScript
 {
-    PrepareSpellScript(spell_igb_teleport_players_on_victory);
-
     bool Load() override
     {
         return GetCaster()->GetInstanceScript() != nullptr;
@@ -2224,8 +2192,6 @@ class spell_igb_teleport_players_on_victory : public SpellScript
 // 71201 - Battle Experience - proc should never happen, handled in script
 class spell_igb_battle_experience_check : public AuraScript
 {
-    PrepareAuraScript(spell_igb_battle_experience_check);
-
     bool CheckProc(ProcEventInfo& /*eventInfo*/)
     {
         return false;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
index ae91ecb274c..e34aee8b3a9 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
@@ -946,8 +946,6 @@ private:
 // 70842 - Mana Barrier
 class spell_deathwhisper_mana_barrier : public AuraScript
 {
-    PrepareAuraScript(spell_deathwhisper_mana_barrier);
-
     void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
     {
         PreventDefaultAction();
@@ -968,8 +966,6 @@ class spell_deathwhisper_mana_barrier : public AuraScript
 // 71289 - Dominate Mind
 class spell_deathwhisper_dominated_mind : public AuraScript
 {
-    PrepareAuraScript(spell_deathwhisper_dominated_mind);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_DOMINATE_MIND_SCALE });
@@ -990,8 +986,6 @@ class spell_deathwhisper_dominated_mind : public AuraScript
 // 72478 - Summon Spirits
 class spell_deathwhisper_summon_spirits : public SpellScript
 {
-    PrepareSpellScript(spell_deathwhisper_summon_spirits);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_SHADE });
@@ -1011,8 +1005,6 @@ class spell_deathwhisper_summon_spirits : public SpellScript
 // 70674 - Vampiric Might
 class spell_deathwhisper_vampiric_might : public AuraScript
 {
-    PrepareAuraScript(spell_deathwhisper_vampiric_might);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_VAMPIRIC_MIGHT_PROC });
@@ -1042,8 +1034,6 @@ class spell_deathwhisper_vampiric_might : public AuraScript
 // 69483 - Dark Reckoning
 class spell_deathwhisper_dark_reckoning : public AuraScript
 {
-    PrepareAuraScript(spell_deathwhisper_dark_reckoning);
-
     bool Validate(SpellInfo const* spell) override
     {
         return ValidateSpellEffect({ { spell->Id, EFFECT_0 } })
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
index e87fc08d8a9..08d0fa77a6f 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
@@ -483,8 +483,6 @@ private:
 // 69140 - Coldflame
 class spell_marrowgar_coldflame : public SpellScript
 {
-    PrepareSpellScript(spell_marrowgar_coldflame);
-
     void SelectTarget(std::list<WorldObject*>& targets)
     {
         targets.clear();
@@ -515,8 +513,6 @@ class spell_marrowgar_coldflame : public SpellScript
 // 72705 - Coldflame (Bonestorm)
 class spell_marrowgar_coldflame_bonestorm : public SpellScript
 {
-    PrepareSpellScript(spell_marrowgar_coldflame_bonestorm);
-
     void HandleScriptEffect(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -533,8 +529,6 @@ class spell_marrowgar_coldflame_bonestorm : public SpellScript
 // 69146, 70823, 70824, 70825 - Coldflame (Damage)
 class spell_marrowgar_coldflame_damage : public AuraScript
 {
-    PrepareAuraScript(spell_marrowgar_coldflame_damage);
-
     bool CanBeAppliedOn(Unit* target)
     {
         if (target->HasAura(SPELL_IMPALED))
@@ -559,8 +553,6 @@ class spell_marrowgar_coldflame_damage : public AuraScript
 // 69057, 70826, 72088, 72089 - Bone Spike Graveyard
 class spell_marrowgar_bone_spike_graveyard : public SpellScript
 {
-    PrepareSpellScript(spell_marrowgar_bone_spike_graveyard);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo(BoneSpikeSummonId);
@@ -619,8 +611,6 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScript
 // 69075, 70834, 70835, 70836 - Bone Storm
 class spell_marrowgar_bone_storm : public SpellScript
 {
-    PrepareSpellScript(spell_marrowgar_bone_storm);
-
     void RecalculateDamage()
     {
         SetHitDamage(int32(GetHitDamage() / std::max(std::sqrt(GetHitUnit()->GetExactDist2d(GetCaster())), 1.0f)));
@@ -635,8 +625,6 @@ class spell_marrowgar_bone_storm : public SpellScript
 // 69055, 70814 - Bone Slice
 class spell_marrowgar_bone_slice : public SpellScript
 {
-    PrepareSpellScript(spell_marrowgar_bone_slice);
-
 public:
     spell_marrowgar_bone_slice()
     {
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
index f56810783f2..63965a9978c 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
@@ -811,8 +811,6 @@ private:
 // 70672, 72455, 72832, 72833 - Gaseous Bloat
 class spell_putricide_gaseous_bloat : public AuraScript
 {
-    PrepareAuraScript(spell_putricide_gaseous_bloat);
-
     void HandleExtraEffect(AuraEffect const* /*aurEff*/)
     {
         Unit* target = GetTarget();
@@ -854,8 +852,6 @@ class spell_putricide_gaseous_bloat : public AuraScript
 // 70672, 72455, 72832, 72833 - Gaseous Bloat
 class spell_putricide_ooze_channel : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_ooze_channel);
-
     bool Validate(SpellInfo const* spell) override
     {
         return ValidateSpellInfo({ spell->ExcludeTargetAuraSpell });
@@ -929,8 +925,6 @@ class ExactDistanceCheck
 // 70346, 72456, 72868, 72869 - Slime Puddle
 class spell_putricide_slime_puddle : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_slime_puddle);
-
     void ScaleRange(std::list<WorldObject*>& targets)
     {
         targets.remove_if(ExactDistanceCheck(GetCaster(), 2.5f * GetCaster()->GetObjectScale()));
@@ -947,8 +941,6 @@ class spell_putricide_slime_puddle : public SpellScript
 // 72868, 72869 - Slime Puddle
 class spell_putricide_slime_puddle_aura : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_slime_puddle_aura);
-
     void ReplaceAura()
     {
         if (Unit* target = GetHitUnit())
@@ -964,8 +956,6 @@ class spell_putricide_slime_puddle_aura : public SpellScript
 // 70351, 71966, 71967, 71968 - Unstable Experiment
 class spell_putricide_unstable_experiment : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_unstable_experiment);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -1002,8 +992,6 @@ class spell_putricide_unstable_experiment : public SpellScript
 // 70459 - Ooze Eruption Search Effect
 class spell_putricide_ooze_eruption_searcher : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_ooze_eruption_searcher);
-
     void HandleDummy(SpellEffIndex /*effIndex*/)
     {
         if (GetHitUnit()->HasAura(SPELL_VOLATILE_OOZE_ADHESIVE))
@@ -1022,8 +1010,6 @@ class spell_putricide_ooze_eruption_searcher : public SpellScript
 // 71770 - Ooze Spell Tank Protection
 class spell_putricide_ooze_tank_protection : public AuraScript
 {
-    PrepareAuraScript(spell_putricide_ooze_tank_protection);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } })
@@ -1048,8 +1034,6 @@ class spell_putricide_ooze_tank_protection : public AuraScript
 // 71255 - Choking Gas Bomb
 class spell_putricide_choking_gas_bomb : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_choking_gas_bomb);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         uint32 skipIndex = urand(0, 2);
@@ -1073,8 +1057,6 @@ class spell_putricide_choking_gas_bomb : public SpellScript
 // 70920 - Unbound Plague Search Effect
 class spell_putricide_unbound_plague : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_unbound_plague);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_UNBOUND_PLAGUE, SPELL_UNBOUND_PLAGUE_SEARCHER });
@@ -1135,8 +1117,6 @@ class spell_putricide_unbound_plague : public SpellScript
 // 70360, 72527 - Eat Ooze
 class spell_putricide_eat_ooze : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_eat_ooze);
-
     void SelectTarget(std::list<WorldObject*>& targets)
     {
         if (targets.empty())
@@ -1177,8 +1157,6 @@ class spell_putricide_eat_ooze : public SpellScript
 // 72451, 72463, 72671, 72672 - Mutated Plague
 class spell_putricide_mutated_plague : public AuraScript
 {
-    PrepareAuraScript(spell_putricide_mutated_plague);
-
     void HandleTriggerSpell(AuraEffect const* aurEff)
     {
         PreventDefaultAction();
@@ -1228,8 +1206,6 @@ class spell_putricide_mutated_plague : public AuraScript
 // 70308 - Mutated Transformation (Init)
 class spell_putricide_mutation_init : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_mutation_init);
-
     SpellCastResult CheckRequirementInternal(SpellCustomErrors& extendedError)
     {
         InstanceScript* instance = GetExplTargetUnit()->GetInstanceScript();
@@ -1282,8 +1258,6 @@ class spell_putricide_mutation_init : public SpellScript
 
 class spell_putricide_mutation_init_aura : public AuraScript
 {
-    PrepareAuraScript(spell_putricide_mutation_init_aura);
-
     void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         uint32 spellId = 70311;
@@ -1302,8 +1276,6 @@ class spell_putricide_mutation_init_aura : public AuraScript
 // 70405, 72508, 72509, 72510 - Mutated Transformation (Dismiss)
 class spell_putricide_mutated_transformation_dismiss : public AuraScript
 {
-    PrepareAuraScript(spell_putricide_mutated_transformation_dismiss);
-
     void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (Vehicle* veh = GetTarget()->GetVehicleKit())
@@ -1319,8 +1291,6 @@ class spell_putricide_mutated_transformation_dismiss : public AuraScript
 // 70311, 71503 - Mutated Transformation
 class spell_putricide_mutated_transformation : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_mutated_transformation);
-
     void HandleSummon(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -1370,8 +1340,6 @@ class spell_putricide_mutated_transformation : public SpellScript
 // 70402, 72511, 72512, 72513 - Mutated Transformation (Damage)
 class spell_putricide_mutated_transformation_dmg : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_mutated_transformation_dmg);
-
     void FilterTargetsInitial(std::list<WorldObject*>& targets)
     {
         if (Unit* owner = ObjectAccessor::GetUnit(*GetCaster(), GetCaster()->GetCreatorGUID()))
@@ -1387,8 +1355,6 @@ class spell_putricide_mutated_transformation_dmg : public SpellScript
 // 70539, 72457, 72875, 72876 - Regurgitated Ooze
 class spell_putricide_regurgitated_ooze : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_regurgitated_ooze);
-
     // the only purpose of this hook is to fail the achievement
     void ExtraEffect(SpellEffIndex /*effIndex*/)
     {
@@ -1407,8 +1373,6 @@ class spell_putricide_regurgitated_ooze : public SpellScript
 // 72618 - Mutated Plague Clear
 class spell_putricide_clear_aura_effect_value : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_clear_aura_effect_value);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -1432,8 +1396,6 @@ class spell_putricide_clear_aura_effect_value : public SpellScript
 // 71123 - Decimate
 class spell_stinky_precious_decimate : public SpellScript
 {
-    PrepareSpellScript(spell_stinky_precious_decimate);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         if (GetHitUnit()->GetHealthPct() > float(GetEffectValue()))
@@ -1452,8 +1414,6 @@ class spell_stinky_precious_decimate : public SpellScript
 // 70402, 72511, 72512, 72513 - Mutated Transformation
 class spell_abomination_mutated_transformation : public SpellScript
 {
-    PrepareSpellScript(spell_abomination_mutated_transformation);
-
     void HandleResistance(DamageInfo const& damageInfo, uint32& resistAmount, int32& /*absorbAmount*/)
     {
         Unit* caster = damageInfo.GetAttacker();;
@@ -1474,8 +1434,6 @@ class spell_abomination_mutated_transformation : public SpellScript
 // 71279, 72459, 72621, 72622 - Choking Gas Explosion
 class spell_putricide_choking_gas_filter : public SpellScript
 {
-    PrepareSpellScript(spell_putricide_choking_gas_filter);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_OOZE_VARIABLE, SPELL_GAS_VARIABLE });
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
index a693250358f..623b1b929b6 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
@@ -416,8 +416,6 @@ private:
 // 69782, 69796, 69798, 69801 - Ooze Flood
 class spell_rotface_ooze_flood : public SpellScript
 {
-    PrepareSpellScript(spell_rotface_ooze_flood);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         if (!GetHitUnit())
@@ -457,8 +455,6 @@ class spell_rotface_ooze_flood : public SpellScript
 // 69674, 71224, 73022, 73023 - Mutated Infection
 class spell_rotface_mutated_infection : public SpellScript
 {
-    PrepareSpellScript(spell_rotface_mutated_infection);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         // remove targets with this aura already
@@ -488,8 +484,6 @@ class spell_rotface_mutated_infection : public SpellScript
 
 class spell_rotface_mutated_infection_aura : public AuraScript
 {
-    PrepareAuraScript(spell_rotface_mutated_infection_aura);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } })
@@ -513,8 +507,6 @@ class spell_rotface_mutated_infection_aura : public AuraScript
 // 69538 - Small Ooze Combine
 class spell_rotface_little_ooze_combine : public SpellScript
 {
-    PrepareSpellScript(spell_rotface_little_ooze_combine);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         Creature* caster = GetCaster()->ToCreature();
@@ -537,8 +529,6 @@ class spell_rotface_little_ooze_combine : public SpellScript
 // 69553 - Large Ooze Combine
 class spell_rotface_large_ooze_combine : public SpellScript
 {
-    PrepareSpellScript(spell_rotface_large_ooze_combine);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         Creature* caster = GetCaster()->ToCreature();
@@ -583,8 +573,6 @@ class spell_rotface_large_ooze_combine : public SpellScript
 // 69610 - Large Ooze Buff Combine
 class spell_rotface_large_ooze_buff_combine : public SpellScript
 {
-    PrepareSpellScript(spell_rotface_large_ooze_buff_combine);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -649,8 +637,6 @@ class spell_rotface_large_ooze_buff_combine : public SpellScript
 // 69839 - Unstable Ooze Explosion
 class spell_rotface_unstable_ooze_explosion_init : public SpellScript
 {
-    PrepareSpellScript(spell_rotface_unstable_ooze_explosion_init);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_UNSTABLE_OOZE_EXPLOSION_TRIGGER });
@@ -677,8 +663,6 @@ class spell_rotface_unstable_ooze_explosion_init : public SpellScript
 // 69832 - Unstable Ooze Explosion
 class spell_rotface_unstable_ooze_explosion : public SpellScript
 {
-    PrepareSpellScript(spell_rotface_unstable_ooze_explosion);
-
     void CheckTarget(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -702,8 +686,6 @@ class spell_rotface_unstable_ooze_explosion : public SpellScript
 // 71441 - Unstable Ooze Explosion Suicide Trigger
 class spell_rotface_unstable_ooze_explosion_suicide : public AuraScript
 {
-    PrepareAuraScript(spell_rotface_unstable_ooze_explosion_suicide);
-
     void DespawnSelf(AuraEffect const* /*aurEff*/)
     {
         PreventDefaultAction();
@@ -725,8 +707,6 @@ class spell_rotface_unstable_ooze_explosion_suicide : public AuraScript
 // 72285, 72288 - Vile Gas Trigger
 class spell_rotface_vile_gas_trigger : public SpellScript
 {
-    PrepareSpellScript(spell_rotface_vile_gas_trigger);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster()));
@@ -780,8 +760,6 @@ class spell_rotface_vile_gas_trigger : public SpellScript
 // 69507, 71213, 73189, 73190 - Slime Spray
 class spell_rotface_slime_spray : public SpellScript
 {
-    PrepareSpellScript(spell_rotface_slime_spray);
-
     void HandleResidue()
     {
         Player* target = GetHitPlayer();
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index 2ffe0a3fbdb..ce9f385e625 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -1017,8 +1017,6 @@ private:
 // 70598 - Sindragosa's Fury
 class spell_sindragosa_s_fury : public SpellScript
 {
-    PrepareSpellScript(spell_sindragosa_s_fury);
-
     bool Load() override
     {
         // This script should execute only in Icecrown Citadel
@@ -1090,8 +1088,6 @@ class spell_sindragosa_s_fury : public SpellScript
 // 69762 - Unchained Magic
 class spell_sindragosa_unchained_magic : public SpellScript
 {
-    PrepareSpellScript(spell_sindragosa_unchained_magic);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         std::vector<WorldObject*> healers;
@@ -1147,8 +1143,6 @@ class spell_sindragosa_unchained_magic : public SpellScript
 // 73061, 73062, 73063, 73064 - Frost Breath
 class spell_sindragosa_frost_breath : public SpellScript
 {
-    PrepareSpellScript(spell_sindragosa_frost_breath);
-
     void HandleInfusion()
     {
         Player* target = GetHitPlayer();
@@ -1182,8 +1176,6 @@ class spell_sindragosa_frost_breath : public SpellScript
 // 69766 - Instability
 class spell_sindragosa_instability : public AuraScript
 {
-    PrepareAuraScript(spell_sindragosa_instability);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_BACKLASH });
@@ -1209,8 +1201,6 @@ class spell_sindragosa_instability : public AuraScript
 // 70126 - Frost Beacon
 class spell_sindragosa_frost_beacon : public AuraScript
 {
-    PrepareAuraScript(spell_sindragosa_frost_beacon);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_ICE_TOMB_DAMAGE });
@@ -1232,8 +1222,6 @@ class spell_sindragosa_frost_beacon : public AuraScript
 // 70157 - Ice Tomb (Trap)
 class spell_sindragosa_ice_tomb_trap : public AuraScript
 {
-    PrepareAuraScript(spell_sindragosa_ice_tomb_trap);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         if (!sObjectMgr->GetCreatureTemplate(NPC_ICE_TOMB))
@@ -1282,8 +1270,6 @@ class spell_sindragosa_ice_tomb_trap : public AuraScript
 // 70117 - Icy Grip
 class spell_sindragosa_icy_grip : public SpellScript
 {
-    PrepareSpellScript(spell_sindragosa_icy_grip);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_ICY_GRIP_JUMP });
@@ -1318,8 +1304,6 @@ class MysticBuffetTargetFilter
 // 70127, 72528, 72529, 72530 - Mystic Buffet
 class spell_sindragosa_mystic_buffet : public SpellScript
 {
-    PrepareSpellScript(spell_sindragosa_mystic_buffet);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         targets.remove_if(MysticBuffetTargetFilter(GetCaster()));
@@ -1334,8 +1318,6 @@ class spell_sindragosa_mystic_buffet : public SpellScript
 // 71376 - Icy Blast
 class spell_rimefang_icy_blast : public SpellScript
 {
-    PrepareSpellScript(spell_rimefang_icy_blast);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_ICY_BLAST_AREA });
@@ -1374,8 +1356,6 @@ class OrderWhelpTargetSelector
 // 71357 - Order Whelp
 class spell_frostwarden_handler_order_whelp : public SpellScript
 {
-    PrepareSpellScript(spell_frostwarden_handler_order_whelp);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_FOCUS_FIRE });
@@ -1417,8 +1397,6 @@ class spell_frostwarden_handler_order_whelp : public SpellScript
 // 71350 - Focus Fire
 class spell_frostwarden_handler_focus_fire : public SpellScript
 {
-    PrepareSpellScript(spell_frostwarden_handler_focus_fire);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -1434,8 +1412,6 @@ class spell_frostwarden_handler_focus_fire : public SpellScript
 
 class spell_frostwarden_handler_focus_fire_aura : public AuraScript
 {
-    PrepareAuraScript(spell_frostwarden_handler_focus_fire_aura);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } });
@@ -1460,8 +1436,6 @@ class spell_frostwarden_handler_focus_fire_aura : public AuraScript
 // 69712 - Ice Tomb (Target)
 class spell_sindragosa_ice_tomb_target : public SpellScript
 {
-    PrepareSpellScript(spell_sindragosa_ice_tomb_target);
-
     void FilterTargets(std::list<WorldObject*>& unitList)
     {
         Unit* caster = GetCaster();
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp
index 56d5c21e9a0..1d2aa997cf2 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp
@@ -1424,8 +1424,6 @@ public:
 // 70053 - Revive Champion
 class spell_svalna_revive_champion : public SpellScript
 {
-    PrepareSpellScript(spell_svalna_revive_champion);
-
     void RemoveAliveTarget(std::list<WorldObject*>& targets)
     {
         targets.remove_if(ICCSvalnaAliveCheck());
@@ -1455,8 +1453,6 @@ class spell_svalna_revive_champion : public SpellScript
 // 71462 - Remove Spear
 class spell_svalna_remove_spear : public SpellScript
 {
-    PrepareSpellScript(spell_svalna_remove_spear);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
index 14cd6145543..a2fb6a0ae4b 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
@@ -1947,8 +1947,6 @@ private:
 // 70541, 73779, 73780, 73781 - Infest
 class spell_the_lich_king_infest : public AuraScript
 {
-    PrepareAuraScript(spell_the_lich_king_infest);
-
     void OnPeriodic(AuraEffect const* /*aurEff*/)
     {
         if (GetUnitOwner()->HealthAbovePct(90))
@@ -1977,8 +1975,6 @@ class spell_the_lich_king_infest : public AuraScript
 // 70337, 73912, 73913, 73914 - Necrotic Plague
 class spell_the_lich_king_necrotic_plague : public AuraScript
 {
-    PrepareAuraScript(spell_the_lich_king_necrotic_plague);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_NECROTIC_PLAGUE_JUMP });
@@ -2013,8 +2009,6 @@ class spell_the_lich_king_necrotic_plague : public AuraScript
 // 70338, 73785, 73786, 73787 - Necrotic Plague (Jump)
 class spell_the_lich_king_necrotic_plague_jump : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_necrotic_plague_jump);
-
 public:
     spell_the_lich_king_necrotic_plague_jump()
     {
@@ -2051,8 +2045,6 @@ private:
 
 class spell_the_lich_king_necrotic_plague_jump_aura : public AuraScript
 {
-    PrepareAuraScript(spell_the_lich_king_necrotic_plague_jump_aura);
-
 public:
     spell_the_lich_king_necrotic_plague_jump_aura()
     {
@@ -2123,8 +2115,6 @@ private:
 // 73530 - Shadow Trap (Visual)
 class spell_the_lich_king_shadow_trap_visual : public AuraScript
 {
-    PrepareAuraScript(spell_the_lich_king_shadow_trap_visual);
-
     void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE)
@@ -2140,8 +2130,6 @@ class spell_the_lich_king_shadow_trap_visual : public AuraScript
 // 74282 - Shadow Trap (Periodic)
 class spell_the_lich_king_shadow_trap_periodic : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_shadow_trap_periodic);
-
     void CheckTargetCount(std::list<WorldObject*>& targets)
     {
         if (targets.empty())
@@ -2159,8 +2147,6 @@ class spell_the_lich_king_shadow_trap_periodic : public SpellScript
 // 72262 - Quake
 class spell_the_lich_king_quake : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_quake);
-
     bool Load() override
     {
         return GetCaster()->GetInstanceScript() != nullptr;
@@ -2188,8 +2174,6 @@ class spell_the_lich_king_quake : public SpellScript
 // 69110 - Ice Burst Target Search
 class spell_the_lich_king_ice_burst_target_search : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_ice_burst_target_search);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_ICE_BURST });
@@ -2219,8 +2203,6 @@ class spell_the_lich_king_ice_burst_target_search : public SpellScript
 // 69200 - Raging Spirit
 class spell_the_lich_king_raging_spirit : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_raging_spirit);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -2251,8 +2233,6 @@ class ExactDistanceCheck
 // 72754, 73708, 73709, 73710 - Defile
 class spell_the_lich_king_defile : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_defile);
-
     void CorrectRange(std::list<WorldObject*>& targets)
     {
         targets.remove_if(ExactDistanceCheck(GetCaster(), 10.0f * GetCaster()->GetObjectScale()));
@@ -2282,8 +2262,6 @@ class spell_the_lich_king_defile : public SpellScript
    74300 - Summon Spirit Bomb */
 class spell_the_lich_king_summon_into_air : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_summon_into_air);
-
     void ModDestHeight(SpellEffIndex /*effIndex*/)
     {
         static Position const offset = {0.0f, 0.0f, 15.0f, 0.0f};
@@ -2308,8 +2286,6 @@ class spell_the_lich_king_summon_into_air : public SpellScript
 // 69409, 73797, 73798, 73799 - Soul Reaper
 class spell_the_lich_king_soul_reaper : public AuraScript
 {
-    PrepareAuraScript(spell_the_lich_king_soul_reaper);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_SOUL_REAPER_BUFF });
@@ -2330,8 +2306,6 @@ class spell_the_lich_king_soul_reaper : public AuraScript
 // 69030 - Val'kyr Target Search
 class spell_the_lich_king_valkyr_target_search : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_valkyr_target_search);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_CHARGE });
@@ -2379,8 +2353,6 @@ class spell_the_lich_king_valkyr_target_search : public SpellScript
 // 74445 - Val'kyr Carry
 class spell_the_lich_king_cast_back_to_caster : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_cast_back_to_caster);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         GetHitUnit()->CastSpell(GetCaster(), uint32(GetEffectValue()), true);
@@ -2395,8 +2367,6 @@ class spell_the_lich_king_cast_back_to_caster : public SpellScript
 // 73488, 73782, 73783, 73784 - Life Siphon
 class spell_the_lich_king_life_siphon : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_life_siphon);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_LIFE_SIPHON_HEAL });
@@ -2418,8 +2388,6 @@ class spell_the_lich_king_life_siphon : public SpellScript
 // 70498 - Vile Spirits
 class spell_the_lich_king_vile_spirits : public AuraScript
 {
-    PrepareAuraScript(spell_the_lich_king_vile_spirits);
-
 public:
     spell_the_lich_king_vile_spirits()
     {
@@ -2451,8 +2419,6 @@ private:
 // 70499 - Summon Vile Spirits Effect
 class spell_the_lich_king_vile_spirits_visual : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_vile_spirits_visual);
-
     void ModDestHeight(SpellEffIndex /*effIndex*/)
     {
         Position offset = {0.0f, 0.0f, 15.0f, 0.0f};
@@ -2468,8 +2434,6 @@ class spell_the_lich_king_vile_spirits_visual : public SpellScript
 // 70501 - Vile Spirit Move Target Search
 class spell_the_lich_king_vile_spirit_move_target_search : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_vile_spirit_move_target_search);
-
 public:
     spell_the_lich_king_vile_spirit_move_target_search()
     {
@@ -2513,8 +2477,6 @@ private:
 // 70534 - Vile Spirit Damage Target Search
 class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_vile_spirit_damage_target_search);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -2544,8 +2506,6 @@ class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScript
 // 68980, 74296, 74297, 74325 - Harvest Soul
 class spell_the_lich_king_harvest_soul : public AuraScript
 {
-    PrepareAuraScript(spell_the_lich_king_harvest_soul);
-
     bool Load() override
     {
         return GetOwner()->GetInstanceScript() != nullptr;
@@ -2568,8 +2528,6 @@ class spell_the_lich_king_harvest_soul : public AuraScript
 // 69382 - Light's Favor
 class spell_the_lich_king_lights_favor : public AuraScript
 {
-    PrepareAuraScript(spell_the_lich_king_lights_favor);
-
     void OnPeriodic(AuraEffect const* /*aurEff*/)
     {
         if (Unit* caster = GetCaster())
@@ -2595,8 +2553,6 @@ class spell_the_lich_king_lights_favor : public AuraScript
 // 69397 - Soul Rip
 class spell_the_lich_king_soul_rip : public AuraScript
 {
-    PrepareAuraScript(spell_the_lich_king_soul_rip);
-
     void OnPeriodic(AuraEffect const* aurEff)
     {
         PreventDefaultAction();
@@ -2619,8 +2575,6 @@ class spell_the_lich_king_soul_rip : public AuraScript
 // 72595, 73650 - Restore Soul
 class spell_the_lich_king_restore_soul : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_restore_soul);
-
 public:
     spell_the_lich_king_restore_soul()
     {
@@ -2672,8 +2626,6 @@ private:
 // 69383 - Dark Hunger
 class spell_the_lich_king_dark_hunger : public AuraScript
 {
-    PrepareAuraScript(spell_the_lich_king_dark_hunger);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_DARK_HUNGER_HEAL });
@@ -2700,8 +2652,6 @@ class spell_the_lich_king_dark_hunger : public AuraScript
 // 74276 - In Frostmourne Room
 class spell_the_lich_king_in_frostmourne_room : public AuraScript
 {
-    PrepareAuraScript(spell_the_lich_king_in_frostmourne_room);
-
     bool Load() override
     {
         return GetOwner()->GetInstanceScript() != nullptr;
@@ -2724,8 +2674,6 @@ class spell_the_lich_king_in_frostmourne_room : public AuraScript
 // 74302, 74341, 74342, 74343 - Summon Spirit Bomb
 class spell_the_lich_king_summon_spirit_bomb : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_summon_spirit_bomb);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -2741,8 +2689,6 @@ class spell_the_lich_king_summon_spirit_bomb : public SpellScript
 // 73582 - Trigger Vile Spirit (Inside, Heroic)
 class spell_the_lich_king_trigger_vile_spirit : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_trigger_vile_spirit);
-
     void ActivateSpirit()
     {
         Creature* target = GetHitCreature();
@@ -2761,8 +2707,6 @@ class spell_the_lich_king_trigger_vile_spirit : public SpellScript
 // 71811 - Jump
 class spell_the_lich_king_jump : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_jump);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -2781,8 +2725,6 @@ class spell_the_lich_king_jump : public SpellScript
 // 72431 - Jump (Remove Aura)
 class spell_the_lich_king_jump_remove_aura : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_jump_remove_aura);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -2798,8 +2740,6 @@ class spell_the_lich_king_jump_remove_aura : public SpellScript
 // 73655 - Harvest Soul (Teleport)
 class spell_the_lich_king_harvest_souls_teleport : public SpellScript
 {
-    PrepareSpellScript(spell_the_lich_king_harvest_souls_teleport);
-
     void RelocateTransportOffset(SpellEffIndex /*effIndex*/)
     {
         float randCoordX = frand(-18.0f, 18.0f);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
index b969f003271..b8c9fca9d61 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
@@ -994,8 +994,6 @@ private:
 // 71085 - Mana Void
 class spell_dreamwalker_mana_void : public AuraScript
 {
-    PrepareAuraScript(spell_dreamwalker_mana_void);
-
     void PeriodicTick(AuraEffect const* aurEff)
     {
         // first 3 ticks have amplitude 1 second
@@ -1017,8 +1015,6 @@ class spell_dreamwalker_mana_void : public AuraScript
 // 70916 - Summon Timer: Risen Archmage
 class spell_dreamwalker_decay_periodic_timer : public AuraScript
 {
-    PrepareAuraScript(spell_dreamwalker_decay_periodic_timer);
-
     bool Load() override
     {
         _decayRate = GetId() != SPELL_TIMER_BLAZING_SKELETON ? 1000 : 5000;
@@ -1048,8 +1044,6 @@ class spell_dreamwalker_decay_periodic_timer : public AuraScript
 // 71078 - Summon Risen Archmage
 class spell_dreamwalker_summoner : public SpellScript
 {
-    PrepareSpellScript(spell_dreamwalker_summoner);
-
     bool Load() override
     {
         if (!GetCaster()->GetInstanceScript())
@@ -1088,8 +1082,6 @@ class spell_dreamwalker_summoner : public SpellScript
 // 70912 - Summon Timer: Suppresser
 class spell_dreamwalker_summon_suppresser : public AuraScript
 {
-    PrepareAuraScript(spell_dreamwalker_summon_suppresser);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_SUPPRESSER });
@@ -1131,8 +1123,6 @@ class spell_dreamwalker_summon_suppresser : public AuraScript
 // 70936 - Summon Suppresser
 class spell_dreamwalker_summon_suppresser_effect : public SpellScript
 {
-    PrepareSpellScript(spell_dreamwalker_summon_suppresser_effect);
-
     bool Load() override
     {
         if (!GetCaster()->GetInstanceScript())
@@ -1159,8 +1149,6 @@ class spell_dreamwalker_summon_suppresser_effect : public SpellScript
 // 72224 - Summon Dream Portal
 class spell_dreamwalker_summon_dream_portal : public SpellScript
 {
-    PrepareSpellScript(spell_dreamwalker_summon_dream_portal);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -1180,8 +1168,6 @@ class spell_dreamwalker_summon_dream_portal : public SpellScript
 // 72480 - Summon Nightmare Portal
 class spell_dreamwalker_summon_nightmare_portal : public SpellScript
 {
-    PrepareSpellScript(spell_dreamwalker_summon_nightmare_portal);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -1201,8 +1187,6 @@ class spell_dreamwalker_summon_nightmare_portal : public SpellScript
 // 71970 - Nightmare Cloud
 class spell_dreamwalker_nightmare_cloud : public AuraScript
 {
-    PrepareAuraScript(spell_dreamwalker_nightmare_cloud);
-
 public:
     spell_dreamwalker_nightmare_cloud()
     {
@@ -1233,8 +1217,6 @@ private:
 // 71941 - Twisted Nightmares
 class spell_dreamwalker_twisted_nightmares : public SpellScript
 {
-    PrepareSpellScript(spell_dreamwalker_twisted_nightmares);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -1253,8 +1235,6 @@ class spell_dreamwalker_twisted_nightmares : public SpellScript
 // 47788 - Guardian Spirit
 class spell_dreamwalker_guardian_spirit_restriction : public SpellScript
 {
-    PrepareSpellScript(spell_dreamwalker_guardian_spirit_restriction);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_WEAKENED_SOUL });
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
index 3be82407246..8546a606d64 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
@@ -1164,8 +1164,6 @@ private:
 // 70227 - Empowered Blood
 class spell_icc_empowered_blood : public AuraScript
 {
-    PrepareAuraScript(spell_icc_empowered_blood);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_EMPOWERED_BLOOD_2 });
@@ -1191,8 +1189,6 @@ class spell_icc_empowered_blood : public AuraScript
 // 70304 - Empowered Blood
 class spell_icc_empowered_blood_3 : public AuraScript
 {
-    PrepareAuraScript(spell_icc_empowered_blood_3);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_EMPOWERED_BLOOD_4 });
@@ -1218,8 +1214,6 @@ class spell_icc_empowered_blood_3 : public AuraScript
 // 70299 - Siphon Essence
 class spell_icc_siphon_essence : public AuraScript
 {
-    PrepareAuraScript(spell_icc_siphon_essence);
-
     void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_CANCEL && GetTarget()->IsAIEnabled())
@@ -1235,8 +1229,6 @@ class spell_icc_siphon_essence : public AuraScript
 // 70450 - Blood Mirror
 class spell_darkfallen_blood_mirror : public SpellScript
 {
-    PrepareSpellScript(spell_darkfallen_blood_mirror);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_BLOOD_MIRROR_2, SPELL_BLOOD_MIRROR_DAMAGE_SHARE });
@@ -1283,8 +1275,6 @@ private:
 // 70939 - Blood Queen Lana'thel - Clear all Status Ailments
 class spell_generic_remove_empowered_blood : public SpellScript
 {
-    PrepareSpellScript(spell_generic_remove_empowered_blood);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_EMPOWERED_BLOOD });
@@ -1304,8 +1294,6 @@ class spell_generic_remove_empowered_blood : public SpellScript
 // 70733 - Stoneform
 class spell_icc_stoneform : public AuraScript
 {
-    PrepareAuraScript(spell_icc_stoneform);
-
     void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (Creature* target = GetTarget()->ToCreature())
@@ -1338,8 +1326,6 @@ class spell_icc_stoneform : public AuraScript
 // 70536, 70545, 70546, 70547 - Spirit Alarm
 class spell_icc_spirit_alarm : public SpellScript
 {
-    PrepareSpellScript(spell_icc_spirit_alarm);
-
     void HandleEvent(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -1390,8 +1376,6 @@ class spell_icc_spirit_alarm : public SpellScript
 // 72864 - Death Plague
 class spell_frost_giant_death_plague : public SpellScript
 {
-    PrepareSpellScript(spell_frost_giant_death_plague);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_RECENTLY_INFECTED, SPELL_DEATH_PLAGUE_KILL, SPELL_DEATH_PLAGUE });
@@ -1455,8 +1439,6 @@ private:
 // 72155, 72162 - Harvest Blight Specimen
 class spell_icc_harvest_blight_specimen : public SpellScript
 {
-    PrepareSpellScript(spell_icc_harvest_blight_specimen);
-
     void HandleScript(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -1478,8 +1460,6 @@ class spell_icc_harvest_blight_specimen : public SpellScript
 // 72585 - Soul Missile
 class spell_icc_soul_missile : public SpellScript
 {
-    PrepareSpellScript(spell_icc_soul_missile);
-
     void RelocateDest(SpellDestination& dest)
     {
         static Position const offset = { 0.0f, 0.0f, 200.0f, 0.0f };
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
index 7b8570fd82c..4fe131bc400 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h
@@ -555,8 +555,6 @@ uint32 const MaxHeroicAttempts = 50;
 
 class spell_trigger_spell_from_caster : public SpellScript
 {
-    PrepareSpellScript(spell_trigger_spell_from_caster);
-
 public:
     spell_trigger_spell_from_caster(uint32 triggerId, TriggerCastFlags triggerFlags = TRIGGERED_FULL_MASK);
 
diff --git a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp
index c3263533db1..86942296681 100644
--- a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp
+++ b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp
@@ -121,8 +121,6 @@ private:
 // 66637 - Horde Gunship Portal
 class spell_ioc_gunship_portal : public SpellScript
 {
-    PrepareSpellScript(spell_ioc_gunship_portal);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -151,8 +149,6 @@ class spell_ioc_gunship_portal : public SpellScript
 // 66656 - Parachute
 class spell_ioc_parachute_ic : public AuraScript
 {
-    PrepareAuraScript(spell_ioc_parachute_ic);
-
     void HandleTriggerSpell(AuraEffect const* /*aurEff*/)
     {
         PreventDefaultAction();
@@ -197,8 +193,6 @@ class StartLaunchEvent : public BasicEvent
 // 66218 - Launch
 class spell_ioc_launch : public SpellScript
 {
-    PrepareSpellScript(spell_ioc_launch);
-
     void Launch()
     {
         if (!GetCaster()->ToCreature() || !GetExplTargetDest())
@@ -225,8 +219,6 @@ enum SeaforiumBombSpells
 // 66676 - Seaforium Blast
 class spell_ioc_seaforium_blast_credit : public SpellScript
 {
-    PrepareSpellScript(spell_ioc_seaforium_blast_credit);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_A_BOMB_INABLE_CREDIT, SPELL_A_BOMB_INATION_CREDIT });
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index c29fb0ec62d..0f57dfbfae6 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -653,8 +653,6 @@ struct boss_four_horsemen_sir : public boss_four_horsemen_baseAI
 // 28835 - Mark of Zeliek
 class spell_four_horsemen_mark : public AuraScript
 {
-    PrepareAuraScript(spell_four_horsemen_mark);
-
     void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (Unit* caster = GetCaster())
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
index 1f1d20df53f..f4653cb2972 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
@@ -290,8 +290,6 @@ private:
 // 28374, 54426 - Decimate
 class spell_gluth_decimate : public SpellScript
 {
-    PrepareSpellScript(spell_gluth_decimate);
-
     // handles the damaging effect of the decimate spell.
     void HandleScriptEffect(SpellEffIndex /* index */)
     {
@@ -333,8 +331,6 @@ class spell_gluth_decimate : public SpellScript
 // 28239, 28404 - Zombie Chow Search (single target and aoe zombie-kill spell) to heal Gluth on each target hit
 class spell_gluth_zombiechow_search : public SpellScript
 {
-    PrepareSpellScript(spell_gluth_zombiechow_search);
-
     void HealForEachTargetHit()
     {
         GetCaster()->ModifyHealth(int32(GetCaster()->CountPctFromMaxHealth(5)));
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index 0d2cd019ef4..454d6ba4674 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -890,8 +890,6 @@ struct npc_gothik_trigger : public ScriptedAI
 // 27831, 55638 - Shadow Bolt Volley
 class spell_gothik_shadow_bolt_volley : public SpellScript
 {
-    PrepareSpellScript(spell_gothik_shadow_bolt_volley);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_SHADOW_MARK));
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
index 7c4f0321ce5..ad815472a61 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
@@ -188,8 +188,6 @@ private:
 // 28169 - Mutating Injection
 class spell_grobbulus_mutating_injection : public AuraScript
 {
-    PrepareAuraScript(spell_grobbulus_mutating_injection);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MUTATING_EXPLOSION, SPELL_POISON_CLOUD });
@@ -219,8 +217,6 @@ class spell_grobbulus_mutating_injection : public AuraScript
 // 28158, 54362 - Poison
 class spell_grobbulus_poison_cloud : public AuraScript
 {
-    PrepareAuraScript(spell_grobbulus_poison_cloud);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } })
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
index 554e39ff1e6..645acf28775 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp
@@ -213,8 +213,6 @@ struct boss_heigan : public BossAI
 // 29371 - Eruption
 class spell_heigan_eruption : public SpellScript
 {
-    PrepareSpellScript(spell_heigan_eruption);
-
     void HandleScript(SpellEffIndex /*eff*/)
     {
         Unit* caster = GetCaster();
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
index c5bb7db14ad..72e07397e3e 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
@@ -856,8 +856,6 @@ private:
 // 28410 - Chains of Kel'Thuzad
 class spell_kelthuzad_chains : public AuraScript
 {
-    PrepareAuraScript(spell_kelthuzad_chains);
-
     void HandleApply(AuraEffect const* aurEff, AuraEffectHandleModes mode)
     {
         aurEff->HandleAuraModScale(GetTargetApplication(), mode, true);
@@ -878,8 +876,6 @@ class spell_kelthuzad_chains : public AuraScript
 // 27819 - Detonate Mana
 class spell_kelthuzad_detonate_mana : public AuraScript
 {
-    PrepareAuraScript(spell_kelthuzad_detonate_mana);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_MANA_DETONATION_DAMAGE });
@@ -908,8 +904,6 @@ class spell_kelthuzad_detonate_mana : public AuraScript
 // 27808 - Frost Blast
 class spell_kelthuzad_frost_blast : public AuraScript
 {
-    PrepareAuraScript(spell_kelthuzad_frost_blast);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FROST_BLAST_DMG });
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
index 0995313f448..7a83239a2c1 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp
@@ -154,8 +154,6 @@ class achievement_spore_loser : public AchievementCriteriaScript
 // 29865, 55053 - Deathbloom
 class spell_loatheb_deathbloom : public AuraScript
 {
-    PrepareAuraScript(spell_loatheb_deathbloom);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_DEATHBLOOM_FINAL_DAMAGE });
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
index aa5bb49af45..214b8a94918 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp
@@ -489,8 +489,6 @@ struct go_sapphiron_birth : public GameObjectAI
 // 24780 - Dream Fog
 class spell_sapphiron_change_blizzard_target : public AuraScript
 {
-    PrepareAuraScript(spell_sapphiron_change_blizzard_target);
-
     void HandlePeriodic(AuraEffect const* /*eff*/)
     {
         TempSummon* me = GetTarget()->ToTempSummon();
@@ -519,8 +517,6 @@ class spell_sapphiron_change_blizzard_target : public AuraScript
 // 28522 - Icebolt
 class spell_sapphiron_icebolt : public AuraScript
 {
-    PrepareAuraScript(spell_sapphiron_icebolt);
-
     void HandleApply(AuraEffect const* /*eff*/, AuraEffectHandleModes /*mode*/)
     {
         GetTarget()->ApplySpellImmune(SPELL_ICEBOLT, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_FROST, true);
@@ -559,8 +555,6 @@ class spell_sapphiron_icebolt : public AuraScript
 // 28560 - Summon Blizzard
 class spell_sapphiron_summon_blizzard : public SpellScript
 {
-    PrepareSpellScript(spell_sapphiron_summon_blizzard);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_BLIZZARD });
@@ -595,8 +589,6 @@ class spell_sapphiron_summon_blizzard : public SpellScript
 // 29330 - Sapphiron's Wing Buffet Despawn
 class spell_sapphiron_wing_buffet_despawn_periodic : public AuraScript
 {
-    PrepareAuraScript(spell_sapphiron_wing_buffet_despawn_periodic);
-
     void PeriodicTick(AuraEffect const* /*aurEff*/)
     {
         Unit* target = GetTarget();
@@ -613,8 +605,6 @@ class spell_sapphiron_wing_buffet_despawn_periodic : public AuraScript
 // 29336 - Despawn Buffet
 class spell_sapphiron_despawn_buffet : public SpellScript
 {
-    PrepareSpellScript(spell_sapphiron_despawn_buffet);
-
     void HandleScriptEffect(SpellEffIndex /* effIndex */)
     {
         if (Creature* target = GetHitCreature())
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
index 5e45d415970..a4a20fb900c 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
@@ -944,8 +944,6 @@ struct npc_tesla : public ScriptedAI
 // 28085 - Negative Charge
 class spell_thaddius_polarity_charge : public SpellScript
 {
-    PrepareSpellScript(spell_thaddius_polarity_charge);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo(
@@ -1034,8 +1032,6 @@ class spell_thaddius_polarity_charge : public SpellScript
 // 28089 - Polarity Shift
 class spell_thaddius_polarity_shift : public SpellScript
 {
-    PrepareSpellScript(spell_thaddius_polarity_shift);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo(
@@ -1077,8 +1073,6 @@ class spell_thaddius_polarity_shift : public SpellScript
 // 54517 - Magnetic Pull
 class spell_thaddius_magnetic_pull : public SpellScript
 {
-    PrepareSpellScript(spell_thaddius_magnetic_pull);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_MAGNETIC_PULL });
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
index a9600ba6e48..4e0985c330b 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
@@ -1476,8 +1476,6 @@ struct npc_static_field : public ScriptedAI
 // 56046 - Portal Beam
 class spell_malygos_portal_beam : public AuraScript
 {
-    PrepareAuraScript(spell_malygos_portal_beam);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1510,8 +1508,6 @@ class spell_malygos_portal_beam : public AuraScript
 // 56047 - Random Portal
 class spell_malygos_random_portal : public SpellScript
 {
-    PrepareSpellScript(spell_malygos_random_portal);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1556,8 +1552,6 @@ class IsCreatureVehicleCheck
 // 57459, 61693, 61694 - Arcane Storm
 class spell_malygos_arcane_storm : public SpellScript
 {
-    PrepareSpellScript(spell_malygos_arcane_storm);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1603,8 +1597,6 @@ class spell_malygos_arcane_storm : public SpellScript
 // 56105 - Vortex
 class spell_malygos_vortex_dummy : public SpellScript
 {
-    PrepareSpellScript(spell_malygos_vortex_dummy);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1630,8 +1622,6 @@ class spell_malygos_vortex_dummy : public SpellScript
 // 55873 - Vortex
 class spell_malygos_vortex_visual : public AuraScript
 {
-    PrepareAuraScript(spell_malygos_vortex_visual);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1694,8 +1684,6 @@ class ExactDistanceCheck
 // 56438 - Arcane Overload
 class spell_arcane_overload : public SpellScript
 {
-    PrepareSpellScript(spell_arcane_overload);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1717,8 +1705,6 @@ class spell_arcane_overload : public SpellScript
 // 61210 - Align Disk Aggro
 class spell_nexus_lord_align_disk_aggro : public SpellScript
 {
-    PrepareSpellScript(spell_nexus_lord_align_disk_aggro);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1758,8 +1744,6 @@ class IsPlayerOnHoverDisk
 // 56397 - Arcane Barrage
 class spell_scion_of_eternity_arcane_barrage : public SpellScript
 {
-    PrepareSpellScript(spell_scion_of_eternity_arcane_barrage);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT && GetCaster()->GetInstanceScript() != nullptr;
@@ -1829,8 +1813,6 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScript
 // 58842 - Destroy Platform Channel
 class spell_malygos_destroy_platform_channel : public AuraScript
 {
-    PrepareAuraScript(spell_malygos_destroy_platform_channel);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1858,8 +1840,6 @@ class spell_malygos_destroy_platform_channel : public AuraScript
 // 59084 - Destroy Platform Boom Visual
 class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScript
 {
-    PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_boom_visual);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1885,8 +1865,6 @@ class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScript
 // 59099 - Destroy Platform Event
 class spell_alexstrasza_bunny_destroy_platform_event : public SpellScript
 {
-    PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_event);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1915,8 +1893,6 @@ class spell_alexstrasza_bunny_destroy_platform_event : public SpellScript
 // 56070 - Summon Red Dragon Buddy
 class spell_wyrmrest_skytalon_summon_red_dragon_buddy : public SpellScript
 {
-    PrepareSpellScript(spell_wyrmrest_skytalon_summon_red_dragon_buddy);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -1938,8 +1914,6 @@ class spell_wyrmrest_skytalon_summon_red_dragon_buddy : public SpellScript
 // 56072 - Ride Red Dragon Buddy
 class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger : public SpellScript
 {
-    PrepareSpellScript(spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1960,8 +1934,6 @@ class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger : public SpellScript
 // 60939 - Surge of Power
 class spell_malygos_surge_of_power_warning_selector_25 : public SpellScript
 {
-    PrepareSpellScript(spell_malygos_surge_of_power_warning_selector_25);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -2013,8 +1985,6 @@ class spell_malygos_surge_of_power_warning_selector_25 : public SpellScript
 // 60936 - Surge of Power
 class spell_malygos_surge_of_power_25 : public SpellScript
 {
-    PrepareSpellScript(spell_malygos_surge_of_power_25);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -2054,8 +2024,6 @@ class spell_malygos_surge_of_power_25 : public SpellScript
 // 61028 - Alexstrasza's Gift Beam
 class spell_alexstrasza_gift_beam : public AuraScript
 {
-    PrepareAuraScript(spell_alexstrasza_gift_beam);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -2088,8 +2056,6 @@ class spell_alexstrasza_gift_beam : public AuraScript
 // 61023 - Alexstrasza's Gift Visual
 class spell_alexstrasza_gift_beam_visual : public AuraScript
 {
-    PrepareAuraScript(spell_alexstrasza_gift_beam_visual);
-
 public:
     spell_alexstrasza_gift_beam_visual()
     {
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
index b0075cbef0c..e86c687b159 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
@@ -231,8 +231,6 @@ struct containment_sphere : public GameObjectAI
 // 48095 - Intense Cold
 class spell_intense_cold : public AuraScript
 {
-    PrepareAuraScript(spell_intense_cold);
-
     void HandlePeriodicTick(AuraEffect const* /*aurEff*/)
     {
         if (GetStackAmount() < 2)
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
index 5c7b7702f53..9715348d5b3 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
@@ -326,8 +326,6 @@ private:
 // 47710 - Summon Telestra Clones
 class spell_magus_telestra_summon_clones : public SpellScript
 {
-    PrepareSpellScript(spell_magus_telestra_summon_clones);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -357,8 +355,6 @@ class spell_magus_telestra_summon_clones : public SpellScript
 // 47713 - Telestra Clone Dies (Arcane)
 class spell_magus_telestra_clone_dies : public AuraScript
 {
-    PrepareAuraScript(spell_magus_telestra_clone_dies);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_TRIGGER_000 });
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
index fb3a8007270..9cb218167d8 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
@@ -268,8 +268,6 @@ std::array<uint32, 4> const SummonSpellsHeroic =
 // 47958, 57082 - Crystal Spikes
 class spell_ormorok_summon_crystal_spikes : public SpellScript
 {
-    PrepareSpellScript(spell_ormorok_summon_crystal_spikes);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(SummonSpells) && ValidateSpellInfo(SummonSpellsHeroic);
@@ -291,8 +289,6 @@ class spell_ormorok_summon_crystal_spikes : public SpellScript
 // 47941 - Crystal Spike
 class spell_ormorok_crystal_spike : public AuraScript
 {
-    PrepareAuraScript(spell_ormorok_crystal_spike);
-
     void HandlePeriodic(AuraEffect const* /*aurEff*/)
     {
         Unit* target = GetTarget();
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
index 3d64e9e5350..4e766d77811 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
@@ -139,8 +139,6 @@ struct boss_drakos : public BossAI
 // 51336 - Magic Pull
 class spell_drakos_magic_pull : public SpellScript
 {
-    PrepareSpellScript(spell_drakos_magic_pull);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MAGIC_PULL_EFFECT, SPELL_SUMMON_UNSTABLE_SPHERE });
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
index e8f85b0d0e6..95eaa59cf8f 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp
@@ -254,8 +254,6 @@ private:
 // 51162 - Planar Shift
 class spell_eregos_planar_shift : public AuraScript
 {
-    PrepareAuraScript(spell_eregos_planar_shift);
-
     void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (Creature* creature = GetTarget()->ToCreature())
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
index 1f4c23b67bf..13b869a4d5e 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
@@ -338,8 +338,6 @@ private:
 // 51103 - Frostbomb
 class spell_urom_frostbomb : public AuraScript
 {
-    PrepareAuraScript(spell_urom_frostbomb);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_FROST_BUFFET });
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
index 256394560d1..2e6357a0794 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp
@@ -243,8 +243,6 @@ private:
 // 50053 - Centrifuge Shield
 class spell_varos_centrifuge_shield : public AuraScript
 {
-    PrepareAuraScript(spell_varos_centrifuge_shield);
-
     bool Load() override
     {
         Unit* caster = GetCaster();
@@ -273,8 +271,6 @@ class spell_varos_centrifuge_shield : public AuraScript
 // 50785, 59372 - Energize Cores
 class spell_varos_energize_core_area_enemy : public SpellScript
 {
-    PrepareSpellScript(spell_varos_energize_core_area_enemy);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         Creature* varos = GetCaster()->ToCreature();
@@ -308,8 +304,6 @@ class spell_varos_energize_core_area_enemy : public SpellScript
 // 61407, 62136 - Energize Cores
 class spell_varos_energize_core_area_entry : public SpellScript
 {
-    PrepareSpellScript(spell_varos_energize_core_area_entry);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         Creature* varos = GetCaster()->ToCreature();
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
index 44d18148dbb..4dfca6ae6d7 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
@@ -376,8 +376,6 @@ private:
 // 49462 - Call Ruby Drake
 class spell_oculus_call_ruby_emerald_amber_drake : public SpellScript
 {
-    PrepareSpellScript(spell_oculus_call_ruby_emerald_amber_drake);
-
     void SetDest(SpellDestination& dest)
     {
         // Adjust effect summon position
@@ -396,8 +394,6 @@ class spell_oculus_call_ruby_emerald_amber_drake : public SpellScript
 // 49463 - Ride Ruby Drake Que
 class spell_oculus_ride_ruby_emerald_amber_drake_que : public AuraScript
 {
-    PrepareAuraScript(spell_oculus_ride_ruby_emerald_amber_drake_que);
-
     void HandlePeriodic(AuraEffect const* aurEff)
     {
         // caster of the triggered spell is wrong for an unknown reason, handle it here correctly
@@ -415,8 +411,6 @@ class spell_oculus_ride_ruby_emerald_amber_drake_que : public AuraScript
 // 50240 - Evasive Maneuvers
 class spell_oculus_evasive_maneuvers : public AuraScript
 {
-    PrepareAuraScript(spell_oculus_evasive_maneuvers);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_RUBY_EVASIVE_CHARGES });
@@ -439,8 +433,6 @@ class spell_oculus_evasive_maneuvers : public AuraScript
 // 49840 - Shock Lance
 class spell_oculus_shock_lance : public SpellScript
 {
-    PrepareSpellScript(spell_oculus_shock_lance);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_AMBER_SHOCK_CHARGE });
@@ -470,8 +462,6 @@ class spell_oculus_shock_lance : public SpellScript
 // 49838 - Stop Time
 class spell_oculus_stop_time : public AuraScript
 {
-    PrepareAuraScript(spell_oculus_stop_time);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_AMBER_SHOCK_CHARGE });
@@ -497,8 +487,6 @@ class spell_oculus_stop_time : public AuraScript
 // 49592 - Temporal Rift
 class spell_oculus_temporal_rift : public AuraScript
 {
-    PrepareAuraScript(spell_oculus_temporal_rift);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_AMBER_SHOCK_CHARGE });
@@ -531,8 +519,6 @@ class spell_oculus_temporal_rift : public AuraScript
 // 50341 - Touch the Nightmare
 class spell_oculus_touch_the_nightmare : public SpellScript
 {
-    PrepareSpellScript(spell_oculus_touch_the_nightmare);
-
     void HandleDamageCalc(SpellEffIndex /*effIndex*/)
     {
         SetHitDamage(int32(GetCaster()->CountPctFromMaxHealth(30)));
@@ -547,8 +533,6 @@ class spell_oculus_touch_the_nightmare : public SpellScript
 // 50344 - Dream Funnel
 class spell_oculus_dream_funnel : public AuraScript
 {
-    PrepareAuraScript(spell_oculus_dream_funnel);
-
     void HandleEffectCalcAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
     {
         if (Unit* caster = GetCaster())
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp
index caefccde989..2a54638e94d 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp
@@ -380,8 +380,6 @@ private:
 // 53792 - Battle Stance
 class spell_bjarngrim_stance_dummy : public AuraScript
 {
-    PrepareAuraScript(spell_bjarngrim_stance_dummy);
-
 public:
     spell_bjarngrim_stance_dummy(uint8 stanceId) : AuraScript(), _stanceId(stanceId) { }
 
@@ -456,8 +454,6 @@ private:
 // 52098 - Charge Up
 class spell_bjarngrim_charge_up : public AuraScript
 {
-    PrepareAuraScript(spell_bjarngrim_charge_up);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_TEMPOARY_ELECTRICAL_CHARGE });
@@ -478,8 +474,6 @@ class spell_bjarngrim_charge_up : public AuraScript
 // 59085 - Arc Weld
 class spell_bjarngrim_arc_weld : public AuraScript
 {
-    PrepareAuraScript(spell_bjarngrim_arc_weld);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ARC_WELD_DAMAGE });
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
index 0b4eeef3f4f..099bd3a86a3 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -201,8 +201,6 @@ struct boss_loken : public BossAI
 // 52942, 59837 - Pulsing Shockwave
 class spell_loken_pulsing_shockwave : public SpellScript
 {
-    PrepareSpellScript(spell_loken_pulsing_shockwave);
-
     void CalculateDamage(SpellEffIndex /*effIndex*/)
     {
         if (!GetHitUnit())
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
index 7fe66b85571..53fcdb94f43 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
@@ -377,8 +377,6 @@ private:
 // 52654, 52238 - Temper
 class spell_volkhan_temper_dummy : public SpellScript
 {
-    PrepareSpellScript(spell_volkhan_temper_dummy);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_TEMPER_DUMMY_COMBAT });
@@ -412,8 +410,6 @@ class spell_volkhan_temper_dummy : public SpellScript
 // 52441 - Cool Down
 class spell_volkhan_cool_down : public AuraScript
 {
-    PrepareAuraScript(spell_volkhan_cool_down);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_COOL_DOWN_SLOW, SPELL_COSMETIC_STUN_IMMUNE_FREEZE_AMNIM });
@@ -446,8 +442,6 @@ class spell_volkhan_cool_down : public AuraScript
 // 59123 Cosmetic - Stun + Immune Permanent (Freeze Anim)
 class spell_volkhan_cosmetic_stun_immune_permanent : public AuraScript
 {
-    PrepareAuraScript(spell_volkhan_cosmetic_stun_immune_permanent);
-
     void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (Creature* target = GetTarget()->ToCreature())
@@ -463,8 +457,6 @@ class spell_volkhan_cosmetic_stun_immune_permanent : public AuraScript
 // 52237, 59529 - Shattering Stomp
 class spell_volkhan_shattering_stomp : public SpellScript
 {
-    PrepareSpellScript(spell_volkhan_shattering_stomp);
-
     void HandleShattering()
     {
         if (Creature* caster = GetCaster()->ToCreature())
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index 8080cfa4c55..25b0dd77579 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
@@ -134,8 +134,6 @@ struct boss_krystallus : public BossAI
 // 50810, 61546 - Shatter
 class spell_krystallus_shatter : public SpellScript
 {
-    PrepareSpellScript(spell_krystallus_shatter);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         if (Unit* target = GetHitUnit())
@@ -154,8 +152,6 @@ class spell_krystallus_shatter : public SpellScript
 // 50811, 61547 - Shatter
 class spell_krystallus_shatter_effect : public SpellScript
 {
-    PrepareSpellScript(spell_krystallus_shatter_effect);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } });
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
index 265827cbd1d..7d575f0d16a 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp
@@ -404,8 +404,6 @@ private:
    50824 - Summon Earthen Dwarf */
 class spell_sjonnir_periodic_summon : public AuraScript
 {
-    PrepareAuraScript(spell_sjonnir_periodic_summon);
-
 public:
     spell_sjonnir_periodic_summon(uint32 leftPipeSpell, uint32 rightPipeSpell)
         : AuraScript(), _leftPipeSpell(leftPipeSpell), _rightPipeSpell(rightPipeSpell) { }
@@ -439,8 +437,6 @@ private:
 // 50777 - Iron Sludge Spawn Visual
 class spell_sjonnir_iron_sludge_spawn_visual : public AuraScript
 {
-    PrepareAuraScript(spell_sjonnir_iron_sludge_spawn_visual);
-
     void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         // They're indeed passive but I'm not sure enough if it's handled by this aura or directly in script
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
index 4b5aec6dad1..84262234a81 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
@@ -1017,8 +1017,6 @@ private:
 // 64412 - Phase Punch
 class spell_algalon_phase_punch : public AuraScript
 {
-    PrepareAuraScript(spell_algalon_phase_punch);
-
     void HandlePeriodic(AuraEffect const* /*aurEff*/)
     {
         PreventDefaultAction();
@@ -1045,8 +1043,6 @@ class spell_algalon_phase_punch : public AuraScript
 // 65508 - Constellation Phase Trigger
 class spell_algalon_phase_constellation : public AuraScript
 {
-    PrepareAuraScript(spell_algalon_phase_constellation);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell });
@@ -1070,8 +1066,6 @@ class spell_algalon_phase_constellation : public AuraScript
 // 62266 - Trigger 3 Adds
 class spell_algalon_trigger_3_adds : public SpellScript
 {
-    PrepareSpellScript(spell_algalon_trigger_3_adds);
-
     void SelectTarget(std::list<WorldObject*>& targets)
     {
         // Remove Living Constellation already actived
@@ -1098,8 +1092,6 @@ class spell_algalon_trigger_3_adds : public SpellScript
 // 62018 - Collapse
 class spell_algalon_collapse : public AuraScript
 {
-    PrepareAuraScript(spell_algalon_collapse);
-
     void HandlePeriodic(AuraEffect const* /*aurEff*/)
     {
         PreventDefaultAction();
@@ -1115,8 +1107,6 @@ class spell_algalon_collapse : public AuraScript
 // 64443, 64584 - Big Bang
 class spell_algalon_big_bang : public SpellScript
 {
-    PrepareSpellScript(spell_algalon_big_bang);
-
     bool Load() override
     {
         _targetCount = 0;
@@ -1146,8 +1136,6 @@ private:
 // 64445 - Remove Player from Phase
 class spell_algalon_remove_phase : public AuraScript
 {
-    PrepareAuraScript(spell_algalon_remove_phase);
-
     void HandlePeriodic(AuraEffect const* /*aurEff*/)
     {
         PreventDefaultAction();
@@ -1163,8 +1151,6 @@ class spell_algalon_remove_phase : public AuraScript
 // 62295 - Cosmic Smash
 class spell_algalon_cosmic_smash : public SpellScript
 {
-    PrepareSpellScript(spell_algalon_cosmic_smash);
-
     void ModDestHeight(SpellDestination& dest)
     {
         // Meteor should spawn below the platform
@@ -1181,8 +1167,6 @@ class spell_algalon_cosmic_smash : public SpellScript
 // 62311, 64596 - Cosmic Smash
 class spell_algalon_cosmic_smash_damage : public SpellScript
 {
-    PrepareSpellScript(spell_algalon_cosmic_smash_damage);
-
     void RecalculateDamage()
     {
         if (!GetExplTargetDest() || !GetHitUnit())
@@ -1202,8 +1186,6 @@ class spell_algalon_cosmic_smash_damage : public SpellScript
 // 65311 - Supermassive Fail
 class spell_algalon_supermassive_fail : public SpellScript
 {
-    PrepareSpellScript(spell_algalon_supermassive_fail);
-
     void RecalculateDamage()
     {
         if (Player* player = GetHitPlayer())
@@ -1221,8 +1203,6 @@ class spell_algalon_supermassive_fail : public SpellScript
 // 64417 - Phase Punch (Phase Shifts)
 class spell_algalon_black_hole_phase_shifts : public AuraScript
 {
-    PrepareAuraScript(spell_algalon_black_hole_phase_shifts);
-
     bool Load() override
     {
         return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER;
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
index 3e4451164c3..0db4f8b942f 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
@@ -673,8 +673,6 @@ class spell_shield_of_runes : public SpellScriptLoader
 
         class spell_shield_of_runes_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_shield_of_runes_AuraScript);
-
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
                 if (Unit* caster = GetCaster())
@@ -701,8 +699,6 @@ class spell_assembly_meltdown : public SpellScriptLoader
 
         class spell_assembly_meltdown_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_assembly_meltdown_SpellScript);
-
             void HandleInstaKill(SpellEffIndex /*effIndex*/)
             {
                 if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -729,8 +725,6 @@ class spell_assembly_rune_of_summoning : public SpellScriptLoader
 
         class spell_assembly_rune_of_summoning_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_assembly_rune_of_summoning_AuraScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_RUNE_OF_SUMMONING_SUMMON });
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
index dde0a93c49b..e0e64ffbdbb 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp
@@ -524,8 +524,6 @@ private:
 // 64381 - Strength of the Pack
 class spell_auriaya_strenght_of_the_pack : public SpellScript
 {
-    PrepareSpellScript(spell_auriaya_strenght_of_the_pack);
-
     void FilterTargets(std::list<WorldObject*>& unitList)
     {
         unitList.remove_if([](WorldObject* obj) { return obj->GetEntry() != NPC_SANCTUM_SENTRY; });
@@ -540,8 +538,6 @@ class spell_auriaya_strenght_of_the_pack : public SpellScript
 // 64392, 64679 - Sentinel Blast
 class spell_auriaya_sentinel_blast : public SpellScript
 {
-    PrepareSpellScript(spell_auriaya_sentinel_blast);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         targets.remove_if([](WorldObject* object) -> bool
@@ -566,8 +562,6 @@ class spell_auriaya_sentinel_blast : public SpellScript
 // 63709 - Aggro Creator
 class spell_auriaya_agro_creator : public SpellScript
 {
-    PrepareSpellScript(spell_auriaya_agro_creator);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_POUNCE });
@@ -596,8 +590,6 @@ class spell_auriaya_agro_creator : public SpellScript
 // 64456 - Feral Essence Application Removal
 class spell_auriaya_feral_essence_removal : public SpellScript
 {
-    PrepareSpellScript(spell_auriaya_feral_essence_removal);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FERAL_ESSENCE });
@@ -618,8 +610,6 @@ class spell_auriaya_feral_essence_removal : public SpellScript
 // 64496, 64674 - Feral Rush
 class spell_auriaya_feral_rush : public SpellScript
 {
-    PrepareSpellScript(spell_auriaya_feral_rush);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FERAL_RUSH_2 });
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
index 2151d24530d..61e0854c319 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
@@ -1434,8 +1434,6 @@ class achievement_unbroken : public AchievementCriteriaScript
 // 62399 - Overload Circuit
 class spell_overload_circuit : public AuraScript
 {
-    PrepareAuraScript(spell_overload_circuit);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SYSTEMS_SHUTDOWN });
@@ -1460,8 +1458,6 @@ class spell_overload_circuit : public AuraScript
 // 62292 - Blaze
 class spell_tar_blaze : public AuraScript
 {
-    PrepareAuraScript(spell_tar_blaze);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell });
@@ -1492,8 +1488,6 @@ class spell_load_into_catapult : public SpellScriptLoader
 
         class spell_load_into_catapult_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_load_into_catapult_AuraScript);
-
             void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
                 Unit* owner = GetOwner()->ToUnit();
@@ -1538,8 +1532,6 @@ class spell_auto_repair : public SpellScriptLoader
 
         class spell_auto_repair_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_auto_repair_SpellScript);
-
             void CheckCooldownForTarget(SpellMissInfo missInfo)
             {
                 if (missInfo != SPELL_MISS_NONE)
@@ -1603,8 +1595,6 @@ class spell_systems_shutdown : public SpellScriptLoader
 
         class spell_systems_shutdown_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_systems_shutdown_AuraScript);
-
             void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
                 Creature* owner = GetOwner()->ToCreature();
@@ -1686,8 +1676,6 @@ class spell_pursue : public SpellScriptLoader
 
         class spell_pursue_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_pursue_SpellScript);
-
         private:
             // EFFECT #0 - select target
             void FilterTargets(std::list<WorldObject*>& targets)
@@ -1734,7 +1722,6 @@ class spell_vehicle_throw_passenger : public SpellScriptLoader
 
         class spell_vehicle_throw_passenger_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_vehicle_throw_passenger_SpellScript);
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 Spell* baseSpell = GetSpell();
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
index 7ccc20206da..cb5becbdd08 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
@@ -1541,8 +1541,6 @@ class spell_freya_attuned_to_nature_dose_reduction : public SpellScriptLoader
 
         class spell_freya_attuned_to_nature_dose_reduction_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_freya_attuned_to_nature_dose_reduction_SpellScript);
-
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 Unit* target = GetHitUnit();
@@ -1590,8 +1588,6 @@ class spell_freya_iron_roots : public SpellScriptLoader
 
         class spell_freya_iron_roots_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_freya_iron_roots_SpellScript);
-
             void HandleSummon(SpellEffIndex effIndex)
             {
                 PreventHitDefaultEffect(effIndex);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
index a7036a1fbbb..9b9d91c7574 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
@@ -458,8 +458,6 @@ class spell_general_vezax_mark_of_the_faceless : public SpellScriptLoader
 
         class spell_general_vezax_mark_of_the_faceless_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_general_vezax_mark_of_the_faceless_AuraScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_MARK_OF_THE_FACELESS_DAMAGE });
@@ -495,8 +493,6 @@ class spell_general_vezax_mark_of_the_faceless_leech : public SpellScriptLoader
 
         class spell_general_vezax_mark_of_the_faceless_leech_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_general_vezax_mark_of_the_faceless_leech_SpellScript);
-
             void FilterTargets(std::list<WorldObject*>& targets)
             {
                 targets.remove(GetExplTargetWorldObject());
@@ -525,8 +521,6 @@ class spell_general_vezax_saronite_vapors : public SpellScriptLoader
 
         class spell_general_vezax_saronite_vapors_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_general_vezax_saronite_vapors_AuraScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SARONITE_VAPORS_ENERGIZE, SPELL_SARONITE_VAPORS_DAMAGE });
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
index 77c1d767971..4d2b9895876 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
@@ -991,8 +991,6 @@ class spell_biting_cold : public SpellScriptLoader
 
         class spell_biting_cold_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_biting_cold_AuraScript);
-
             void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
             {
                 Unit* target = GetTarget();
@@ -1048,8 +1046,6 @@ public:
 
     class spell_biting_cold_dot_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_biting_cold_dot_AuraScript);
-
         void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
         {
             Unit* caster = GetCaster();
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
index 98412e00e9e..b005d402bb6 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
@@ -455,8 +455,6 @@ class spell_ignis_slag_pot : public SpellScriptLoader
 
         class spell_ignis_slag_pot_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_ignis_slag_pot_AuraScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_SLAG_POT_DAMAGE, SPELL_SLAG_IMBUED });
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
index 49f598b35a7..933bf45563c 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
@@ -334,8 +334,6 @@ class spell_ulduar_rubble_summon : public SpellScriptLoader
 
         class spell_ulduar_rubble_summonSpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_ulduar_rubble_summonSpellScript);
-
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 Unit* caster = GetCaster();
@@ -390,8 +388,6 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader
 
         class spell_ulduar_stone_grip_cast_target_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_ulduar_stone_grip_cast_target_SpellScript);
-
             bool Load() override
             {
                 if (GetCaster()->GetTypeId() != TYPEID_UNIT)
@@ -451,8 +447,6 @@ class spell_ulduar_cancel_stone_grip : public SpellScriptLoader
 
         class spell_ulduar_cancel_stone_gripSpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_ulduar_cancel_stone_gripSpellScript);
-
             bool Validate(SpellInfo const* spellInfo) override
             {
                 return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } });
@@ -491,8 +485,6 @@ class spell_ulduar_squeezed_lifeless : public SpellScriptLoader
 
         class spell_ulduar_squeezed_lifeless_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_ulduar_squeezed_lifeless_SpellScript);
-
             void HandleInstaKill(SpellEffIndex /*effIndex*/)
             {
                 if (GetHitUnit()->GetTypeId() != TYPEID_PLAYER || !GetHitUnit()->GetVehicle())
@@ -530,8 +522,6 @@ class spell_ulduar_stone_grip_absorb : public SpellScriptLoader
 
         class spell_ulduar_stone_grip_absorb_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_ulduar_stone_grip_absorb_AuraScript);
-
             //! This will be called when Right Arm (vehicle) has sustained a specific amount of damage depending on instance mode
             //! What we do here is remove all harmful aura's related and teleport to safe spot.
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
@@ -568,8 +558,6 @@ class spell_ulduar_stone_grip : public SpellScriptLoader
 
         class spell_ulduar_stone_grip_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_ulduar_stone_grip_AuraScript);
-
             void OnRemoveStun(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
             {
                 GetUnitOwner()->RemoveAurasDueToSpell(aurEff->GetAmount());
@@ -621,8 +609,6 @@ class spell_kologarn_stone_shout : public SpellScriptLoader
 
         class spell_kologarn_stone_shout_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_kologarn_stone_shout_SpellScript);
-
             void FilterTargets(std::list<WorldObject*>& targets)
             {
                 targets.remove_if([](WorldObject* object) -> bool
@@ -657,8 +643,6 @@ class spell_kologarn_summon_focused_eyebeam : public SpellScriptLoader
 
         class spell_kologarn_summon_focused_eyebeam_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_kologarn_summon_focused_eyebeam_SpellScript);
-
             void HandleForceCast(SpellEffIndex effIndex)
             {
                 PreventHitDefaultEffect(effIndex);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
index b95d606c719..06b0f21465d 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
@@ -1721,8 +1721,6 @@ class spell_mimiron_bomb_bot : public SpellScriptLoader
 
         class spell_mimiron_bomb_bot_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_bomb_bot_SpellScript);
-
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 if (GetHitPlayer())
@@ -1762,8 +1760,6 @@ class spell_mimiron_clear_fires : public SpellScriptLoader
 
         class spell_mimiron_clear_fires_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_clear_fires_SpellScript);
-
             void HandleDummy(SpellEffIndex /*effIndex*/)
             {
                 if (GetHitCreature())
@@ -1790,8 +1786,6 @@ class spell_mimiron_despawn_assault_bots : public SpellScriptLoader
 
         class spell_mimiron_despawn_assault_bots_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_despawn_assault_bots_SpellScript);
-
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 if (GetHitCreature())
@@ -1818,8 +1812,6 @@ class spell_mimiron_fire_search : public SpellScriptLoader
 
         class spell_mimiron_fire_search_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_fire_search_SpellScript);
-
         public:
             spell_mimiron_fire_search_SpellScript()
             {
@@ -1889,8 +1881,6 @@ class spell_mimiron_fire_search : public SpellScriptLoader
 // 64444 - Magnetic Core Summon
 class spell_mimiron_magnetic_core_summon : public SpellScript
 {
-    PrepareSpellScript(spell_mimiron_magnetic_core_summon);
-
     void ModDest(SpellDestination& dest)
     {
         Unit* caster = GetCaster();
@@ -1914,8 +1904,6 @@ class spell_mimiron_magnetic_core : public SpellScriptLoader
 
         class spell_mimiron_magnetic_core_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_magnetic_core_SpellScript);
-
             void FilterTargets(std::list<WorldObject*>& targets)
             {
                 targets.remove_if([](WorldObject* obj) { return obj->IsUnit() && (obj->ToUnit()->GetVehicleBase() || obj->ToUnit()->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE)); });
@@ -1934,8 +1922,6 @@ class spell_mimiron_magnetic_core : public SpellScriptLoader
 
         class spell_mimiron_magnetic_core_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mimiron_magnetic_core_AuraScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_MAGNETIC_CORE_VISUAL });
@@ -1987,8 +1973,6 @@ class spell_mimiron_napalm_shell : public SpellScriptLoader
 
         class spell_mimiron_napalm_shell_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_napalm_shell_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_NAPALM_SHELL, SPELL_NAPALM_SHELL_25 });
@@ -2036,8 +2020,6 @@ class spell_mimiron_plasma_blast : public SpellScriptLoader
 
         class spell_mimiron_plasma_blast_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_plasma_blast_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_PLASMA_BLAST });
@@ -2074,8 +2056,6 @@ class spell_mimiron_proximity_explosion : public SpellScriptLoader
 
         class spell_mimiron_proximity_explosion_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_proximity_explosion_SpellScript);
-
             void OnHit(SpellEffIndex /*effIndex*/)
             {
                 if (GetHitPlayer())
@@ -2110,8 +2090,6 @@ class spell_mimiron_proximity_mines : public SpellScriptLoader
 
         class spell_mimiron_proximity_mines_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_proximity_mines_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SUMMON_PROXIMITY_MINE });
@@ -2143,8 +2121,6 @@ class spell_mimiron_proximity_trigger : public SpellScriptLoader
 
         class spell_mimiron_proximity_trigger_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_proximity_trigger_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_PROXIMITY_MINE_EXPLOSION });
@@ -2184,8 +2160,6 @@ class spell_mimiron_rapid_burst : public SpellScriptLoader
 
         class spell_mimiron_rapid_burst_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mimiron_rapid_burst_AuraScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_RAPID_BURST_LEFT, SPELL_RAPID_BURST_RIGHT });
@@ -2224,8 +2198,6 @@ class spell_mimiron_rocket_strike : public SpellScriptLoader
 
         class spell_mimiron_rocket_strike_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_rocket_strike_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SCRIPT_EFFECT_ROCKET_STRIKE });
@@ -2273,8 +2245,6 @@ class spell_mimiron_rocket_strike_damage : public SpellScriptLoader
 
         class spell_mimiron_rocket_strike_damage_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_rocket_strike_damage_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_NOT_SO_FRIENDLY_FIRE });
@@ -2321,8 +2291,6 @@ class spell_mimiron_rocket_strike_target_select : public SpellScriptLoader
 
         class spell_mimiron_rocket_strike_target_select_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_rocket_strike_target_select_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SUMMON_ROCKET_STRIKE });
@@ -2373,8 +2341,6 @@ class spell_mimiron_self_repair : public SpellScriptLoader
 
         class spell_mimiron_self_repair_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_self_repair_SpellScript);
-
             void HandleScript()
             {
                 if (GetCaster()->GetAI())
@@ -2401,8 +2367,6 @@ class spell_mimiron_summon_assault_bot : public SpellScriptLoader
 
         class spell_mimiron_summon_assault_bot_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mimiron_summon_assault_bot_AuraScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SUMMON_ASSAULT_BOT });
@@ -2438,8 +2402,6 @@ class spell_mimiron_summon_assault_bot_target : public SpellScriptLoader
 
         class spell_mimiron_summon_assault_bot_target_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_summon_assault_bot_target_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SUMMON_ASSAULT_BOT_DUMMY });
@@ -2470,8 +2432,6 @@ class spell_mimiron_summon_fire_bot : public SpellScriptLoader
 
         class spell_mimiron_summon_fire_bot_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mimiron_summon_fire_bot_AuraScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SUMMON_FIRE_BOT });
@@ -2507,8 +2467,6 @@ class spell_mimiron_summon_fire_bot_target : public SpellScriptLoader
 
         class spell_mimiron_summon_fire_bot_target_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_summon_fire_bot_target_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SUMMON_FIRE_BOT_DUMMY });
@@ -2539,8 +2497,6 @@ class spell_mimiron_summon_flames_spread : public SpellScriptLoader
 
         class spell_mimiron_summon_flames_spread_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_summon_flames_spread_SpellScript);
-
             void FilterTargets(std::list<WorldObject*>& targets)
             {
                 if (targets.empty())
@@ -2576,8 +2532,6 @@ class spell_mimiron_summon_flames_spread : public SpellScriptLoader
 
         class spell_mimiron_summon_flames_spread_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mimiron_summon_flames_spread_AuraScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SUMMON_FLAMES_SPREAD });
@@ -2611,8 +2565,6 @@ class spell_mimiron_summon_frost_bomb_target : public SpellScriptLoader
 
         class spell_mimiron_summon_frost_bomb_target_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_summon_frost_bomb_target_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SUMMON_FROST_BOMB });
@@ -2660,8 +2612,6 @@ class spell_mimiron_summon_junk_bot : public SpellScriptLoader
 
         class spell_mimiron_summon_junk_bot_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mimiron_summon_junk_bot_AuraScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SUMMON_JUNK_BOT });
@@ -2697,8 +2647,6 @@ class spell_mimiron_summon_junk_bot_target : public SpellScriptLoader
 
         class spell_mimiron_summon_junk_bot_target_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mimiron_summon_junk_bot_target_SpellScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_SUMMON_JUNK_BOT_DUMMY });
@@ -2729,8 +2677,6 @@ class spell_mimiron_weld : public SpellScriptLoader
 
         class spell_mimiron_weld_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mimiron_weld_AuraScript);
-
             void HandleTick(AuraEffect const* aurEff)
             {
                 Unit* caster = GetTarget();
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
index 1df2ee350d6..619eddadea5 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
@@ -1584,8 +1584,6 @@ public:
    64021 - Flame Breath */
 class spell_razorscale_flame_breath : public SpellScript
 {
-    PrepareSpellScript(spell_razorscale_flame_breath);
-
     void CheckDamage()
     {
         Creature* target = GetHitCreature();
@@ -1620,8 +1618,6 @@ class spell_razorscale_flame_breath : public SpellScript
    63969 - Summon Iron Dwarves */
 class spell_razorscale_summon_iron_dwarves : public SpellScript
 {
-    PrepareSpellScript(spell_razorscale_summon_iron_dwarves);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -1661,8 +1657,6 @@ class spell_razorscale_summon_iron_dwarves : public SpellScript
 // 64821 - Fuse Armor
 class spell_razorscale_fuse_armor : public AuraScript
 {
-    PrepareAuraScript(spell_razorscale_fuse_armor);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FUSED_ARMOR });
@@ -1686,8 +1680,6 @@ class spell_razorscale_fuse_armor : public AuraScript
 // 62669 - Firebolt
 class spell_razorscale_firebolt : public SpellScript
 {
-    PrepareSpellScript(spell_razorscale_firebolt);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         targets.remove_if([](WorldObject* obj) { return obj->GetEntry() != NPC_RAZORSCALE_HARPOON_FIRE_STATE; });
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
index f4d3db39bf7..38145e95a6a 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
@@ -1676,8 +1676,6 @@ class spell_thorim_blizzard_effect : public SpellScriptLoader
 
         class spell_thorim_blizzard_effect_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_thorim_blizzard_effect_AuraScript);
-
             bool CheckAreaTarget(Unit* target)
             {
                 /// @todo: fix this for all dynobj auras
@@ -1717,8 +1715,6 @@ class spell_thorim_frostbolt_volley : public SpellScriptLoader
 
         class spell_thorim_frostbolt_volley_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_thorim_frostbolt_volley_SpellScript);
-
             void FilterTargets(std::list<WorldObject*>& targets)
             {
                 targets.remove_if([](WorldObject* object) -> bool
@@ -1753,8 +1749,6 @@ class spell_thorim_charge_orb : public SpellScriptLoader
 
         class spell_thorim_charge_orb_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_thorim_charge_orb_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_LIGHTNING_PILLAR_1 });
@@ -1799,8 +1793,6 @@ class spell_thorim_lightning_charge : public SpellScriptLoader
 
         class spell_thorim_lightning_charge_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_thorim_lightning_charge_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_LIGHTNING_CHARGE });
@@ -1839,8 +1831,6 @@ class spell_thorim_arena_leap : public SpellScriptLoader
 
         class spell_thorim_arena_leap_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_thorim_arena_leap_SpellScript);
-
             bool Load() override
             {
                 return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -1880,8 +1870,6 @@ class spell_thorim_stormhammer : public SpellScriptLoader
 
         class spell_thorim_stormhammer_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_thorim_stormhammer_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_STORMHAMMER_BOOMERANG, SPELL_DEAFENING_THUNDER });
@@ -1938,8 +1926,6 @@ class spell_thorim_stormhammer_sif : public SpellScriptLoader
 
         class spell_thorim_stormhammer_sif_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_thorim_stormhammer_sif_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_STORMHAMMER_BOOMERANG, SPELL_SIF_TRANSFORM });
@@ -1980,8 +1966,6 @@ class spell_thorim_stormhammer_boomerang : public SpellScriptLoader
 
         class spell_thorim_stormhammer_boomerang_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_thorim_stormhammer_boomerang_SpellScript);
-
             void RecoverHammer(SpellEffIndex /*effIndex*/)
             {
                 if (Unit* target = GetHitUnit())
@@ -2008,8 +1992,6 @@ class spell_thorim_runic_smash : public SpellScriptLoader
 
         class spell_thorim_runic_smash_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_thorim_runic_smash_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_RUNIC_SMASH });
@@ -2062,8 +2044,6 @@ class spell_thorim_activate_lightning_orb_periodic : public SpellScriptLoader
 
         class spell_thorim_activate_lightning_orb_periodic_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_thorim_activate_lightning_orb_periodic_AuraScript);
-
             InstanceScript* instance = nullptr;
 
             void PeriodicTick(AuraEffect const* /*aurEff*/)
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
index 01f68586df3..422e4283693 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp
@@ -669,8 +669,6 @@ private:
 // 63018, 65121 - Searing Light
 class spell_xt002_searing_light_spawn_life_spark : public AuraScript
 {
-    PrepareAuraScript(spell_xt002_searing_light_spawn_life_spark);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_LIFE_SPARK });
@@ -692,8 +690,6 @@ class spell_xt002_searing_light_spawn_life_spark : public AuraScript
 // 63024, 64234 - Gravity Bomb
 class spell_xt002_gravity_bomb_aura : public AuraScript
 {
-    PrepareAuraScript(spell_xt002_gravity_bomb_aura);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_VOID_ZONE });
@@ -727,8 +723,6 @@ class spell_xt002_gravity_bomb_aura : public AuraScript
 // 63025, 64233 - Gravity Bomb (Damage)
 class spell_xt002_gravity_bomb_damage : public SpellScript
 {
-    PrepareSpellScript(spell_xt002_gravity_bomb_damage);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         if (GetHitDamage() >= int32(GetHitUnit()->GetHealth()))
@@ -746,8 +740,6 @@ class spell_xt002_gravity_bomb_damage : public SpellScript
 // 62791 - XT-002 Heart Overload Trigger Spell (SERVERSIDE)
 class spell_xt002_heart_overload_periodic : public SpellScript
 {
-    PrepareSpellScript(spell_xt002_heart_overload_periodic);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo
@@ -792,8 +784,6 @@ class spell_xt002_heart_overload_periodic : public SpellScript
 // 62826 - Energy Orb
 class spell_xt002_energy_orb : public SpellScript
 {
-    PrepareSpellScript(spell_xt002_energy_orb);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo
@@ -831,8 +821,6 @@ class spell_xt002_energy_orb : public SpellScript
 // 62775 - Tympanic Tantrum
 class spell_xt002_tympanic_tantrum : public SpellScript
 {
-    PrepareSpellScript(spell_xt002_tympanic_tantrum);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         targets.remove_if([](WorldObject* object) -> bool
@@ -863,8 +851,6 @@ class spell_xt002_tympanic_tantrum : public SpellScript
 // 65032 - 321-Boombot Aura
 class spell_xt002_321_boombot_aura : public AuraScript
 {
-    PrepareAuraScript(spell_xt002_321_boombot_aura);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ACHIEVEMENT_CREDIT_NERF_SCRAPBOTS });
@@ -893,8 +879,6 @@ class spell_xt002_321_boombot_aura : public AuraScript
 // 63849 - Exposed Heart
 class spell_xt002_exposed_heart : public AuraScript
 {
-    PrepareAuraScript(spell_xt002_exposed_heart);
-
     bool Load() override
     {
         _damageAmount = 0;
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
index c4f1f0f037c..c73d7132a92 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
@@ -1970,8 +1970,6 @@ class spell_yogg_saron_target_selectors : public SpellScriptLoader    // 63744,
 
         class spell_yogg_saron_target_selectors_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_target_selectors_SpellScript);
-
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 if (Unit* target = GetHitUnit())
@@ -2029,8 +2027,6 @@ class spell_yogg_saron_psychosis : public SpellScriptLoader      // 63795, 65301
 
         class spell_yogg_saron_psychosis_SpellScript : public SanityReduction
         {
-            PrepareSpellScript(spell_yogg_saron_psychosis_SpellScript);
-
             bool Load() override
             {
                 _stacks = GetSpellInfo()->Id == SPELL_PSYCHOSIS ? 9 : 12;
@@ -2068,8 +2064,6 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader    // 63830
             public:
                 spell_yogg_saron_malady_of_the_mind_SpellScript() : SanityReduction(3) { }
 
-            PrepareSpellScript(spell_yogg_saron_malady_of_the_mind_SpellScript);
-
             void FilterTargets(std::list<WorldObject*>& targets)
             {
                 targets.remove_if(HighSanityTargetSelector());
@@ -2091,8 +2085,6 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader    // 63830
 
         class spell_yogg_saron_malady_of_the_mind_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_malady_of_the_mind_AuraScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_MALADY_OF_THE_MIND_JUMP });
@@ -2138,8 +2130,6 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader    // 63802
 
         class spell_yogg_saron_brain_link_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_brain_link_SpellScript);
-
             void FilterTargets(std::list<WorldObject*>& targets)
             {
                 targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_ILLUSION_ROOM));
@@ -2162,8 +2152,6 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader    // 63802
 
         class spell_yogg_saron_brain_link_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_brain_link_AuraScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_BRAIN_LINK_DAMAGE, SPELL_BRAIN_LINK_NO_DAMAGE });
@@ -2236,8 +2224,6 @@ class spell_yogg_saron_brain_link_damage : public SpellScriptLoader      // 6380
             public:
                 spell_yogg_saron_brain_link_damage_SpellScript() : SanityReduction(2) { }
 
-            PrepareSpellScript(spell_yogg_saron_brain_link_damage_SpellScript);
-
             void Register() override
             {
                 OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_brain_link_damage_SpellScript::RemoveSanity, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
@@ -2258,8 +2244,6 @@ class spell_yogg_saron_boil_ominously : public SpellScriptLoader    // 63030
 
         class spell_yogg_saron_boil_ominously_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_boil_ominously_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_SUMMON_GUARDIAN_1 });
@@ -2297,8 +2281,6 @@ class spell_yogg_saron_shadow_beacon : public SpellScriptLoader     // 64465
 
         class spell_yogg_saron_shadow_beacon_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_shadow_beacon_AuraScript);
-
             void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
                 if (Creature* target = GetTarget()->ToCreature())
@@ -2332,8 +2314,6 @@ class spell_yogg_saron_empowering_shadows_range_check : public SpellScriptLoader
 
         class spell_yogg_saron_empowering_shadows_range_check_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_empowering_shadows_range_check_SpellScript);
-
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 if (Unit* target = GetHitUnit())
@@ -2360,8 +2340,6 @@ class spell_yogg_saron_empowering_shadows_missile : public SpellScriptLoader
 
         class spell_yogg_saron_empowering_shadows_missile_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_empowering_shadows_missile_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_EMPOWERING_SHADOWS });
@@ -2394,8 +2372,6 @@ class spell_yogg_saron_constrictor_tentacle : public SpellScriptLoader     // 64
 
         class spell_yogg_saron_constrictor_tentacle_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_constrictor_tentacle_AuraScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_CONSTRICTOR_TENTACLE_SUMMON });
@@ -2426,8 +2402,6 @@ class spell_yogg_saron_lunge : public SpellScriptLoader    // 64131
 
         class spell_yogg_saron_lunge_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_lunge_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_SQUEEZE_10, SPELL_SQUEEZE_25 });
@@ -2466,8 +2440,6 @@ class spell_yogg_saron_squeeze : public SpellScriptLoader     // 64125, 64126
 
         class spell_yogg_saron_squeeze_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_squeeze_AuraScript);
-
             void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
             {
                 if (Unit* vehicle = GetTarget()->GetVehicleBase())
@@ -2495,8 +2467,6 @@ class spell_yogg_saron_diminsh_power : public SpellScriptLoader     // 64148
 
         class spell_yogg_saron_diminsh_power_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_diminsh_power_AuraScript);
-
             void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
             {
                 PreventDefaultAction();
@@ -2526,8 +2496,6 @@ class spell_yogg_saron_empowered : public SpellScriptLoader     // 64161
 
         class spell_yogg_saron_empowered_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_empowered_AuraScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_EMPOWERED_BUFF, SPELL_WEAKENED });
@@ -2578,8 +2546,6 @@ class spell_yogg_saron_match_health : public SpellScriptLoader    // 64069
 
         class spell_yogg_saron_match_health_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_match_health_SpellScript);
-
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 if (Unit* target = GetHitUnit())
@@ -2606,8 +2572,6 @@ class spell_yogg_saron_shattered_illusion : public SpellScriptLoader    // 65238
 
         class spell_yogg_saron_shattered_illusion_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_shattered_illusion_SpellScript);
-
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 if (Unit* target = GetHitUnit())
@@ -2634,8 +2598,6 @@ class spell_yogg_saron_death_ray_warning_visual : public SpellScriptLoader     /
 
         class spell_yogg_saron_death_ray_warning_visual_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_death_ray_warning_visual_AuraScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_DEATH_RAY_PERIODIC, SPELL_DEATH_RAY_DAMAGE_VISUAL });
@@ -2672,8 +2634,6 @@ class spell_yogg_saron_cancel_illusion_room_aura : public SpellScriptLoader    /
 
         class spell_yogg_saron_cancel_illusion_room_aura_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_cancel_illusion_room_aura_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_TELEPORT_BACK_TO_MAIN_ROOM });
@@ -2708,8 +2668,6 @@ class spell_yogg_saron_nondescript : public SpellScriptLoader     // 64010, 6401
 
         class spell_yogg_saron_nondescript_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_nondescript_AuraScript);
-
             void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
             {
                 GetTarget()->CastSpell(GetTarget(), uint32(aurEff->GetAmount()), true);
@@ -2735,8 +2693,6 @@ class spell_yogg_saron_revealed_tentacle : public SpellScriptLoader    // 64012
 
         class spell_yogg_saron_revealed_tentacle_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_revealed_tentacle_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_TENTACLE_VOID_ZONE, SPELL_GRIM_REPRISAL });
@@ -2772,8 +2728,6 @@ class spell_yogg_saron_grim_reprisal : public SpellScriptLoader     // 63305
 
         class spell_yogg_saron_grim_reprisal_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_grim_reprisal_AuraScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_GRIM_REPRISAL_DAMAGE });
@@ -2811,8 +2765,6 @@ class spell_yogg_saron_induce_madness : public SpellScriptLoader    // 64059
 
         class spell_yogg_saron_induce_madness_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_induce_madness_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_TELEPORT_BACK_TO_MAIN_ROOM, SPELL_SHATTERED_ILLUSION_REMOVE });
@@ -2858,8 +2810,6 @@ class spell_yogg_saron_sanity : public SpellScriptLoader     // 63050
 
         class spell_yogg_saron_sanity_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_sanity_SpellScript);
-
             // don't target players outside of room or handle it in SPELL_INSANE_PERIODIC?
 
             void ModSanityStacks()
@@ -2875,8 +2825,6 @@ class spell_yogg_saron_sanity : public SpellScriptLoader     // 63050
 
         class spell_yogg_saron_sanity_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_sanity_AuraScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_LOW_SANITY_SCREEN_EFFECT, SPELL_INSANE, SPELL_SANITY_WELL, SPELL_BRAIN_LINK });
@@ -2931,8 +2879,6 @@ class spell_yogg_saron_insane : public SpellScriptLoader     // 63120
 
         class spell_yogg_saron_insane_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_insane_AuraScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_INSANE_VISUAL });
@@ -2974,8 +2920,6 @@ class spell_yogg_saron_insane_periodic : public SpellScriptLoader    // 64555
 
         class spell_yogg_saron_insane_periodic_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_insane_periodic_SpellScript);
-
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 if (Unit* target = GetHitUnit())
@@ -3016,8 +2960,6 @@ class spell_yogg_saron_lunatic_gaze : public SpellScriptLoader      // 64164, 64
 
         class spell_yogg_saron_lunatic_gaze_SpellScript : public SanityReduction
         {
-            PrepareSpellScript(spell_yogg_saron_lunatic_gaze_SpellScript);
-
             bool Load() override
             {
                 _stacks = GetSpellInfo()->Id == SPELL_LUNATIC_GAZE_DAMAGE ? 4 : 2;
@@ -3054,8 +2996,6 @@ class spell_yogg_saron_keeper_aura : public SpellScriptLoader     // 62650, 6267
 
         class spell_yogg_saron_keeper_aura_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_keeper_aura_AuraScript);
-
             bool CanApply(Unit* target)
             {
                 if (target->GetTypeId() != TYPEID_PLAYER && target != GetCaster())
@@ -3083,8 +3023,6 @@ class spell_yogg_saron_in_the_maws_of_the_old_god : public SpellScriptLoader
 
         class spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript);
-
             SpellCastResult CheckRequirement()
             {
                 if (InstanceScript* instance = GetCaster()->GetInstanceScript())
@@ -3124,8 +3062,6 @@ class spell_yogg_saron_titanic_storm : public SpellScriptLoader    // 64172
 
         class spell_yogg_saron_titanic_storm_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_yogg_saron_titanic_storm_SpellScript);
-
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 if (Unit* target = GetHitUnit())
@@ -3152,8 +3088,6 @@ class spell_yogg_saron_hodirs_protective_gaze : public SpellScriptLoader     //
 
         class spell_yogg_saron_hodirs_protective_gaze_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_yogg_saron_hodirs_protective_gaze_AuraScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_FLASH_FREEZE });
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
index 6a01f6e86ab..ea28a6ee936 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp
@@ -24,8 +24,6 @@
 // 61906 - Random Aggro Periodic (5 sec)
 class spell_ulduar_random_aggro_periodic : public AuraScript
 {
-    PrepareAuraScript(spell_ulduar_random_aggro_periodic);
-
     void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
     {
         Unit* target = GetTarget();
@@ -55,8 +53,6 @@ class spell_ulduar_random_aggro_periodic : public AuraScript
 // 65042 - Prison of Yogg-Saron Teleport
 class spell_ulduar_teleporter : public SpellScript
 {
-    PrepareSpellScript(spell_ulduar_teleporter);
-
     SpellCastResult CheckRequirement()
     {
         if (GetExplTargetUnit()->GetTypeId() != TYPEID_PLAYER)
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
index 72db7a72bea..df36779cace 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
@@ -379,8 +379,6 @@ struct npc_ingvar_throw_dummy : public ScriptedAI
 // 42912 - Summon Banshee
 class spell_ingvar_summon_banshee : public SpellScript
 {
-    PrepareSpellScript(spell_ingvar_summon_banshee);
-
     void SetDest(SpellDestination& dest)
     {
         dest.RelocateOffset({ 0.0f, 0.0f, 30.0f, 0.0f });
@@ -395,8 +393,6 @@ class spell_ingvar_summon_banshee : public SpellScript
 // 42730, 59735 - Woe Strike
 class spell_ingvar_woe_strike : public AuraScript
 {
-    PrepareAuraScript(spell_ingvar_woe_strike);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_WOE_STRIKE_EFFECT });
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
index a3589c74d7f..871499ca53e 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
@@ -308,8 +308,6 @@ private:
 // 48400 - Frost Tomb
 class spell_frost_tomb : public AuraScript
 {
-    PrepareAuraScript(spell_frost_tomb);
-
     void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_DEATH)
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
index fdf9757ec09..3e6103542a4 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
@@ -114,8 +114,6 @@ enum Fixate
 // 40414 - Fixate
 class spell_fixate : public SpellScript
 {
-    PrepareSpellScript(spell_fixate);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FIXATE_TRIGGER });
@@ -140,8 +138,6 @@ enum SecondWind
 // 42770 - Second Wind
 class spell_uk_second_wind : public AuraScript
 {
-    PrepareAuraScript(spell_uk_second_wind);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SECOND_WIND_TRIGGER });
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
index 2d044443a80..9d0b962d40a 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
@@ -524,8 +524,6 @@ struct go_palehoof_sphere : public GameObjectAI
 // 48139 - Crazed
 class spell_palehoof_crazed : public AuraScript
 {
-    PrepareAuraScript(spell_palehoof_crazed);
-
     void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         GetTarget()->RemoveAurasDueToSpell(SPELL_CRAZED_TAUNT);
@@ -540,8 +538,6 @@ class spell_palehoof_crazed : public AuraScript
 // 48146 - Crazed
 class spell_palehoof_crazed_effect : public SpellScript
 {
-    PrepareSpellScript(spell_palehoof_crazed_effect);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_CRAZED_TAUNT });
@@ -561,8 +557,6 @@ class spell_palehoof_crazed_effect : public SpellScript
 // 47669 - Awaken Subboss
 class spell_palehoof_awaken_subboss : public SpellScript
 {
-    PrepareSpellScript(spell_palehoof_awaken_subboss);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ORB_CHANNEL });
@@ -585,8 +579,6 @@ class spell_palehoof_awaken_subboss : public SpellScript
 // 47670 - Awaken Gortok
 class spell_palehoof_awaken_gortok : public SpellScript
 {
-    PrepareSpellScript(spell_palehoof_awaken_gortok);
-
     void HandleDummy(SpellEffIndex /*effIndex*/)
     {
         Unit* target = GetHitUnit();
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 295e6216169..93562e43267 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -580,8 +580,6 @@ struct npc_ymirjar_harpooner : public npc_skadi_trashAI
 // 47594 - Freezing Cloud
 class spell_freezing_cloud_area_right : public SpellScript
 {
-    PrepareSpellScript(spell_freezing_cloud_area_right);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_FREEZING_CLOUD });
@@ -607,8 +605,6 @@ class spell_freezing_cloud_area_right : public SpellScript
 // 47574 - Freezing Cloud
 class spell_freezing_cloud_area_left : public SpellScript
 {
-    PrepareSpellScript(spell_freezing_cloud_area_left);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_FREEZING_CLOUD });
@@ -634,8 +630,6 @@ class spell_freezing_cloud_area_left : public SpellScript
 // 47579, 60020 - Freezing Cloud
 class spell_freezing_cloud_damage : public AuraScript
 {
-    PrepareAuraScript(spell_freezing_cloud_damage);
-
     bool CanBeAppliedOn(Unit* target)
     {
         if (Aura* aur = target->GetAura(GetId()))
@@ -654,8 +648,6 @@ class spell_freezing_cloud_damage : public AuraScript
 // 49308 - Utgarde Pinnacle Guantlet Reset Check
 class spell_skadi_reset_check : public SpellScript
 {
-    PrepareSpellScript(spell_skadi_reset_check);
-
     void CountTargets(std::list<WorldObject*>& targets)
     {
         targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_UTGARDE_PINNACLE_GAUNTLET_EFFECT));
@@ -689,8 +681,6 @@ private:
 // 48642 - Launch Harpoon
 class spell_skadi_launch_harpoon : public SpellScript
 {
-    PrepareSpellScript(spell_skadi_launch_harpoon);
-
     void FilterTargets(std::list<WorldObject*>& targets)
     {
         if (targets.size() >= 2)
@@ -713,8 +703,6 @@ class spell_skadi_launch_harpoon : public SpellScript
 // 50255, 59331 - Poisoned Spear
 class spell_skadi_poisoned_spear : public SpellScript
 {
-    PrepareSpellScript(spell_skadi_poisoned_spear);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_POISONED_SPEAR_PERIODIC });
@@ -734,8 +722,6 @@ class spell_skadi_poisoned_spear : public SpellScript
 // 61791 - Ride Vehicle
 class spell_skadi_ride_vehicle : public AuraScript
 {
-    PrepareAuraScript(spell_skadi_ride_vehicle);
-
     void OnRemoveVehicle(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         PreventDefaultAction();
@@ -756,8 +742,6 @@ class spell_skadi_ride_vehicle : public AuraScript
 // 59275 - Summon Gauntlet Mobs Periodic
 class spell_summon_gauntlet_mobs_periodic : public AuraScript
 {
-    PrepareAuraScript(spell_summon_gauntlet_mobs_periodic);
-
     void CastTheNextTwoSpells()
     {
         for (uint8 i = 0; i < 2; ++i)
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index 4f3fa489b43..00b32535e3e 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -468,8 +468,6 @@ class RitualTargetCheck
 // 48278 - Paralyze
 class spell_paralyze_pinnacle : public SpellScript
 {
-    PrepareSpellScript(spell_paralyze_pinnacle);
-
     void FilterTargets(std::list<WorldObject*>& unitList)
     {
         unitList.remove_if(RitualTargetCheck());
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
index ed4e27691e0..4e52371e2bc 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp
@@ -305,8 +305,6 @@ private:
 // 48292 - Dark Slash
 class spell_dark_slash : public SpellScript
 {
-    PrepareSpellScript(spell_dark_slash);
-
     void CalculateDamage()
     {
         // Slashes the target with darkness, dealing damage equal to half the target's current health.
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp
index 9047eca63f6..18cb2f092ae 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp
@@ -32,8 +32,6 @@ enum UtgardeSpells
 // 59237 - Beast's Mark
 class spell_utgarde_pinnacle_beast_mark : public AuraScript
 {
-    PrepareAuraScript(spell_utgarde_pinnacle_beast_mark);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_BEAST_MARK_DAMAGE_N, SPELL_BEAST_MARK_DAMAGE_H });
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
index c23a1f49435..8373f5faefa 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp
@@ -117,8 +117,6 @@ struct boss_archavon : public BossAI
 // 58941 - Rock Shards
 class spell_archavon_rock_shards : public SpellScript
 {
-    PrepareSpellScript(spell_archavon_rock_shards);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
index 7ba269e920a..851700b1b39 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp
@@ -102,8 +102,6 @@ struct boss_koralon : public BossAI
 // 66725, 68161 - Meteor Fists
 class spell_koralon_meteor_fists : public AuraScript
 {
-    PrepareAuraScript(spell_koralon_meteor_fists);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_METEOR_FISTS_DAMAGE });
@@ -125,8 +123,6 @@ class spell_koralon_meteor_fists : public AuraScript
 // 66809, 67331 - Meteor Fists
 class spell_koralon_meteor_fists_damage : public SpellScript
 {
-    PrepareSpellScript(spell_koralon_meteor_fists_damage);
-
 public:
     spell_koralon_meteor_fists_damage()
     {
@@ -158,8 +154,6 @@ private:
 // 66808, 68160 - Meteor Fists
 class spell_flame_warder_meteor_fists : public AuraScript
 {
-    PrepareAuraScript(spell_flame_warder_meteor_fists);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FW_METEOR_FISTS_DAMAGE });
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
index 6ed3c203e5e..4c14f24e3e1 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp
@@ -137,8 +137,6 @@ struct npc_frozen_orb : public ScriptedAI
 // 46523 - Random Aggro
 class spell_toravon_random_aggro : public SpellScript
 {
-    PrepareSpellScript(spell_toravon_random_aggro);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
index 04eaa2fe6a8..3fa94370f6a 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
@@ -136,8 +136,6 @@ class achievement_defenseless : public AchievementCriteriaScript
 // 58694 - Arcane Vacuum
 class spell_cyanigosa_arcane_vacuum : public SpellScript
 {
-    PrepareSpellScript(spell_cyanigosa_arcane_vacuum);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_PLAYER });
diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
index ce81b58899a..c162e65c498 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
@@ -282,8 +282,6 @@ private:
 // 59820 - Drained
 class spell_ichoron_drained : public AuraScript
 {
-    PrepareAuraScript(spell_ichoron_drained);
-
     bool Load() override
     {
         return GetOwner()->GetEntry() == NPC_ICHORON || GetOwner()->GetEntry() == NPC_DUMMY_ICHORON;
@@ -315,8 +313,6 @@ class spell_ichoron_drained : public AuraScript
 // 54269 - Merge
 class spell_ichoron_merge : public SpellScript
 {
-    PrepareSpellScript(spell_ichoron_merge);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SHRINK });
@@ -342,8 +338,6 @@ class spell_ichoron_merge : public SpellScript
 // 54306 - Protective Bubble
 class spell_ichoron_protective_bubble : public AuraScript
 {
-    PrepareAuraScript(spell_ichoron_protective_bubble);
-
     bool Load() override
     {
         return GetOwner()->GetEntry() == NPC_ICHORON || GetOwner()->GetEntry() == NPC_DUMMY_ICHORON;
@@ -366,8 +360,6 @@ class spell_ichoron_protective_bubble : public AuraScript
 // 54259 - Splatter
 class spell_ichoron_splatter : public AuraScript
 {
-    PrepareAuraScript(spell_ichoron_splatter);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
index 0401dd9de2b..b8afac4505a 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp
@@ -92,8 +92,6 @@ struct boss_moragg : public BossAI
 // 54442, 59524 - Ray of Suffering
 class spell_moragg_ray : public AuraScript
 {
-    PrepareAuraScript(spell_moragg_ray);
-
     void OnPeriodic(AuraEffect const* aurEff)
     {
         PreventDefaultAction();
@@ -115,8 +113,6 @@ class spell_moragg_ray : public AuraScript
 // 54396 - Optic Link
 class spell_moragg_optic_link : public AuraScript
 {
-    PrepareAuraScript(spell_moragg_optic_link);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
index 96764dce6a2..65499d61b49 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
@@ -234,8 +234,6 @@ private:
 // 54164 - Summon Players
 class spell_xevozz_summon_players : public SpellScript
 {
-    PrepareSpellScript(spell_xevozz_summon_players);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MAGIC_PULL });
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index a5d59677f25..626042068f5 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -1205,8 +1205,6 @@ struct go_activation_crystal : public GameObjectAI
 // 58040 - Destroy Door Seal
 class spell_violet_hold_destroy_door_seal : public AuraScript
 {
-    PrepareAuraScript(spell_violet_hold_destroy_door_seal);
-
     bool Load() override
     {
         _instance = GetUnitOwner()->GetInstanceScript();
@@ -1232,8 +1230,6 @@ private:
 // 58008 - Portal Periodic
 class spell_violet_hold_portal_periodic : public AuraScript
 {
-    PrepareAuraScript(spell_violet_hold_portal_periodic);
-
     void PeriodicTick(AuraEffect const* aurEff)
     {
         PreventDefaultAction();
@@ -1250,8 +1246,6 @@ class spell_violet_hold_portal_periodic : public AuraScript
 // 62138 - Teleport to Inside Violet Hold
 class spell_violet_hold_teleport_player : public SpellScript
 {
-    PrepareSpellScript(spell_violet_hold_teleport_player);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_TELEPORT_PLAYER_EFFECT });
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index c36f84ee111..ef6846d7882 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -157,8 +157,6 @@ struct npc_captured_beryl_sorcerer : public FollowerAI
 // Spell 45625: - Arcane Chains: Character Force Cast
 class spell_arcane_chains_character_force_cast : public SpellScript
 {
-    PrepareSpellScript(spell_arcane_chains_character_force_cast);
-
     void HandleScriptEffect(SpellEffIndex /* effIndex */)
     {
         GetHitUnit()->CastSpell(GetCaster(), SPELL_ARCANE_CHAINS_SUMMON_CHAINED_MAGE_HUNTER); // Player cast back 45626 on npc
@@ -425,8 +423,6 @@ enum red_dragonblood
 // 46620 - Red Dragonblood
 class spell_red_dragonblood : public AuraScript
 {
-    PrepareAuraScript(spell_red_dragonblood);
-
     void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE || !GetCaster())
@@ -1253,8 +1249,6 @@ enum WindsoulTotemAura
 // 46374 - Windsoul Totem Aura
 class spell_windsoul_totem_aura : public AuraScript
 {
-    PrepareAuraScript(spell_windsoul_totem_aura);
-
     void OnRemove(AuraEffect const*, AuraEffectHandleModes)
     {
         if (GetTarget()->isDead())
@@ -1279,8 +1273,6 @@ enum BloodsporeRuination
 // 45997 - Bloodspore Ruination
 class spell_q11719_bloodspore_ruination_45997 : public SpellScript
 {
-    PrepareSpellScript(spell_q11719_bloodspore_ruination_45997);
-
     void HandleEffect(SpellEffIndex /*effIndex*/)
     {
         if (Unit* caster = GetCaster())
@@ -1367,8 +1359,6 @@ enum ShorteningBlaster
 // 45668 - Crafty's Ultra-Advanced Proto-Typical Shortening Blaster
 class spell_q11653_shortening_blaster : public SpellScript
 {
-    PrepareSpellScript(spell_q11653_shortening_blaster);
-
     void HandleScript(SpellEffIndex /* effIndex */)
     {
         Unit* caster = GetCaster();
@@ -1410,8 +1400,6 @@ std::array<uint32, 3> const CocoonSummonSpells =
 // 45516 - Nerub'ar Web Random Unit (Not On Quest, Script Effect)
 class spell_borean_tundra_nerubar_web_random_unit_not_on_quest : public SpellScript
 {
-    PrepareSpellScript(spell_borean_tundra_nerubar_web_random_unit_not_on_quest);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
@@ -1431,8 +1419,6 @@ class spell_borean_tundra_nerubar_web_random_unit_not_on_quest : public SpellScr
 // 45515 - Nerub'ar Web Random Unit (Not On Quest, Dummy)
 class spell_borean_tundra_nerubar_web_random_unit_not_on_quest_dummy : public SpellScript
 {
-    PrepareSpellScript(spell_borean_tundra_nerubar_web_random_unit_not_on_quest_dummy);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(CocoonSummonSpells) && ValidateSpellInfo({ SPELL_FREED_SOLDIER_DEBUFF });
@@ -1457,8 +1443,6 @@ class spell_borean_tundra_nerubar_web_random_unit_not_on_quest_dummy : public Sp
 // 45535 - Nerub'ar Web Random Unit (On Quest, Dummy)
 class spell_borean_tundra_nerubar_web_random_unit_on_quest_dummy : public SpellScript
 {
-    PrepareSpellScript(spell_borean_tundra_nerubar_web_random_unit_on_quest_dummy);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(CocoonSummonSpells) && ValidateSpellInfo({ SPELL_FREED_SOLDIER_DEBUFF, SPELL_FREED_WARSONG_PEON });
@@ -1485,8 +1469,6 @@ class spell_borean_tundra_nerubar_web_random_unit_on_quest_dummy : public SpellS
 // 45522 - Dispel Freed Soldier Debuff
 class spell_borean_tundra_dispel_freed_soldier_debuff : public SpellScript
 {
-    PrepareSpellScript(spell_borean_tundra_dispel_freed_soldier_debuff);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
@@ -1522,8 +1504,6 @@ enum BringEmBackAlive
 // 45877 - Deliver Kodo
 class spell_borean_tundra_deliver_kodo : public SpellScript
 {
-    PrepareSpellScript(spell_borean_tundra_deliver_kodo);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_KODO_DELIVERED });
@@ -1544,8 +1524,6 @@ class spell_borean_tundra_deliver_kodo : public SpellScript
 // 48204 - Kodo Delivered
 class spell_borean_tundra_kodo_delivered : public SpellScript
 {
-    PrepareSpellScript(spell_borean_tundra_kodo_delivered);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return sBroadcastTextStore.HasRecord(TEXT_DELIVERED_1) &&
@@ -1600,8 +1578,6 @@ enum TheArtOfPersuasion
 // 45634 - Neural Needle
 class spell_borean_tundra_neural_needle : public SpellScript
 {
-    PrepareSpellScript(spell_borean_tundra_neural_needle);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_NEURAL_NEEDLE_IMPACT });
@@ -1654,8 +1630,6 @@ class spell_borean_tundra_neural_needle : public SpellScript
 // 48252 - Prototype Neural Needle
 class spell_borean_tundra_prototype_neural_needle : public SpellScript
 {
-    PrepareSpellScript(spell_borean_tundra_prototype_neural_needle);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_PROTOTYPE_NEURAL_NEEDLE_IMPACT });
@@ -1712,8 +1686,6 @@ enum PrisonBreak
 // 45449 - Arcane Prisoner Rescue
 class spell_borean_tundra_arcane_prisoner_rescue : public SpellScript
 {
-    PrepareSpellScript(spell_borean_tundra_arcane_prisoner_rescue);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_ARCANE_PRISONER_1, SPELL_SUMMON_ARCANE_PRISONER_2 });
diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp
index 6c6b1408bc3..d66b74dfb1e 100644
--- a/src/server/scripts/Northrend/zone_dragonblight.cpp
+++ b/src/server/scripts/Northrend/zone_dragonblight.cpp
@@ -379,8 +379,6 @@ enum StrengthenAncientsMisc
 // 47575 - Strengthen the Ancients: On Interact Dummy to Woodlands Walker
 class spell_q12096_q12092_dummy : public SpellScript
 {
-    PrepareSpellScript(spell_q12096_q12092_dummy);
-
     void HandleDummy(SpellEffIndex /*effIndex*/)
     {
         uint32 roll = rand32() % 2;
@@ -416,8 +414,6 @@ class spell_q12096_q12092_dummy : public SpellScript
 // 47530 - Bark of the Walkers
 class spell_q12096_q12092_bark : public SpellScript
 {
-    PrepareSpellScript(spell_q12096_q12092_bark);
-
     void HandleDummy(SpellEffIndex /*effIndex*/)
     {
         Creature* lothalor = GetHitCreature();
@@ -564,8 +560,6 @@ enum WarsongBattleStandard
 // 47304 - Warsong Battle Standard
 class spell_dragonblight_warsong_battle_standard : public SpellScript
 {
-    PrepareSpellScript(spell_dragonblight_warsong_battle_standard);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return sBroadcastTextStore.HasRecord(TEXT_TAUNT_1) &&
@@ -601,8 +595,6 @@ enum MysteryOfTheInfinite
 // 49686 - Mystery of the Infinite: Script Effect Player Cast Mirror Image
 class spell_dragonblight_moti_mirror_image_script_effect : public SpellScript
 {
-    PrepareSpellScript(spell_dragonblight_moti_mirror_image_script_effect);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MIRROR_IMAGE_AURA });
@@ -622,8 +614,6 @@ class spell_dragonblight_moti_mirror_image_script_effect : public SpellScript
 // 50020 - Mystery of the Infinite: Hourglass cast See Invis on Master
 class spell_dragonblight_moti_hourglass_cast_see_invis_on_master : public SpellScript
 {
-    PrepareSpellScript(spell_dragonblight_moti_hourglass_cast_see_invis_on_master);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
@@ -656,8 +646,6 @@ enum TheChainGunAndYou
 // 49550 - Call Out Injured Soldier
 class spell_dragonblight_call_out_injured_soldier : public SpellScript
 {
-    PrepareSpellScript(spell_dragonblight_call_out_injured_soldier);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return sBroadcastTextStore.HasRecord(TEXT_CALL_OUT_1) && sBroadcastTextStore.HasRecord(TEXT_CALL_OUT_2);
@@ -696,8 +684,6 @@ enum TortureTheTorturer
 // 48603 - High Executor's Branding Iron
 class spell_dragonblight_high_executor_branding_iron : public SpellScript
 {
-    PrepareSpellScript(spell_dragonblight_high_executor_branding_iron);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_TORTURER_KILL_CREDIT, SPELL_BRANDING_IRON_IMPACT });
@@ -759,8 +745,6 @@ enum ThePerfectDissemblance
 // 48692 - The Perfect Dissemblance: Quest Completion Script
 class spell_dragonblight_cancel_banshees_magic_mirror : public SpellScript
 {
-    PrepareSpellScript(spell_dragonblight_cancel_banshees_magic_mirror);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_BANSHEES_MAGIC_MIRROR });
@@ -790,8 +774,6 @@ enum AFallFromGrace
 // 48762 - A Fall from Grace: Scarlet Raven Priest Image - Master
 class spell_dragonblight_scarlet_raven_priest_image_master : public SpellScript
 {
-    PrepareSpellScript(spell_dragonblight_scarlet_raven_priest_image_master);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_PRIEST_IMAGE_FEMALE, SPELL_PRIEST_IMAGE_MALE });
@@ -812,8 +794,6 @@ class spell_dragonblight_scarlet_raven_priest_image_master : public SpellScript
 // 48769 - A Fall from Grace: Quest Completion Script
 class spell_dragonblight_cancel_scarlet_raven_priest_image : public SpellScript
 {
-    PrepareSpellScript(spell_dragonblight_cancel_scarlet_raven_priest_image);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_PRIEST_IMAGE_FEMALE, SPELL_PRIEST_IMAGE_MALE });
@@ -847,8 +827,6 @@ enum BombardTheBallistae
 // 48347 - Bombard the Ballistae: FX Master
 class spell_dragonblight_bombard_the_ballistae_fx_master : public SpellScript
 {
-    PrepareSpellScript(spell_dragonblight_bombard_the_ballistae_fx_master);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -896,8 +874,6 @@ enum ProjectionsAndPlans
 // 47097 - Surge Needle Teleporter
 class spell_dragonblight_surge_needle_teleporter : public SpellScript
 {
-    PrepareSpellScript(spell_dragonblight_surge_needle_teleporter);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_TELE_MOONREST_GARDENS, SPELL_TELE_SURGE_NEEDLE });
@@ -934,8 +910,6 @@ class spell_dragonblight_surge_needle_teleporter : public SpellScript
 // 50252 - Blood Draw
 class spell_dragonblight_fill_blood_unholy_frost_gem : public SpellScript
 {
-    PrepareSpellScript(spell_dragonblight_fill_blood_unholy_frost_gem);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
@@ -955,8 +929,6 @@ class spell_dragonblight_fill_blood_unholy_frost_gem : public SpellScript
 // 47447 - Corrosive Spit
 class spell_dragonblight_corrosive_spit : public AuraScript
 {
-    PrepareAuraScript(spell_dragonblight_corrosive_spit);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
index 8885426c44a..2b22cf699c3 100644
--- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp
@@ -712,8 +712,6 @@ enum ShredderDelivery
 
 class spell_shredder_delivery : public SpellScript
 {
-    PrepareSpellScript(spell_shredder_delivery);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -740,8 +738,6 @@ enum InfectedWorgenBite
 // 53094 - Infected Worgen Bite
 class spell_infected_worgen_bite : public AuraScript
 {
-    PrepareAuraScript(spell_infected_worgen_bite);
-
     void HandleAfterEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         Unit* target = GetTarget();
@@ -838,8 +834,6 @@ enum WarheadSpells
 // 49107 - Vehicle: Warhead Fuse
 class spell_vehicle_warhead_fuse : public SpellScript
 {
-    PrepareSpellScript(spell_vehicle_warhead_fuse);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_WARHEAD_Z_CHECK, SPELL_WARHEAD_SEEKING_LUMBERSHIP, SPELL_WARHEAD_FUSE });
@@ -869,8 +863,6 @@ enum WarheadDenonate
 // 49250 - Detonate
 class spell_warhead_detonate : public SpellScript
 {
-    PrepareSpellScript(spell_warhead_detonate);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_PARACHUTE, SPELL_TORPEDO_EXPLOSION });
@@ -904,8 +896,6 @@ class spell_warhead_detonate : public SpellScript
 // 61678 - Z Check
 class spell_z_check : public AuraScript
 {
-    PrepareAuraScript(spell_z_check);
-
 public:
     spell_z_check()
     {
@@ -939,8 +929,6 @@ private:
 // 49181 - Warhead Fuse
 class spell_warhead_fuse : public AuraScript
 {
-    PrepareAuraScript(spell_warhead_fuse);
-
     void HandleOnEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (Unit* rocketUnit = GetTarget()->GetVehicleBase())
diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp
index 8c9ada59842..89ebec5526c 100644
--- a/src/server/scripts/Northrend/zone_howling_fjord.cpp
+++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp
@@ -219,8 +219,6 @@ enum SomeAssemblyRequired
 // 43393 - Ping Master
 class spell_fjord_mindless_abomination_ping_master : public SpellScript
 {
-    PrepareSpellScript(spell_fjord_mindless_abomination_ping_master);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MINDLESS_ABOMINATION_CONTROL });
@@ -240,8 +238,6 @@ class spell_fjord_mindless_abomination_ping_master : public SpellScript
 // 42268 - Quest - Mindless Abomination Explosion FX Master
 class spell_fjord_mindless_abomination_explosion_fx_master : public SpellScript
 {
-    PrepareSpellScript(spell_fjord_mindless_abomination_explosion_fx_master);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -310,8 +306,6 @@ std::array<uint32, 11> const CocoonSummonSpells =
 // 43288 - Rivenwood Captives: Player Not On Quest
 class spell_fjord_rivenwood_captives_not_on_quest : public SpellScript
 {
-    PrepareSpellScript(spell_fjord_rivenwood_captives_not_on_quest);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(CocoonSummonSpells);
@@ -331,8 +325,6 @@ class spell_fjord_rivenwood_captives_not_on_quest : public SpellScript
 // 43287 - Rivenwood Captives: Player On Quest
 class spell_fjord_rivenwood_captives_on_quest : public SpellScript
 {
-    PrepareSpellScript(spell_fjord_rivenwood_captives_on_quest);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(CocoonSummonSpells) && ValidateSpellInfo({ SPELL_SUMMON_FREED_MIST_WHISPER_SCOUT });
@@ -373,8 +365,6 @@ enum TheCleansing
 // 43365 - The Cleansing: Shrine Cast
 class spell_fjord_the_cleansing_shrine_cast : public SpellScript
 {
-    PrepareSpellScript(spell_fjord_the_cleansing_shrine_cast);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_RECENT_MEDITATION, SPELL_CLEANSING_SOUL }) &&
@@ -412,8 +402,6 @@ class spell_fjord_the_cleansing_shrine_cast : public SpellScript
 // 43351 - Cleansing Soul
 class spell_fjord_the_cleansing_cleansing_soul : public AuraScript
 {
-    PrepareAuraScript(spell_fjord_the_cleansing_cleansing_soul);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_INNER_TURMOIL, SPELL_RECENT_MEDITATION });
@@ -442,8 +430,6 @@ class spell_fjord_the_cleansing_cleansing_soul : public AuraScript
 // 50217 - The Cleansing: Script Effect Player Cast Mirror Image
 class spell_fjord_the_cleansing_mirror_image_script_effect : public SpellScript
 {
-    PrepareSpellScript(spell_fjord_the_cleansing_mirror_image_script_effect);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_MIRROR_IMAGE_AURA });
@@ -463,8 +449,6 @@ class spell_fjord_the_cleansing_mirror_image_script_effect : public SpellScript
 // 50238 - The Cleansing: Your Inner Turmoil's On Death Cast on Master
 class spell_fjord_the_cleansing_on_death_cast_on_master : public SpellScript
 {
-    PrepareSpellScript(spell_fjord_the_cleansing_on_death_cast_on_master);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
@@ -496,8 +480,6 @@ enum TheWayToHisHeart
 // 21014 - Anuniaq's Net
 class spell_fjord_the_way_to_his_heart_anuniaq_net : public SpellScript
 {
-    PrepareSpellScript(spell_fjord_the_way_to_his_heart_anuniaq_net);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_CREATE_TASTY_REEF_FISH, SPELL_FISHED_UP_REEF_SHARK });
@@ -518,8 +500,6 @@ class spell_fjord_the_way_to_his_heart_anuniaq_net : public SpellScript
 // 44455 - The Way to His Heart...: Character Script Effect Reverse Cast
 class spell_fjord_the_way_to_his_heart_reverse_cast : public SpellScript
 {
-    PrepareSpellScript(spell_fjord_the_way_to_his_heart_reverse_cast);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
@@ -539,8 +519,6 @@ class spell_fjord_the_way_to_his_heart_reverse_cast : public SpellScript
 // 44462 - The Way to His Heart...: Cast Quest Complete on Master
 class spell_fjord_the_way_to_his_heart_quest_complete : public SpellScript
 {
-    PrepareSpellScript(spell_fjord_the_way_to_his_heart_quest_complete);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp
index 57b13922988..e59c7dd5ed8 100644
--- a/src/server/scripts/Northrend/zone_icecrown.cpp
+++ b/src/server/scripts/Northrend/zone_icecrown.cpp
@@ -733,8 +733,6 @@ struct npc_frostbrood_skytalon : public VehicleAI
 // 55288 - It's All Fun and Games: The Ocular On Death
 class spell_icecrown_the_ocular_on_death : public SpellScript
 {
-    PrepareSpellScript(spell_icecrown_the_ocular_on_death);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
@@ -759,8 +757,6 @@ class spell_icecrown_the_ocular_on_death : public SpellScript
 // 66411 - Summon Tualiq Proxy
 class spell_icecrown_summon_tualiq_proxy : public SpellScript
 {
-    PrepareSpellScript(spell_icecrown_summon_tualiq_proxy);
-
     void SetDest(SpellDestination& dest)
     {
         Position const offset = { 0.0f, 0.0f, 30.0f, 0.0f };
@@ -786,8 +782,6 @@ enum BreakfastOfChampions
 // 66512 - Pound Drum
 class spell_icecrown_pound_drum : public SpellScript
 {
-    PrepareSpellScript(spell_icecrown_pound_drum);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_DEEP_JORMUNGAR, SPELL_STORMFORGED_MOLE_MACHINE });
@@ -827,8 +821,6 @@ std::array<uint32, 4> const ChumTheWaterSummonSpells =
 // 66741 - Chum the Water
 class spell_icecrown_chum_the_water : public SpellScript
 {
-    PrepareSpellScript(spell_icecrown_chum_the_water);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(ChumTheWaterSummonSpells);
@@ -861,8 +853,6 @@ enum ThroughTheEye
 // 25732 - Through the Eye: Eye of the Lich King
 class spell_icecrown_through_the_eye_the_eye_of_the_lk : public AuraScript
 {
-    PrepareAuraScript(spell_icecrown_through_the_eye_the_eye_of_the_lk);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_IMAGE_OF_VARDMADRA, SPELL_SUMMON_IMAGE_OF_SHADOW_CULTIST }) &&
@@ -892,8 +882,6 @@ class spell_icecrown_through_the_eye_the_eye_of_the_lk : public AuraScript
 // 57884 - Through the Eye: Kill Credit to Master
 class spell_icecrown_through_the_eye_kill_credit_to_master : public SpellScript
 {
-    PrepareSpellScript(spell_icecrown_through_the_eye_kill_credit_to_master);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_USING_THE_EYE_OF_THE_LK });
@@ -917,8 +905,6 @@ class spell_icecrown_through_the_eye_kill_credit_to_master : public SpellScript
 // 56515 - Summon Freed Crusader
 class spell_icecrown_summon_freed_crusader : public SpellScript
 {
-    PrepareSpellScript(spell_icecrown_summon_freed_crusader);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
index 000d8ce01c2..3cddb45f981 100644
--- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp
+++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp
@@ -115,8 +115,6 @@ struct npc_engineer_helice : public EscortAI
 
 class spell_q12688_detonate_1 : public SpellScript
 {
-    PrepareSpellScript(spell_q12688_detonate_1);
-
     static constexpr uint32 SPAWN_GROUP_FLAMES = 67;
 
     bool Validate(SpellInfo const* /*spellInfo*/) override
@@ -156,8 +154,6 @@ class spell_q12688_detonate_1 : public SpellScript
 
 class spell_q12688_detonate_2 : public SpellScript
 {
-    PrepareSpellScript(spell_q12688_detonate_2);
-
     static constexpr uint32 SPAWN_GROUP_FLAMES = 68;
 
     bool Validate(SpellInfo const* /*spellInfo*/) override
@@ -390,8 +386,6 @@ enum MiscLifewarden
 // 51957 - Call of the Lifewarden
 class spell_q12620_the_lifewarden_wrath : public SpellScript
 {
-    PrepareSpellScript(spell_q12620_the_lifewarden_wrath);
-
     void HandleSendEvent(SpellEffIndex effIndex)
     {
         PreventHitDefaultEffect(effIndex);
@@ -468,8 +462,6 @@ enum KickWhatKick
 // 51330 - Shoot RJR
 class spell_q12589_shoot_rjr : public SpellScript
 {
-    PrepareSpellScript(spell_q12589_shoot_rjr);
-
     SpellCastResult CheckCast()
     {
         if (Unit* target = GetExplTargetUnit())
@@ -593,8 +585,6 @@ enum ReturnedSevenfold
 // 51854 - Deathbolt
 class spell_q12611_deathbolt : public SpellScript
 {
-    PrepareSpellScript(spell_q12611_deathbolt);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -634,8 +624,6 @@ enum BurningToHelp
 // 52308 - Take Sputum Sample
 class spell_sholazar_take_sputum_sample : public SpellScript
 {
-    PrepareSpellScript(spell_sholazar_take_sputum_sample);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) && ValidateSpellInfo(
@@ -668,8 +656,6 @@ class spell_sholazar_take_sputum_sample : public SpellScript
 // 52306 - Sputum Collected
 class spell_sholazar_sputum_collected : public SpellScript
 {
-    PrepareSpellScript(spell_sholazar_sputum_collected);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_HYDRA_SPUTUM });
@@ -704,8 +690,6 @@ enum ACleansingSong
 // 52941 - Song of Cleansing
 class spell_sholazar_song_of_cleansing : public SpellScript
 {
-    PrepareSpellScript(spell_sholazar_song_of_cleansing);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -753,8 +737,6 @@ enum StrengthOfTheTempest
 // 53062 - Lightning Strike
 class spell_sholazar_lightning_strike : public SpellScript
 {
-    PrepareSpellScript(spell_sholazar_lightning_strike);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_CREATE_POWER_OF_THE_TEMPEST });
@@ -778,8 +760,6 @@ class spell_sholazar_lightning_strike : public SpellScript
 // 51071 - Flight to Sholazar (Missile Warning)
 class spell_sholazar_flight_to_sholazar : public SpellScript
 {
-    PrepareSpellScript(spell_sholazar_flight_to_sholazar);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return sBroadcastTextStore.LookupEntry(uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()));
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index 7d2a256e64f..f271d5161cf 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -843,8 +843,6 @@ private:
 // 61319 - Jokkum Scriptcast
 class spell_jokkum_scriptcast : public AuraScript
 {
-    PrepareAuraScript(spell_jokkum_scriptcast);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_JOKKUM_SUMMON });
@@ -865,8 +863,6 @@ class spell_jokkum_scriptcast : public AuraScript
 // 56650 - Player Cast Veranus Summon
 class spell_veranus_summon : public AuraScript
 {
-    PrepareAuraScript(spell_veranus_summon);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_VERANUS_AND_THORIM });
@@ -892,8 +888,6 @@ enum CloseRift
 // 56763 - Close Rift
 class spell_close_rift : public AuraScript
 {
-    PrepareAuraScript(spell_close_rift);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo({ SPELL_DESPAWN_RIFT });
@@ -917,8 +911,6 @@ private:
 // 56689 - Grip
 class spell_grip : public AuraScript
 {
-    PrepareAuraScript(spell_grip);
-
     void DummyTick(AuraEffect const* /*aurEff*/)
     {
         ++_tickNumber;
@@ -975,8 +967,6 @@ class spell_grip : public AuraScript
 // 60533 - Grab On
 class spell_grab_on : public SpellScript
 {
-   PrepareSpellScript(spell_grab_on);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         if (Aura* grip = GetCaster()->GetAura(SPELL_GRIP, GetCaster()->GetGUID()))
@@ -994,8 +984,6 @@ class spell_grab_on : public SpellScript
 template <int8 StacksToLose>
 class spell_loosen_grip : public SpellScript
 {
-   PrepareSpellScript(spell_loosen_grip);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         if (Aura* grip = GetCaster()->GetAura(SPELL_GRIP))
@@ -1011,8 +999,6 @@ class spell_loosen_grip : public SpellScript
 // 60596 - Low Health Trigger
 class spell_low_health_trigger : public SpellScript
 {
-    PrepareSpellScript(spell_low_health_trigger);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
@@ -1033,8 +1019,6 @@ class spell_low_health_trigger : public SpellScript
 // 60864 - Jaws of Death
 class spell_jaws_of_death_claw_swipe_pct_damage : public SpellScript
 {
-    PrepareSpellScript(spell_jaws_of_death_claw_swipe_pct_damage);
-
     void HandleDamage(SpellEffIndex /*effIndex*/)
     {
         SetEffectValue(static_cast<int32>(GetHitUnit()->CountPctFromMaxHealth(GetEffectValue())));
@@ -1049,8 +1033,6 @@ class spell_jaws_of_death_claw_swipe_pct_damage : public SpellScript
 // 56705 - Claw Swipe
 class spell_claw_swipe_check : public AuraScript
 {
-    PrepareAuraScript(spell_claw_swipe_check);
-
     void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         GetTarget()->GetAI()->DoAction(ACTION_CLAW_SWIPE_WARN);
@@ -1083,8 +1065,6 @@ class spell_claw_swipe_check : public AuraScript
 // 60587 - Fatal Strike
 class spell_fatal_strike : public SpellScript
 {
-    PrepareSpellScript(spell_fatal_strike);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FATAL_STRIKE_DAMAGE });
@@ -1114,8 +1094,6 @@ class spell_fatal_strike : public SpellScript
 // 56672 - Player Mount Wyrm
 class spell_player_mount_wyrm : public AuraScript
 {
-    PrepareAuraScript(spell_player_mount_wyrm);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FIGHT_WYRM });
@@ -1139,8 +1117,6 @@ class spell_player_mount_wyrm : public AuraScript
 // 55693 - Remove Collapsing Cave Aura
 class spell_storm_peaks_remove_collapsing_cave_aura : public SpellScript
 {
-    PrepareSpellScript(spell_storm_peaks_remove_collapsing_cave_aura);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) });
@@ -1171,8 +1147,6 @@ enum MountingHodirsHelm
 // 56278 - Read Pronouncement
 class spell_storm_peaks_read_pronouncement : public AuraScript
 {
-    PrepareAuraScript(spell_storm_peaks_read_pronouncement);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return sBroadcastTextStore.HasRecord(TEXT_PRONOUNCEMENT_1) &&
@@ -1210,8 +1184,6 @@ enum JormuttarIsSooFat
 // 56565 - Bear Flank Master
 class spell_storm_peaks_bear_flank_master : public SpellScript
 {
-    PrepareSpellScript(spell_storm_peaks_bear_flank_master);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_CREATE_BEAR_FLANK, SPELL_BEAR_FLANK_FAIL });
@@ -1231,8 +1203,6 @@ class spell_storm_peaks_bear_flank_master : public SpellScript
 // 56569 - Bear Flank Fail
 class spell_storm_peaks_bear_flank_fail : public AuraScript
 {
-    PrepareAuraScript(spell_storm_peaks_bear_flank_fail);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return sBroadcastTextStore.HasRecord(TEXT_CARVE_FAIL);
@@ -1268,8 +1238,6 @@ enum AmpleInspiration
 // 54581 - Mammoth Explosion Spell Spawner
 class spell_storm_peaks_mammoth_explosion_master : public SpellScript
 {
-    PrepareSpellScript(spell_storm_peaks_mammoth_explosion_master);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -1306,8 +1274,6 @@ class spell_storm_peaks_mammoth_explosion_master : public SpellScript
 // 54892 - Unstable Explosive Detonation
 class spell_storm_peaks_unstable_explosive_detonation : public SpellScript
 {
-    PrepareSpellScript(spell_storm_peaks_unstable_explosive_detonation);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return sObjectMgr->GetItemTemplate(ITEM_EXPLOSIVE_DEVICE);
@@ -1337,8 +1303,6 @@ enum MendingFences
 // 55512 - Call of Earth
 class spell_storm_peaks_call_of_earth : public SpellScript
 {
-    PrepareSpellScript(spell_storm_peaks_call_of_earth);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_EARTHEN });
diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp
index 7c23c47d9fe..5bcdcd4c8c1 100644
--- a/src/server/scripts/Northrend/zone_wintergrasp.cpp
+++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp
@@ -354,8 +354,6 @@ private:
    61409 - Build Siege Vehicle (Force) */
 class spell_wintergrasp_force_building : public SpellScript
 {
-    PrepareSpellScript(spell_wintergrasp_force_building);
-
     bool Validate(SpellInfo const* /*spell*/) override
     {
         return ValidateSpellInfo(
@@ -382,8 +380,6 @@ class spell_wintergrasp_force_building : public SpellScript
 // 61178 - Grab Passenger
 class spell_wintergrasp_grab_passenger : public SpellScript
 {
-    PrepareSpellScript(spell_wintergrasp_grab_passenger);
-
     void HandleScript(SpellEffIndex /*effIndex*/)
     {
         if (Player* target = GetHitPlayer())
@@ -428,8 +424,6 @@ enum WgTeleport
 // 54640 - Teleport
 class spell_wintergrasp_defender_teleport : public SpellScript
 {
-    PrepareSpellScript(spell_wintergrasp_defender_teleport);
-
     SpellCastResult CheckCast()
     {
         if (Player* target = GetExplTargetUnit()->ToPlayer())
@@ -449,8 +443,6 @@ class spell_wintergrasp_defender_teleport : public SpellScript
 // 54643 - Teleport
 class spell_wintergrasp_defender_teleport_trigger : public SpellScript
 {
-    PrepareSpellScript(spell_wintergrasp_defender_teleport_trigger);
-
     void HandleDummy(SpellEffIndex /*effindex*/)
     {
         if (Unit* target = GetHitUnit())
@@ -471,8 +463,6 @@ class spell_wintergrasp_defender_teleport_trigger : public SpellScript
 // 59911 - Tenacity
 class spell_wintergrasp_tenacity_refresh : public AuraScript
 {
-    PrepareAuraScript(spell_wintergrasp_tenacity_refresh);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         if (!ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } }))
diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp
index 389ebc14da4..fd750e96b89 100644
--- a/src/server/scripts/Northrend/zone_zuldrak.cpp
+++ b/src/server/scripts/Northrend/zone_zuldrak.cpp
@@ -415,8 +415,6 @@ uint32 const FetchIngredients[21][4] =
 // 51157 - Random Ingredient Hard Aura
 class spell_random_ingredient_aura : public AuraScript
 {
-    PrepareAuraScript(spell_random_ingredient_aura);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -454,8 +452,6 @@ class spell_random_ingredient_aura : public AuraScript
 // 51134 - Random Ingredient Easy
 class spell_random_ingredient : public SpellScript
 {
-    PrepareSpellScript(spell_random_ingredient);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -524,8 +520,6 @@ class spell_random_ingredient : public SpellScript
 // 51046 - Pot Check
 class spell_pot_check : public SpellScript
 {
-    PrepareSpellScript(spell_pot_check);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -615,8 +609,6 @@ class spell_pot_check : public SpellScript
 
 class spell_fetch_ingredient_aura : public AuraScript
 {
-    PrepareAuraScript(spell_fetch_ingredient_aura);
-
     void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         Unit* target = GetTarget();
@@ -690,8 +682,6 @@ enum ScourgeDisguise
 // 51966 - Scourge Disguise
 class spell_zuldrak_scourge_disguise : public AuraScript
 {
-    PrepareAuraScript(spell_zuldrak_scourge_disguise);
-
     void ApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         Unit* target = GetTarget();
@@ -714,8 +704,6 @@ class spell_zuldrak_scourge_disguise : public AuraScript
 // 51971 - Scourge Disguise Instability
 class spell_zuldrak_scourge_disguise_instability : public AuraScript
 {
-    PrepareAuraScript(spell_zuldrak_scourge_disguise_instability);
-
     void CalcPeriodic(AuraEffect const* /*aurEff*/, bool& isPeriodic, int32& amplitude)
     {
         isPeriodic = true;
@@ -743,8 +731,6 @@ class spell_zuldrak_scourge_disguise_instability : public AuraScript
 // 52010 - Scourge Disguise Expiring
 class spell_zuldrak_scourge_disguise_expiring : public AuraScript
 {
-    PrepareAuraScript(spell_zuldrak_scourge_disguise_expiring);
-
     void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (Player* player = GetTarget()->ToPlayer())
@@ -768,8 +754,6 @@ class spell_zuldrak_scourge_disguise_expiring : public AuraScript
 // 54089 - Drop Disguise
 class spell_zuldrak_drop_disguise : public SpellScript
 {
-    PrepareSpellScript(spell_zuldrak_drop_disguise);
-
     void HandleHit()
     {
         if (Unit* target = GetHitUnit())
@@ -796,8 +780,6 @@ enum Cocooned
 // 51596 - Cocooned: Player Not On Quest
 class spell_zuldrak_cocooned_not_on_quest : public SpellScript
 {
-    PrepareSpellScript(spell_zuldrak_cocooned_not_on_quest);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_SCOURGED_CAPTIVE });
@@ -817,8 +799,6 @@ class spell_zuldrak_cocooned_not_on_quest : public SpellScript
 // 51598 - Cocooned: Player On Quest
 class spell_zuldrak_cocooned_on_quest : public SpellScript
 {
-    PrepareSpellScript(spell_zuldrak_cocooned_on_quest);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_SCOURGED_CAPTIVE, SPELL_SUMMON_CAPTIVE_FOOTMAN });
@@ -850,8 +830,6 @@ enum Sabotage
 // 52324 - Scourgewagon Explosion
 class spell_zuldrak_scourgewagon_explosion : public SpellScript
 {
-    PrepareSpellScript(spell_zuldrak_scourgewagon_explosion);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
@@ -888,8 +866,6 @@ class spell_zuldrak_scourgewagon_explosion : public SpellScript
 // 54990 - Chains of the Scourge
 class spell_zuldrak_chains_of_the_scourge : public SpellScript
 {
-    PrepareSpellScript(spell_zuldrak_chains_of_the_scourge);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_1).CalcValue()) });