diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java
index a9fd529ecc..0c2f5d59de 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.interfaces.IRestorable;
 import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.model.item.type.EtcItemType;
-import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
-import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
 public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
 			return;
 		}
 		deleteShortCutFromDb(old);
-		if (old.getType() == ShortcutType.ITEM)
-		{
-			final Item item = _owner.getInventory().getItemByObjectId(old.getId());
-			if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
-			{
-				_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
-			}
-		}
-		
-		_owner.sendPacket(new ShortCutInit(_owner));
-		
-		for (int shotId : _owner.getAutoSoulShot())
-		{
-			_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
-		}
 	}
 	
 	public synchronized void deleteShortCutByObjectId(int objectId)
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java
index a9fd529ecc..0c2f5d59de 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.interfaces.IRestorable;
 import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.model.item.type.EtcItemType;
-import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
-import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
 public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
 			return;
 		}
 		deleteShortCutFromDb(old);
-		if (old.getType() == ShortcutType.ITEM)
-		{
-			final Item item = _owner.getInventory().getItemByObjectId(old.getId());
-			if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
-			{
-				_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
-			}
-		}
-		
-		_owner.sendPacket(new ShortCutInit(_owner));
-		
-		for (int shotId : _owner.getAutoSoulShot())
-		{
-			_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
-		}
 	}
 	
 	public synchronized void deleteShortCutByObjectId(int objectId)
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java
index a9fd529ecc..0c2f5d59de 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.interfaces.IRestorable;
 import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.model.item.type.EtcItemType;
-import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
-import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
 public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
 			return;
 		}
 		deleteShortCutFromDb(old);
-		if (old.getType() == ShortcutType.ITEM)
-		{
-			final Item item = _owner.getInventory().getItemByObjectId(old.getId());
-			if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
-			{
-				_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
-			}
-		}
-		
-		_owner.sendPacket(new ShortCutInit(_owner));
-		
-		for (int shotId : _owner.getAutoSoulShot())
-		{
-			_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
-		}
 	}
 	
 	public synchronized void deleteShortCutByObjectId(int objectId)
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java
index a9fd529ecc..0c2f5d59de 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.interfaces.IRestorable;
 import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.model.item.type.EtcItemType;
-import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
-import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
 public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
 			return;
 		}
 		deleteShortCutFromDb(old);
-		if (old.getType() == ShortcutType.ITEM)
-		{
-			final Item item = _owner.getInventory().getItemByObjectId(old.getId());
-			if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
-			{
-				_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
-			}
-		}
-		
-		_owner.sendPacket(new ShortCutInit(_owner));
-		
-		for (int shotId : _owner.getAutoSoulShot())
-		{
-			_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
-		}
 	}
 	
 	public synchronized void deleteShortCutByObjectId(int objectId)
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java
index a9fd529ecc..0c2f5d59de 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.interfaces.IRestorable;
 import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.model.item.type.EtcItemType;
-import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
-import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
 public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
 			return;
 		}
 		deleteShortCutFromDb(old);
-		if (old.getType() == ShortcutType.ITEM)
-		{
-			final Item item = _owner.getInventory().getItemByObjectId(old.getId());
-			if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
-			{
-				_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
-			}
-		}
-		
-		_owner.sendPacket(new ShortCutInit(_owner));
-		
-		for (int shotId : _owner.getAutoSoulShot())
-		{
-			_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
-		}
 	}
 	
 	public synchronized void deleteShortCutByObjectId(int objectId)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java
index a9fd529ecc..0c2f5d59de 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.interfaces.IRestorable;
 import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.model.item.type.EtcItemType;
-import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
-import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
 public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
 			return;
 		}
 		deleteShortCutFromDb(old);
-		if (old.getType() == ShortcutType.ITEM)
-		{
-			final Item item = _owner.getInventory().getItemByObjectId(old.getId());
-			if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
-			{
-				_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
-			}
-		}
-		
-		_owner.sendPacket(new ShortCutInit(_owner));
-		
-		for (int shotId : _owner.getAutoSoulShot())
-		{
-			_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
-		}
 	}
 	
 	public synchronized void deleteShortCutByObjectId(int objectId)
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java
index a9fd529ecc..0c2f5d59de 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.interfaces.IRestorable;
 import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.model.item.type.EtcItemType;
-import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
-import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
 public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
 			return;
 		}
 		deleteShortCutFromDb(old);
-		if (old.getType() == ShortcutType.ITEM)
-		{
-			final Item item = _owner.getInventory().getItemByObjectId(old.getId());
-			if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
-			{
-				_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
-			}
-		}
-		
-		_owner.sendPacket(new ShortCutInit(_owner));
-		
-		for (int shotId : _owner.getAutoSoulShot())
-		{
-			_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
-		}
 	}
 	
 	public synchronized void deleteShortCutByObjectId(int objectId)
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java
index a9fd529ecc..0c2f5d59de 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.interfaces.IRestorable;
 import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.model.item.type.EtcItemType;
-import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
-import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
 public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
 			return;
 		}
 		deleteShortCutFromDb(old);
-		if (old.getType() == ShortcutType.ITEM)
-		{
-			final Item item = _owner.getInventory().getItemByObjectId(old.getId());
-			if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
-			{
-				_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
-			}
-		}
-		
-		_owner.sendPacket(new ShortCutInit(_owner));
-		
-		for (int shotId : _owner.getAutoSoulShot())
-		{
-			_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
-		}
 	}
 	
 	public synchronized void deleteShortCutByObjectId(int objectId)
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ShortCuts.java
index a9fd529ecc..0c2f5d59de 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.interfaces.IRestorable;
 import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.model.item.type.EtcItemType;
-import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
-import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
 public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
 			return;
 		}
 		deleteShortCutFromDb(old);
-		if (old.getType() == ShortcutType.ITEM)
-		{
-			final Item item = _owner.getInventory().getItemByObjectId(old.getId());
-			if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
-			{
-				_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
-			}
-		}
-		
-		_owner.sendPacket(new ShortCutInit(_owner));
-		
-		for (int shotId : _owner.getAutoSoulShot())
-		{
-			_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
-		}
 	}
 	
 	public synchronized void deleteShortCutByObjectId(int objectId)
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ShortCuts.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ShortCuts.java
index a9fd529ecc..0c2f5d59de 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ShortCuts.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/ShortCuts.java
@@ -30,9 +30,6 @@ import org.l2jmobius.gameserver.enums.ShortcutType;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.interfaces.IRestorable;
 import org.l2jmobius.gameserver.model.item.instance.Item;
-import org.l2jmobius.gameserver.model.item.type.EtcItemType;
-import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
-import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
 import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
 
 public class ShortCuts implements IRestorable
@@ -119,21 +116,6 @@ public class ShortCuts implements IRestorable
 			return;
 		}
 		deleteShortCutFromDb(old);
-		if (old.getType() == ShortcutType.ITEM)
-		{
-			final Item item = _owner.getInventory().getItemByObjectId(old.getId());
-			if ((item != null) && (item.getItemType() == EtcItemType.SOULSHOT) && _owner.removeAutoSoulShot(item.getId()))
-			{
-				_owner.sendPacket(new ExAutoSoulShot(item.getId(), false, 0));
-			}
-		}
-		
-		_owner.sendPacket(new ShortCutInit(_owner));
-		
-		for (int shotId : _owner.getAutoSoulShot())
-		{
-			_owner.sendPacket(new ExAutoSoulShot(shotId, true, 0));
-		}
 	}
 	
 	public synchronized void deleteShortCutByObjectId(int objectId)