diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
index 0b96b92d67..f88260f46a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
@@ -322,26 +322,6 @@ public class OfflineTradersTable
 		}
 	}
 	
-	public static synchronized void removeTrader(int traderObjId)
-	{
-		try (Connection con = DatabaseFactory.getInstance().getConnection();
-			PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
-			PreparedStatement stm2 = con.prepareStatement(CLEAR_OFFLINE_TABLE_PLAYER))
-		{
-			stm1.setInt(1, traderObjId);
-			stm1.execute();
-			stm1.close();
-			
-			stm2.setInt(1, traderObjId);
-			stm2.execute();
-			stm2.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "OfflineTradersTable[onTransaction()]: Error while removing offline trader: " + traderObjId + " " + e, e);
-		}
-	}
-	
 	public static synchronized void onTransaction(L2PcInstance trader, boolean finished, boolean firstCall)
 	{
 		try (Connection con = DatabaseFactory.getInstance().getConnection();
@@ -464,6 +444,26 @@ public class OfflineTradersTable
 		}
 	}
 	
+	public static synchronized void removeTrader(int traderObjId)
+	{
+		try (Connection con = DatabaseFactory.getInstance().getConnection();
+			PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
+			PreparedStatement stm2 = con.prepareStatement(CLEAR_OFFLINE_TABLE_PLAYER))
+		{
+			stm1.setInt(1, traderObjId);
+			stm1.execute();
+			stm1.close();
+			
+			stm2.setInt(1, traderObjId);
+			stm2.execute();
+			stm2.close();
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "OfflineTradersTable[removeTrader()]: Error while removing offline trader: " + traderObjId + " " + e, e);
+		}
+	}
+	
 	/**
 	 * Gets the single instance of OfflineTradersTable.
 	 * @return single instance of OfflineTradersTable
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
index 0b96b92d67..f88260f46a 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
@@ -322,26 +322,6 @@ public class OfflineTradersTable
 		}
 	}
 	
-	public static synchronized void removeTrader(int traderObjId)
-	{
-		try (Connection con = DatabaseFactory.getInstance().getConnection();
-			PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
-			PreparedStatement stm2 = con.prepareStatement(CLEAR_OFFLINE_TABLE_PLAYER))
-		{
-			stm1.setInt(1, traderObjId);
-			stm1.execute();
-			stm1.close();
-			
-			stm2.setInt(1, traderObjId);
-			stm2.execute();
-			stm2.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "OfflineTradersTable[onTransaction()]: Error while removing offline trader: " + traderObjId + " " + e, e);
-		}
-	}
-	
 	public static synchronized void onTransaction(L2PcInstance trader, boolean finished, boolean firstCall)
 	{
 		try (Connection con = DatabaseFactory.getInstance().getConnection();
@@ -464,6 +444,26 @@ public class OfflineTradersTable
 		}
 	}
 	
+	public static synchronized void removeTrader(int traderObjId)
+	{
+		try (Connection con = DatabaseFactory.getInstance().getConnection();
+			PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
+			PreparedStatement stm2 = con.prepareStatement(CLEAR_OFFLINE_TABLE_PLAYER))
+		{
+			stm1.setInt(1, traderObjId);
+			stm1.execute();
+			stm1.close();
+			
+			stm2.setInt(1, traderObjId);
+			stm2.execute();
+			stm2.close();
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "OfflineTradersTable[removeTrader()]: Error while removing offline trader: " + traderObjId + " " + e, e);
+		}
+	}
+	
 	/**
 	 * Gets the single instance of OfflineTradersTable.
 	 * @return single instance of OfflineTradersTable
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
index 0b96b92d67..f88260f46a 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
@@ -322,26 +322,6 @@ public class OfflineTradersTable
 		}
 	}
 	
-	public static synchronized void removeTrader(int traderObjId)
-	{
-		try (Connection con = DatabaseFactory.getInstance().getConnection();
-			PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
-			PreparedStatement stm2 = con.prepareStatement(CLEAR_OFFLINE_TABLE_PLAYER))
-		{
-			stm1.setInt(1, traderObjId);
-			stm1.execute();
-			stm1.close();
-			
-			stm2.setInt(1, traderObjId);
-			stm2.execute();
-			stm2.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "OfflineTradersTable[onTransaction()]: Error while removing offline trader: " + traderObjId + " " + e, e);
-		}
-	}
-	
 	public static synchronized void onTransaction(L2PcInstance trader, boolean finished, boolean firstCall)
 	{
 		try (Connection con = DatabaseFactory.getInstance().getConnection();
@@ -464,6 +444,26 @@ public class OfflineTradersTable
 		}
 	}
 	
+	public static synchronized void removeTrader(int traderObjId)
+	{
+		try (Connection con = DatabaseFactory.getInstance().getConnection();
+			PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
+			PreparedStatement stm2 = con.prepareStatement(CLEAR_OFFLINE_TABLE_PLAYER))
+		{
+			stm1.setInt(1, traderObjId);
+			stm1.execute();
+			stm1.close();
+			
+			stm2.setInt(1, traderObjId);
+			stm2.execute();
+			stm2.close();
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "OfflineTradersTable[removeTrader()]: Error while removing offline trader: " + traderObjId + " " + e, e);
+		}
+	}
+	
 	/**
 	 * Gets the single instance of OfflineTradersTable.
 	 * @return single instance of OfflineTradersTable
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
index 03ffb776af..e7563f63bd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
@@ -284,26 +284,6 @@ public class OfflineTradersTable
 		}
 	}
 	
-	public static synchronized void removeTrader(int traderObjId)
-	{
-		try (Connection con = DatabaseFactory.getInstance().getConnection();
-			PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
-			PreparedStatement stm2 = con.prepareStatement(CLEAR_OFFLINE_TABLE_PLAYER))
-		{
-			stm1.setInt(1, traderObjId);
-			stm1.execute();
-			stm1.close();
-			
-			stm2.setInt(1, traderObjId);
-			stm2.execute();
-			stm2.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "OfflineTradersTable[onTransaction()]: Error while removing offline trader: " + traderObjId + " " + e, e);
-		}
-	}
-	
 	public static synchronized void onTransaction(L2PcInstance trader, boolean finished, boolean firstCall)
 	{
 		try (Connection con = DatabaseFactory.getInstance().getConnection();
@@ -411,6 +391,26 @@ public class OfflineTradersTable
 		}
 	}
 	
+	public static synchronized void removeTrader(int traderObjId)
+	{
+		try (Connection con = DatabaseFactory.getInstance().getConnection();
+			PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
+			PreparedStatement stm2 = con.prepareStatement(CLEAR_OFFLINE_TABLE_PLAYER))
+		{
+			stm1.setInt(1, traderObjId);
+			stm1.execute();
+			stm1.close();
+			
+			stm2.setInt(1, traderObjId);
+			stm2.execute();
+			stm2.close();
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "OfflineTradersTable[removeTrader()]: Error while removing offline trader: " + traderObjId + " " + e, e);
+		}
+	}
+	
 	/**
 	 * Gets the single instance of OfflineTradersTable.
 	 * @return single instance of OfflineTradersTable
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
index 0b96b92d67..f88260f46a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/OfflineTradersTable.java
@@ -322,26 +322,6 @@ public class OfflineTradersTable
 		}
 	}
 	
-	public static synchronized void removeTrader(int traderObjId)
-	{
-		try (Connection con = DatabaseFactory.getInstance().getConnection();
-			PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
-			PreparedStatement stm2 = con.prepareStatement(CLEAR_OFFLINE_TABLE_PLAYER))
-		{
-			stm1.setInt(1, traderObjId);
-			stm1.execute();
-			stm1.close();
-			
-			stm2.setInt(1, traderObjId);
-			stm2.execute();
-			stm2.close();
-		}
-		catch (Exception e)
-		{
-			LOGGER.log(Level.WARNING, "OfflineTradersTable[onTransaction()]: Error while removing offline trader: " + traderObjId + " " + e, e);
-		}
-	}
-	
 	public static synchronized void onTransaction(L2PcInstance trader, boolean finished, boolean firstCall)
 	{
 		try (Connection con = DatabaseFactory.getInstance().getConnection();
@@ -464,6 +444,26 @@ public class OfflineTradersTable
 		}
 	}
 	
+	public static synchronized void removeTrader(int traderObjId)
+	{
+		try (Connection con = DatabaseFactory.getInstance().getConnection();
+			PreparedStatement stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS_PLAYER);
+			PreparedStatement stm2 = con.prepareStatement(CLEAR_OFFLINE_TABLE_PLAYER))
+		{
+			stm1.setInt(1, traderObjId);
+			stm1.execute();
+			stm1.close();
+			
+			stm2.setInt(1, traderObjId);
+			stm2.execute();
+			stm2.close();
+		}
+		catch (Exception e)
+		{
+			LOGGER.log(Level.WARNING, "OfflineTradersTable[removeTrader()]: Error while removing offline trader: " + traderObjId + " " + e, e);
+		}
+	}
+	
 	/**
 	 * Gets the single instance of OfflineTradersTable.
 	 * @return single instance of OfflineTradersTable