diff --git a/Source/Game/BattleGrounds/Zones/ArathiBasin.cs b/Source/Game/BattleGrounds/Zones/ArathiBasin.cs
index 142674361..9cc0ea0e7 100644
--- a/Source/Game/BattleGrounds/Zones/ArathiBasin.cs
+++ b/Source/Game/BattleGrounds/Zones/ArathiBasin.cs
@@ -160,7 +160,7 @@ namespace Game.BattleGrounds.Zones
 
                         if (team == TeamId.Alliance)
                             UpdateWorldState(ABWorldStates.ResourcesAlly, m_TeamScores[team]);
-                        else if (team == TeamId.Horde)
+                        else
                             UpdateWorldState(ABWorldStates.ResourcesHorde, m_TeamScores[team]);
                         // update achievement flags
                         // we increased m_TeamScores[team] so we just need to check if it is 500 more than other teams resources
@@ -387,12 +387,12 @@ namespace Game.BattleGrounds.Zones
 
         void _NodeDeOccupied(byte node)
         {
+            //only dynamic nodes, no start points
             if (node >= ABBattlegroundNodes.DynamicNodesCount)
                 return;
 
             //remove bonus honor aura trigger creature when node is lost
-            if (node < ABBattlegroundNodes.DynamicNodesCount)//only dynamic nodes, no start points
-                DelCreature(node + 7);//null checks are in DelCreature! 0-6 spirit guides
+            DelCreature(node + 7);//null checks are in DelCreature! 0-6 spirit guides
 
             RelocateDeadPlayers(BgCreatures[node]);
 
diff --git a/Source/Game/Globals/ObjectManager.cs b/Source/Game/Globals/ObjectManager.cs
index 308943aad..046287006 100644
--- a/Source/Game/Globals/ObjectManager.cs
+++ b/Source/Game/Globals/ObjectManager.cs
@@ -7598,7 +7598,7 @@ namespace Game
                     if (reverseMap != null)
                         reverseMap.Add(quest, id);
                 }
-                else if (starter)
+                else
                     poolRelationMap.Add(quest, id);
 
                 ++count;
diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs
index 0ceaa4576..56d1831ff 100644
--- a/Source/Game/Spells/SpellEffects.cs
+++ b/Source/Game/Spells/SpellEffects.cs
@@ -2203,11 +2203,7 @@ namespace Game.Spells
             if (player == null)
                 return;
 
-            if (itemTarget == null)
-                return;
-
             uint enchant_id = (uint)effectInfo.MiscValue;
-
             if (enchant_id == 0)
             {
                 Log.outError(LogFilter.Spells, "Spell {0} Effect {1} (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have 0 as enchanting id", m_spellInfo.Id, effIndex);