diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java
index 66a500e169..a827b0d639 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -35,7 +35,6 @@ import org.l2jmobius.gameserver.LoginServerThread.SessionKey;
 import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.model.CharSelectInfoPackage;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -63,8 +62,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -91,15 +88,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -121,7 +112,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java
index fbcbf71a38..6adac77a9d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/GameClient.java
@@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.data.sql.impl.CharNameTable;
 import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import org.l2jmobius.gameserver.data.xml.impl.SecondaryAuthData;
 import org.l2jmobius.gameserver.enums.CharacterDeleteFailType;
-import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CommissionManager;
 import org.l2jmobius.gameserver.instancemanager.MailManager;
 import org.l2jmobius.gameserver.instancemanager.MentorManager;
@@ -68,8 +67,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	protected static final Logger LOGGER = Logger.getLogger(GameClient.class.getName());
 	protected static final Logger LOGGER_ACCOUNTING = Logger.getLogger("accounting");
 	
-	private final int _objectId;
-	
 	// Info
 	private InetAddress _addr;
 	private Channel _channel;
@@ -96,15 +93,9 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 	
 	public GameClient()
 	{
-		_objectId = IdFactory.getInstance().getNextId();
 		_crypt = new Crypt(this);
 	}
 	
-	public int getObjectId()
-	{
-		return _objectId;
-	}
-	
 	@Override
 	public void channelActive(ChannelHandlerContext ctx)
 	{
@@ -126,7 +117,6 @@ public class GameClient extends ChannelInboundHandler<GameClient>
 		
 		if ((_player == null) || !_player.isInOfflineMode())
 		{
-			IdFactory.getInstance().releaseId(getObjectId());
 			Disconnection.of(this).onDisconnection();
 		}
 	}