diff --git a/zone/attack.cpp b/zone/attack.cpp
index 64e0f9f19..58c2a4048 100644
--- a/zone/attack.cpp
+++ b/zone/attack.cpp
@@ -446,15 +446,7 @@ bool Mob::AvoidDamage(Mob* other, int32 &damage, bool CanRiposte)
 
 	if(damage > 0 && HasShieldEquiped()	&& (aabonuses.ShieldBlock || spellbonuses.ShieldBlock || itembonuses.ShieldBlock)
 		&& (!other->BehindMob(this, other->GetX(), other->GetY()) || bShieldBlockFromRear)) {
-		
-		/*
-		bool equiped = CastToClient()->m_inv.GetItem(14);
-		if(equiped) {
-			uint8 shield = CastToClient()->m_inv.GetItem(14)->GetItem()->ItemType;
-			float bonusShieldBlock = 0.0f;
-			if(shield == ItemTypeShield) {
-		*/
-						
+
 		float bonusShieldBlock = 0.0f;
 		bonusShieldBlock = aabonuses.ShieldBlock + spellbonuses.ShieldBlock + itembonuses.ShieldBlock;
 		RollTable[1] += bonusShieldBlock;
@@ -1142,7 +1134,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
 	}
 	else{
 		weapon = GetInv().GetItem(SLOT_PRIMARY);
-		OffHandAtk(false); 
+		OffHandAtk(false);
 	}
 
 	if(weapon != nullptr) {
@@ -3500,10 +3492,10 @@ void Mob::CommonDamage(Mob* attacker, int32 &damage, const uint16 spell_id, cons
 		attacker->SendAppearancePacket(AT_Sneak, 0);
 	}
 		//final damage has been determined.
-		
+
 		ReduceAllDamage(damage);
 		SetHP(GetHP() - damage);
-		
+
 		if(HasDied()) {
 			bool IsSaved = false;
 
diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp
index 17bb21a16..19c462660 100644
--- a/zone/spell_effects.cpp
+++ b/zone/spell_effects.cpp
@@ -3789,7 +3789,7 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses)
 				SetBodyType(GetOrigBodyType(), false);
 				break;
 			}
-			
+
 			case SE_MovementSpeed:
 			{
 				if(IsClient())
@@ -5223,7 +5223,7 @@ bool Mob::CheckHitsRemaining(uint32 buff_slot, bool when_spell_done, bool negate
 		}
 	return false;
 	}
-	
+
 	// For spell buffs that are limited by the number of times it can successfully trigger a spell.
 	// Effects: SE_TriggerOnCast, SE_SympatheticProc,SE_DefensiveProc, SE_SkillProc, SE_RangedProc
 	if(spell_id){