diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32478-1.htm b/L2J_DataPack_BETA/dist/game/data/html/warehouse/32478-1.htm
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/html/default/32478-1.htm
rename to L2J_DataPack_BETA/dist/game/data/html/warehouse/32478-1.htm
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32478.htm b/L2J_DataPack_BETA/dist/game/data/html/warehouse/32478.htm
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/html/default/32478.htm
rename to L2J_DataPack_BETA/dist/game/data/html/warehouse/32478.htm
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java
index 5fdb099ad0acea516c711a1def742cf760c79279..259e8871f6e112aaff653cfe0ccc71ba6fc3b37e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java
@@ -28,6 +28,7 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2ClanHallManagerInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2WarehouseInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -147,6 +148,13 @@ public class ClanWarehouse implements IBypassHandler
 			return;
 		}
 		
+		for (L2ItemInstance i : player.getActiveWarehouse().getItems())
+		{
+			if (i.isTimeLimitedItem() && (i.getRemainingTime() <= 0))
+			{
+				player.getActiveWarehouse().destroyItem("L2ItemInstance", i, player, null);
+			}
+		}
 		if (itemtype != null)
 		{
 			player.sendPacket(new SortedWareHouseWithdrawalList(player, WareHouseWithdrawalList.CLAN, itemtype, sortorder));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Freight.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Freight.java
index 37858d53ebc96c88d20b13d34c03937d3caa0d3a..17e50d9a06dfe2adfbe370481cf1c8a45e952b02 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Freight.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Freight.java
@@ -22,6 +22,7 @@ import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.PcFreight;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.PackageToList;
 import com.l2jserver.gameserver.network.serverpackets.WareHouseWithdrawalList;
@@ -53,6 +54,13 @@ public class Freight implements IBypassHandler
 				if (freight.getSize() > 0)
 				{
 					activeChar.setActiveWarehouse(freight);
+					for (L2ItemInstance i : activeChar.getActiveWarehouse().getItems())
+					{
+						if (i.isTimeLimitedItem() && (i.getRemainingTime() <= 0))
+						{
+							activeChar.getActiveWarehouse().destroyItem("L2ItemInstance", i, activeChar, null);
+						}
+					}
 					activeChar.sendPacket(new WareHouseWithdrawalList(activeChar, WareHouseWithdrawalList.FREIGHT));
 				}
 				else
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/npcs/32400-32500.xml b/L2J_DataPack_BETA/dist/game/data/stats/npcs/32400-32500.xml
index c999388a1831a2fce8d6b44f03ccdcf0684b65b6..3356c1a929d4dce8234075dad56362ee29b261cc 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/npcs/32400-32500.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/npcs/32400-32500.xml
@@ -2643,7 +2643,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="32478" level="70" type="L2Npc" name="Dimensional Merchant" title="Life Energy">
+	<npc id="32478" level="70" type="L2Warehouse" name="Dimensional Merchant" title="Life Energy">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>