diff --git a/Source/Game/Spells/SpellInfo.cs b/Source/Game/Spells/SpellInfo.cs
index cf6c063f3..cb01d9785 100644
--- a/Source/Game/Spells/SpellInfo.cs
+++ b/Source/Game/Spells/SpellInfo.cs
@@ -2996,6 +2996,10 @@ namespace Game.Spells
             if (IsPassive())
                 return this;
 
+            // Client ignores spell with these attributes (sub_53D9D0)
+            if (HasAttribute(SpellAttr0.Negative1) || HasAttribute(SpellAttr2.Unk3))
+                return this;
+
             bool needRankSelection = false;
             foreach (SpellEffectInfo effect in GetEffectsForDifficulty(Difficulty.None))
             {
@@ -3854,9 +3858,8 @@ namespace Game.Spells
                         level = (int)_spellInfo.MaxLevel;
                     else if (level < _spellInfo.BaseLevel)
                         level = (int)_spellInfo.BaseLevel;
-                    if (!_spellInfo.IsPassive())
-                        level -= (int)_spellInfo.SpellLevel;
 
+                    level -= (int)_spellInfo.SpellLevel;
                     basePoints += (int)(level * basePointsPerLevel);
                 }
 
diff --git a/Source/Game/Spells/SpellManager.cs b/Source/Game/Spells/SpellManager.cs
index a095e328c..b6ff29359 100644
--- a/Source/Game/Spells/SpellManager.cs
+++ b/Source/Game/Spells/SpellManager.cs
@@ -2274,13 +2274,6 @@ namespace Game.Entities
                     case 42835: // Spout, remove damage effect, only anim is needed
                         spellInfo.GetEffect(0).Effect = 0;
                         break;
-                    case 30657: // Quake
-                        spellInfo.GetEffect(0).TriggerSpell = 30571;
-                        break;
-                    case 30541: // Blaze (needs conditions entry)
-                        spellInfo.GetEffect(0).TargetA = new SpellImplicitTargetInfo(Targets.UnitEnemy);
-                        spellInfo.GetEffect(0).TargetB = new SpellImplicitTargetInfo();
-                        break;
                     case 63665: // Charge (Argent Tournament emote on riders)
                     case 31298: // Sleep (needs target selection script)
                     case 51904: // Summon Ghouls On Scarlet Crusade (this should use conditions table, script for this spell needs to be fixed)