diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/MerchantPriceConfigTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/MerchantPriceConfigTable.java
index 0c16a63302..6f80d552c1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/MerchantPriceConfigTable.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/MerchantPriceConfigTable.java
@@ -31,7 +31,6 @@ import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
 import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance;
@@ -40,7 +39,7 @@ import org.l2jmobius.gameserver.model.siege.Castle;
 /**
  * @author KenM
  */
-public class MerchantPriceConfigTable implements InstanceListManager
+public class MerchantPriceConfigTable
 {
 	// Zoey76: TODO: Implement using IXmlReader.
 	private static final Logger LOGGER = Logger.getLogger(MerchantPriceConfigTable.class.getName());
@@ -158,7 +157,6 @@ public class MerchantPriceConfigTable implements InstanceListManager
 		return null;
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try
@@ -172,7 +170,6 @@ public class MerchantPriceConfigTable implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void updateReferences()
 	{
 		for (MerchantPriceConfig mpc : _mpcs.values())
@@ -181,11 +178,6 @@ public class MerchantPriceConfigTable implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void activateInstances()
-	{
-	}
-	
 	/**
 	 * @author KenM
 	 */
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 7b2bef71c4..c35404dda1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -295,7 +294,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -314,12 +312,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 5b5867f4ad..b165f18b65 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -25,12 +25,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -158,7 +157,6 @@ public class FortManager implements InstanceListManager
 		return _forts;
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -182,12 +180,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/MerchantPriceConfigTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/MerchantPriceConfigTable.java
index 0c16a63302..6f80d552c1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/MerchantPriceConfigTable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/MerchantPriceConfigTable.java
@@ -31,7 +31,6 @@ import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.ZoneManager;
 import org.l2jmobius.gameserver.model.actor.instance.MerchantInstance;
@@ -40,7 +39,7 @@ import org.l2jmobius.gameserver.model.siege.Castle;
 /**
  * @author KenM
  */
-public class MerchantPriceConfigTable implements InstanceListManager
+public class MerchantPriceConfigTable
 {
 	// Zoey76: TODO: Implement using IXmlReader.
 	private static final Logger LOGGER = Logger.getLogger(MerchantPriceConfigTable.class.getName());
@@ -158,7 +157,6 @@ public class MerchantPriceConfigTable implements InstanceListManager
 		return null;
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try
@@ -172,7 +170,6 @@ public class MerchantPriceConfigTable implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void updateReferences()
 	{
 		for (MerchantPriceConfig mpc : _mpcs.values())
@@ -181,11 +178,6 @@ public class MerchantPriceConfigTable implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void activateInstances()
-	{
-	}
-	
 	/**
 	 * @author KenM
 	 */
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 7b2bef71c4..c35404dda1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -37,7 +36,7 @@ import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -295,7 +294,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -314,12 +312,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 5b5867f4ad..b165f18b65 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -25,12 +25,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	protected static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -158,7 +157,6 @@ public class FortManager implements InstanceListManager
 		return _forts;
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -182,12 +180,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/InstanceListManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/InstanceListManager.java
deleted file mode 100644
index d9d0e15d12..0000000000
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/InstanceListManager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.l2jmobius.gameserver;
-
-/**
- * Interface for managers of list of instances.
- * @author fordfrog
- */
-public interface InstanceListManager
-{
-	/**
-	 * Loads instances with their data from persistent format.<br>
-	 * This method has no side effect as calling methods of another instance manager.
-	 */
-	void loadInstances();
-	
-	/**
-	 * For each loaded instance, updates references to related instances.
-	 */
-	void updateReferences();
-	
-	/**
-	 * Activates instances so their setup is performed.
-	 */
-	void activateInstances();
-}
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 2618c1b7b1..39b4c90775 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -28,7 +28,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
@@ -36,7 +35,7 @@ import org.l2jmobius.gameserver.model.clan.ClanMember;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.siege.Castle;
 
-public class CastleManager implements InstanceListManager
+public class CastleManager
 {
 	private static final Logger LOGGER = Logger.getLogger(CastleManager.class.getName());
 	
@@ -211,7 +210,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -231,12 +229,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Castle castle : _castles.values())
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 767c90e4ba..35d040c9bb 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -26,12 +26,11 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.InstanceListManager;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.siege.Fort;
 
-public class FortManager implements InstanceListManager
+public class FortManager
 {
 	private static final Logger LOGGER = Logger.getLogger(FortManager.class.getName());
 	
@@ -119,7 +118,6 @@ public class FortManager implements InstanceListManager
 		return _forts.values();
 	}
 	
-	@Override
 	public void loadInstances()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
@@ -144,12 +142,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@Override
-	public void updateReferences()
-	{
-	}
-	
-	@Override
 	public void activateInstances()
 	{
 		for (Fort fort : _forts.values())