diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c50a086a26..524e00e4ba 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -74,7 +74,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1651,15 +1650,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1710,8 +1701,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c50a086a26..524e00e4ba 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -74,7 +74,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1651,15 +1650,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1710,8 +1701,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 45cb122680..5a2b059d96 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -74,7 +74,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1651,15 +1650,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1710,8 +1701,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 45cb122680..5a2b059d96 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -74,7 +74,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1651,15 +1650,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1710,8 +1701,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 45cb122680..5a2b059d96 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -74,7 +74,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1651,15 +1650,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1710,8 +1701,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 45cb122680..5a2b059d96 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -74,7 +74,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1651,15 +1650,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1710,8 +1701,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 45cb122680..5a2b059d96 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -74,7 +74,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1651,15 +1650,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1710,8 +1701,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/EffectList.java
index cf776c58f8..343959d231 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -658,28 +658,6 @@ public class EffectList
 		updateEffectList(update);
 	}
 	
-	/**
-	 * Exits all effects in this effect list without excluding anything.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_buffs.stream().forEach(this::stopAndRemove);
-		_triggered.stream().forEach(this::stopAndRemove);
-		_dances.stream().forEach(this::stopAndRemove);
-		_toggles.stream().forEach(this::stopAndRemove);
-		_debuffs.stream().forEach(this::stopAndRemove);
-		_passives.stream().forEach(this::stopAndRemove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stop all effects that doesn't stay on sub-class change.
 	 */
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 1a7374d446..3b283cb2c5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -64,7 +64,6 @@ import org.l2jmobius.gameserver.model.EffectList;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -2404,15 +2403,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -2459,9 +2450,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			getAI().stopAITask();
 		}
 		
-		// Remove all effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
-		
 		// Cancel the BuffFinishTask related to this creature.
 		cancelBuffFinishTask();
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 38ff78f500..5da289451c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -74,7 +74,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1650,15 +1649,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1709,8 +1700,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 38ff78f500..5da289451c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -74,7 +74,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1650,15 +1649,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1709,8 +1700,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 38ff78f500..5da289451c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -74,7 +74,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1650,15 +1649,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1709,8 +1700,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 3facf4b8c0..93fd17e10e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -75,7 +75,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1651,15 +1650,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1710,8 +1701,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 3facf4b8c0..93fd17e10e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -75,7 +75,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1651,15 +1650,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1710,8 +1701,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java
index 0f0c04ae68..dc0ed5b182 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java
@@ -344,26 +344,6 @@ public class EffectList
 		stopEffects(info -> !info.getSkill().isStayAfterDeath(), true, true);
 	}
 	
-	/**
-	 * Exits all active, passive and option effects in this effect list without excluding anything,<br>
-	 * like necessary toggles, irreplacable buffs or effects that last through death.<br>
-	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
-	 * @param update set to true to update the effect flags and icons.
-	 * @param broadcast {@code true} to broadcast update packets, {@code false} otherwise.
-	 */
-	public void stopAllEffectsWithoutExclusions(boolean update, boolean broadcast)
-	{
-		_actives.stream().forEach(this::remove);
-		_passives.stream().forEach(this::remove);
-		_options.stream().forEach(this::remove);
-		
-		// Update stats, effect flags and icons.
-		if (update)
-		{
-			updateEffectList(broadcast);
-		}
-	}
-	
 	/**
 	 * Stops all active toggle skills.
 	 */
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 8c066bbdba..c25599f7dd 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -75,7 +75,6 @@ import org.l2jmobius.gameserver.model.Hit;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.PlayerCondOverride;
-import org.l2jmobius.gameserver.model.Spawn;
 import org.l2jmobius.gameserver.model.TeleportWhereType;
 import org.l2jmobius.gameserver.model.TimeStamp;
 import org.l2jmobius.gameserver.model.World;
@@ -1651,15 +1650,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		if (isMonster())
 		{
-			final Spawn spawn = ((Npc) this).getSpawn();
-			if ((spawn != null) && spawn.isRespawnEnabled())
-			{
-				stopAllEffects();
-			}
-			else
-			{
-				_effectList.stopAllEffectsWithoutExclusions(true, true);
-			}
+			stopAllEffects();
 		}
 		else
 		{
@@ -1710,8 +1701,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			_summoner.removeSummonedNpc(getObjectId());
 		}
 		
-		// Remove all active, passive and option effects, do not broadcast changes.
-		_effectList.stopAllEffectsWithoutExclusions(false, false);
+		// Remove all effects, do not broadcast changes.
+		_effectList.stopAllEffects(false);
 		
 		// Cancel all timers related to this Creature
 		TimersManager.getInstance().cancelTimers(getObjectId());