Scripts/Spells: Removed unneccessary PrepareSpellScript and PrepareAuraScript uses

23 files changed, 0 insertions, 114 deletions

diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
index 4161a3a8ce1..c4fcea58e01 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
@@ -209,8 +209,6 @@ public:
 
     class spell_subjugator_korul_darkness_calls_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_subjugator_korul_darkness_calls_SpellScript);
-
         void HandleScript(SpellEffIndex /*effIndex*/)
         {
             if (Unit* hitUnit = GetHitUnit())
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
index d42358717ac..f23b7b017b5 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp
@@ -259,8 +259,6 @@ class spell_anetheron_vampiric_aura : public SpellScriptLoader
 
         class spell_anetheron_vampiric_aura_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_anetheron_vampiric_aura_AuraScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_VAMPIRIC_AURA_HEAL });
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
index aa00bf7eb1a..438c6e33a53 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
@@ -571,8 +571,6 @@ class spell_archimonde_drain_world_tree_dummy : public SpellScriptLoader
 
         class spell_archimonde_drain_world_tree_dummy_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_archimonde_drain_world_tree_dummy_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_DRAIN_WORLD_TREE_TRIGGERED });
@@ -599,8 +597,6 @@ class spell_archimonde_drain_world_tree_dummy : public SpellScriptLoader
 // Protection of Elune 38528
 class spell_protection_of_elune : public AuraScript
 {
-    PrepareAuraScript(spell_protection_of_elune);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
index 7cdc1f54b48..988de4af818 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp
@@ -184,8 +184,6 @@ class spell_mark_of_kazrogal : public SpellScriptLoader
 
         class spell_mark_of_kazrogal_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_mark_of_kazrogal_SpellScript);
-
             void FilterTargets(std::list<WorldObject*>& targets)
             {
                 targets.remove_if(MarkTargetFilter());
@@ -199,8 +197,6 @@ class spell_mark_of_kazrogal : public SpellScriptLoader
 
         class spell_mark_of_kazrogal_AuraScript : public AuraScript
         {
-            PrepareAuraScript(spell_mark_of_kazrogal_AuraScript);
-
             bool Validate(SpellInfo const* /*spell*/) override
             {
                 return ValidateSpellInfo({ SPELL_MARK_DAMAGE });
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
index 70f97948f7c..553ce106554 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp
@@ -143,8 +143,6 @@ class boss_salramm : public CreatureScript
 // 52708 - Steal Flesh
 class spell_salramm_steal_flesh : public AuraScript
 {
-    PrepareAuraScript(spell_salramm_steal_flesh);
-
     void HandlePeriodic(AuraEffect const* /*eff*/)
     {
         GetCaster()->CastSpell(GetCaster(), SPELL_STEAL_FLESH_BUFF, true);
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
index 651a6337b4d..6c432a8929a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
@@ -1658,8 +1658,6 @@ struct npc_stratholme_rp_dummy : NullCreatureAI
 // 50773 - Crusader Strike
 class spell_stratholme_crusader_strike : public SpellScript
 {
-    PrepareSpellScript(spell_stratholme_crusader_strike);
-
     void HandleDummy(SpellEffIndex /*effIndex*/)
     {
         if (Unit* target = GetHitUnit())
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
index a3aeb643c55..922cc03230a 100644
--- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
@@ -504,8 +504,6 @@ class spell_alysrazor_cosmetic_egg_xplosion : public SpellScriptLoader
 
         class spell_alysrazor_cosmetic_egg_xplosion_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_alysrazor_cosmetic_egg_xplosion_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 if (!sCreatureDisplayInfoStore.LookupEntry(MODEL_INVISIBLE_STALKER))
@@ -540,8 +538,6 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader
 
         class spell_alysrazor_turn_monstrosity_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_alysrazor_turn_monstrosity_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo(
@@ -626,8 +622,6 @@ class spell_alysrazor_aggro_closest : public SpellScriptLoader
 
         class spell_alysrazor_aggro_closest_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_alysrazor_aggro_closest_SpellScript);
-
             bool Load() override
             {
                 return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -666,8 +660,6 @@ class spell_alysrazor_fieroblast : public SpellScriptLoader
 
         class spell_alysrazor_fieroblast_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_alysrazor_fieroblast_SpellScript);
-
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
                 return ValidateSpellInfo({ SPELL_FIRE_IT_UP });
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
index be6aee37e4d..fc9e400c7a0 100644
--- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp
@@ -315,8 +315,6 @@ private:
 // http://www.wowhead.com/spell=99342/blades-of-baloroc
 class spell_baleroc_blades_of_baleroc : public SpellScript
 {
-    PrepareSpellScript(spell_baleroc_blades_of_baleroc);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_INFERNO_BLADE, SPELL_DECIMATION_BLADE });
@@ -354,8 +352,6 @@ class spell_baleroc_blades_of_baleroc : public SpellScript
 // http://www.wowhead.com/spell=99350/inferno-blade
 class spell_baleroc_inferno_blade : public AuraScript
 {
-    PrepareAuraScript(spell_baleroc_inferno_blade);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -383,8 +379,6 @@ class spell_baleroc_inferno_blade : public AuraScript
 // http://www.wowhead.com/spell=99352/decimation-blade
 class spell_baleroc_decimation_blade : public AuraScript
 {
-    PrepareAuraScript(spell_baleroc_decimation_blade);
-
     bool Load() override
     {
         return GetCaster()->GetTypeId() == TYPEID_UNIT;
@@ -412,8 +406,6 @@ class spell_baleroc_decimation_blade : public AuraScript
 // http://www.wowhead.com/spell=99353/decimating-strike
 class spell_baleroc_decimating_strike : public SpellScript
 {
-    PrepareSpellScript(spell_baleroc_decimating_strike);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } })
@@ -437,8 +429,6 @@ class spell_baleroc_decimating_strike : public SpellScript
 // http://www.wowhead.com/spell=99515/countdown
 class spell_baleroc_countdown_aoe_dummy : public SpellScript
 {
-    PrepareSpellScript(spell_baleroc_countdown_aoe_dummy);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_COUNTDOWN_VISUAL_LINK, SPELL_COUNTDOWN_AURA });
@@ -489,8 +479,6 @@ class spell_baleroc_countdown_aoe_dummy : public SpellScript
 // http://www.wowhead.com/spell=99516/countdown
 class spell_baleroc_countdown : public AuraScript
 {
-    PrepareAuraScript(spell_baleroc_countdown);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_COUNTDOWN_VISUAL_LINK, SPELL_COUNTDOWN_AOE_EXPLOSION });
@@ -512,8 +500,6 @@ class spell_baleroc_countdown : public AuraScript
 // http://www.wowhead.com/spell=99517/countdown
 class spell_baleroc_countdown_proximity_check : public SpellScript
 {
-    PrepareSpellScript(spell_baleroc_countdown_proximity_check);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_COUNTDOWN_AURA });
@@ -542,8 +528,6 @@ class spell_baleroc_countdown_proximity_check : public SpellScript
 // http://www.wowhead.com/spell=99259/shards-of-torment
 class spell_baleroc_shards_of_torment_target_search : public SpellScript
 {
-    PrepareSpellScript(spell_baleroc_shards_of_torment_target_search);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SHARDS_OF_TORMENT_SUMMON });
@@ -637,8 +621,6 @@ class spell_baleroc_shards_of_torment_target_search : public SpellScript
 // http://www.wowhead.com/spell=99253/torment
 class spell_baleroc_torment_target_search : public SpellScript
 {
-    PrepareSpellScript(spell_baleroc_torment_target_search);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_TORMENT_PERIODIC });
@@ -676,8 +658,6 @@ class spell_baleroc_torment_target_search : public SpellScript
 // http://www.wowhead.com/spell=99256/torment
 class spell_baleroc_torment : public SpellScript
 {
-    PrepareSpellScript(spell_baleroc_torment);
-
     void ModifyDamage()
     {
         SetHitDamage(GetHitDamage() * GetHitUnit()->GetAuraCount(GetSpellInfo()->Id));
@@ -691,8 +671,6 @@ class spell_baleroc_torment : public SpellScript
 
 class spell_baleroc_torment_AuraScript : public AuraScript
 {
-    PrepareAuraScript(spell_baleroc_torment_AuraScript);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_VITAL_FLAME, SPELL_VITAL_SPARK, SPELL_TORMENTED });
@@ -729,8 +707,6 @@ class spell_baleroc_torment_AuraScript : public AuraScript
 // http://www.wowhead.com/spell=99257/tormented
 class spell_baleroc_tormented : public AuraScript
 {
-    PrepareAuraScript(spell_baleroc_tormented);
-
     void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
         if (InstanceScript* instance = GetTarget()->GetInstanceScript())
@@ -747,8 +723,6 @@ class spell_baleroc_tormented : public AuraScript
 // http://www.wowhead.com/spell=99489/tormented
 class spell_baleroc_tormented_spread : public SpellScript
 {
-    PrepareSpellScript(spell_baleroc_tormented_spread);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_TORMENTED });
@@ -769,8 +743,6 @@ class spell_baleroc_tormented_spread : public SpellScript
 // http://www.wowhead.com/spell=99262/vital-spark
 class spell_baleroc_vital_spark : public AuraScript
 {
-    PrepareAuraScript(spell_baleroc_vital_spark);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_BLAZE_OF_GLORY, SPELL_VITAL_FLAME });
@@ -793,8 +765,6 @@ class spell_baleroc_vital_spark : public AuraScript
 // http://www.wowhead.com/spell=99263/vital-flame
 class spell_baleroc_vital_flame : public AuraScript
 {
-    PrepareAuraScript(spell_baleroc_vital_flame);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellEffect({ { SPELL_VITAL_SPARK, EFFECT_0 } });
diff --git a/src/server/scripts/Kalimdor/Firelands/firelands.cpp b/src/server/scripts/Kalimdor/Firelands/firelands.cpp
index fb24dae1445..243894203b7 100644
--- a/src/server/scripts/Kalimdor/Firelands/firelands.cpp
+++ b/src/server/scripts/Kalimdor/Firelands/firelands.cpp
@@ -248,8 +248,6 @@ struct npc_firelands_magmakin : public ScriptedAI
 // http://www.wowhead.com/spell=100799/fiery-torment
 class spell_firelands_fiery_torment : public SpellScript
 {
-    PrepareSpellScript(spell_firelands_fiery_torment);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FIERY_TORMENT_DAMAGE });
@@ -280,8 +278,6 @@ class spell_firelands_fiery_torment : public SpellScript
 // http://www.wowhead.com/spell=101092/smouldering
 class spell_firelands_smouldering : public SpellScript
 {
-    PrepareSpellScript(spell_firelands_smouldering);
-
     void CheckQuestStatus(std::list<WorldObject*>& targets)
     {
         uint32 questId = 0;
@@ -320,8 +316,6 @@ class spell_firelands_smouldering : public SpellScript
 // http://www.wowhead.com/spell=101093/smouldering
 class spell_firelands_smouldering_aura : public SpellScript
 {
-    PrepareSpellScript(spell_firelands_smouldering_aura);
-
     void SetTarget(WorldObject*& target)
     {
         target = GetCaster();
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
index ebe2ae71072..f5da2934c7d 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
@@ -478,8 +478,6 @@ public:
 
     class spell_anraphet_alpha_beams_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_anraphet_alpha_beams_SpellScript);
-
         void FilterTargets(std::list<WorldObject*>& targets)
         {
             if (targets.empty())
@@ -510,8 +508,6 @@ public:
 
     class spell_anraphet_omega_stance_summon_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_anraphet_omega_stance_summon_SpellScript);
-
         void SetDest(SpellDestination& dest)
         {
             dest.RelocateOffset({ 0.0f, 0.0f, 30.0f, 0.0f });
@@ -537,8 +533,6 @@ public:
 
     class spell_anraphet_omega_stance_spider_effect_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_anraphet_omega_stance_spider_effect_SpellScript);
-
         void SetDest(SpellDestination& dest)
         {
             // Do our own calculations for the destination position.
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
index 6f2ecff5f14..1f7c7cfd466 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
@@ -262,8 +262,6 @@ class spell_earthrager_ptah_flame_bolt : public SpellScriptLoader
 
         class spell_earthrager_ptah_flame_bolt_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_earthrager_ptah_flame_bolt_SpellScript);
-
             void FilterTargets(std::list<WorldObject*>& targets)
             {
                 Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->IsHeroic() ? 3 : 2);
@@ -288,8 +286,6 @@ public:
 
     class spell_earthrager_ptah_explosion_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_earthrager_ptah_explosion_AuraScript);
-
         void SetFlags(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
         {
             if (Unit* ptah = GetCaster())
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
index 6ce792b6e21..a5985dea99c 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
@@ -281,8 +281,6 @@ class spell_anhuur_shield_of_light : public SpellScriptLoader
 
         class spell_anhuur_shield_of_light_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_anhuur_shield_of_light_SpellScript);
-
             void FilterTargets(std::list<WorldObject*>& targets)
             {
                 if (InstanceScript* const script = GetCaster()->GetInstanceScript())
@@ -316,8 +314,6 @@ class spell_anhuur_disable_beacon_beams : public SpellScriptLoader
 
         class spell_anhuur_disable_beacon_beams_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_anhuur_disable_beacon_beams_SpellScript);
-
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
                 GetHitUnit()->RemoveAurasDueToSpell(GetEffectValue());
@@ -355,8 +351,6 @@ public:
 
     class spell_anhuur_divine_reckoning_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_anhuur_divine_reckoning_AuraScript);
-
         void OnPeriodic(AuraEffect const* aurEff)
         {
             if (Unit* caster = GetCaster())
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
index 9a4e8f41ce5..b00858409ac 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp
@@ -240,8 +240,6 @@ class spell_snufflenose_command : public SpellScriptLoader
 
         class spell_snufflenose_commandSpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_snufflenose_commandSpellScript);
-
             void HandleEffect(SpellEffIndex /*effIndex*/)
             {
                 if (Creature* target = GetHitCreature())
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index f06aa6a134e..153737b1a2f 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -249,8 +249,6 @@ class spell_egg_explosion : public SpellScriptLoader
 
         class spell_egg_explosion_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_egg_explosion_SpellScript);
-
             void HandleAfterCast()
             {
                 if (Creature* buru = GetCaster()->FindNearestCreature(NPC_BURU, 5.f))
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
index 2b715fba60a..c9285fe98db 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp
@@ -126,8 +126,6 @@ class boss_rajaxx : public CreatureScript
 // 25599 - Thundercrash
 class spell_rajaxx_thundercrash : public SpellScript
 {
-    PrepareSpellScript(spell_rajaxx_thundercrash);
-
     void HandleDamageCalc(SpellEffIndex /*effIndex*/)
     {
         int32 damage = GetHitUnit()->GetHealth() / 2;
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
index b2e762f57ac..725d8678ea1 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
@@ -216,8 +216,6 @@ class spell_skeram_arcane_explosion : public SpellScriptLoader
 
         class spell_skeram_arcane_explosion_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_skeram_arcane_explosion_SpellScript);
-
             void FilterTargets(std::list<WorldObject*>& targets)
             {
                 targets.remove_if([](WorldObject* object) -> bool
@@ -252,8 +250,6 @@ public:
 
     class spell_skeram_true_fulfillment_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_skeram_true_fulfillment_SpellScript);
-
         bool Validate(SpellInfo const* /*spellInfo*/) override
         {
             return ValidateSpellInfo({ SPELL_TRUE_FULFILLMENT_2, SPELL_GENERIC_DISMOUNT });
diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
index c1c627a2453..0193995fcf7 100644
--- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp
+++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp
@@ -385,8 +385,6 @@ class spell_destroy_karangs_banner : public SpellScriptLoader
 
         class spell_destroy_karangs_banner_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_destroy_karangs_banner_SpellScript);
-
             void HandleAfterCast()
             {
                 if (GameObject* banner = GetCaster()->FindNearestGameObject(GO_BANNER, GetSpellInfo()->GetMaxRange(true)))
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index 76aa6af3c7f..e29c47b3709 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -621,8 +621,6 @@ public:
 // 29528 - Inoculate Nestlewood Owlkin
 class spell_inoculate_nestlewood : public AuraScript
 {
-    PrepareAuraScript(spell_inoculate_nestlewood);
-
     void PeriodicTick(AuraEffect const* /*aurEff*/)
     {
         if (GetTarget()->GetTypeId() != TYPEID_UNIT) // prevent error reports in case ignored player target
@@ -648,8 +646,6 @@ enum RedSnapperVeryTasty
 // 29866 - Cast Fishing Net
 class spell_azuremyst_isle_cast_fishing_net : public SpellScript
 {
-    PrepareSpellScript(spell_azuremyst_isle_cast_fishing_net);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_FISHED_UP_RED_SNAPPER, SPELL_FISHED_UP_MURLOC });
diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
index bf2ea648bc2..79057902202 100644
--- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
@@ -775,8 +775,6 @@ uint32 const CocoonSummonSpells[10] =
 // 30950 - Free Webbed Creature
 class spell_free_webbed : public SpellScript
 {
-    PrepareSpellScript(spell_free_webbed);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(CocoonSummonSpells);
@@ -796,8 +794,6 @@ class spell_free_webbed : public SpellScript
 // 31009 - Free Webbed Creature
 class spell_free_webbed_on_quest : public SpellScript
 {
-    PrepareSpellScript(spell_free_webbed_on_quest);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo(CocoonSummonSpells) && ValidateSpellInfo({ SPELL_FREE_WEBBED_11 });
diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp
index 38e6a8689fa..09abff2baf3 100644
--- a/src/server/scripts/Kalimdor/zone_durotar.cpp
+++ b/src/server/scripts/Kalimdor/zone_durotar.cpp
@@ -128,8 +128,6 @@ enum VoodooSpells
 // 17009 - Voodoo
 class spell_voodoo : public SpellScript
 {
-    PrepareSpellScript(spell_voodoo);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_BREW, SPELL_GHOSTLY, SPELL_HEX1, SPELL_HEX2, SPELL_HEX3, SPELL_GROW, SPELL_LAUNCH });
diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
index 995e560f597..41c617f2305 100644
--- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
@@ -30,8 +30,6 @@ enum OozeZap
 // 42489 - Cast Ooze Zap When Energized
 class spell_ooze_zap : public SpellScript
 {
-    PrepareSpellScript(spell_ooze_zap);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } })
@@ -66,8 +64,6 @@ class spell_ooze_zap : public SpellScript
 // 42485 - End of Ooze Channel
 class spell_ooze_zap_channel_end : public SpellScript
 {
-    PrepareSpellScript(spell_ooze_zap_channel_end);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_OOZE_CHANNEL_CREDIT });
@@ -90,8 +86,6 @@ class spell_ooze_zap_channel_end : public SpellScript
 // 42492 - Cast Energized
 class spell_energize_aoe : public SpellScript
 {
-    PrepareSpellScript(spell_energize_aoe);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_ENERGIZED });
@@ -136,8 +130,6 @@ enum RecoverTheCargo
 // 42287 - Salvage Wreckage
 class spell_dustwallow_marsh_salvage_wreckage : public SpellScript
 {
-    PrepareSpellScript(spell_dustwallow_marsh_salvage_wreckage);
-
     bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_SUMMON_LOCKBOX, SPELL_SUMMON_BURROWER });
diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp
index 097b803488d..64b04472dad 100644
--- a/src/server/scripts/Kalimdor/zone_felwood.cpp
+++ b/src/server/scripts/Kalimdor/zone_felwood.cpp
@@ -127,8 +127,6 @@ public:
 
     class spell_swipe_honey_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_swipe_honey_SpellScript);
-
         SpellCastResult CheckTarget()
         {
             if (GetCaster()->FindNearestCreature(NPC_HONEY_BUNNY, 5.0f, true))
@@ -181,8 +179,6 @@ public: spell_beesbees() : SpellScriptLoader("spell_beesbees") { }
 
         class spell_beesbees_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_beesbees_SpellScript);
-
             void HandleScriptEffect(SpellEffIndex /* effIndex */)
             {
                 if (Creature* honey = GetCaster()->ToCreature())
@@ -228,8 +224,6 @@ public: spell_ruumbos_silly_dance() : SpellScriptLoader("spell_ruumbos_silly_dan
 
         class spell_ruumbos_silly_dance_SpellScript : public SpellScript
         {
-            PrepareSpellScript(spell_ruumbos_silly_dance_SpellScript);
-
             void HandleScriptEffect(SpellEffIndex /* effIndex */)
             {
                 if (Player* player = GetHitPlayer())
diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp
index e17b927f141..e88c3a73bd3 100644
--- a/src/server/scripts/Kalimdor/zone_silithus.cpp
+++ b/src/server/scripts/Kalimdor/zone_silithus.cpp
@@ -1450,8 +1450,6 @@ class go_wind_stone : public GameObjectScript
 // 46595 - Summon Ice Stone Lieutenant, Trigger
 class spell_silithus_summon_cultist_periodic : public AuraScript
 {
-    PrepareAuraScript(spell_silithus_summon_cultist_periodic);
-
     bool Validate(SpellInfo const* spellInfo) override
     {
         return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell });