diff --git a/src/engine/net/client/handlers/ItemProductionMsgHandler.java b/src/engine/net/client/handlers/ItemProductionMsgHandler.java
index 48a7eea7..3ea16423 100644
--- a/src/engine/net/client/handlers/ItemProductionMsgHandler.java
+++ b/src/engine/net/client/handlers/ItemProductionMsgHandler.java
@@ -146,14 +146,6 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
             ForgeManager.itemWorkOrderLookup.remove(virtualItem);
             DbManager.removeFromCache(virtualItem);
 
-            // WorkOrder exists until all items are completed or junked
-            // this is to hold a reference to the virtual item for serialization (NPCMsgHandler)
-
-            workOrder.slots_used = workOrder.slots_used - 1;
-
-            if (workOrder.slots_used == 0)
-                ForgeManager.vendorWorkOrderLookup.get(workOrder.vendor).remove(workOrder);
-
             // Persist item and add to vendor inventory
 
             Item completedItem = DbManager.ItemQueries.PERSIST(virtualItem);
@@ -400,9 +392,6 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
 
             workOrder.slots_used = workOrder.slots_used - 1;
 
-            if (workOrder.slots_used == 0)
-                ForgeManager.vendorWorkOrderLookup.get(workOrder.vendor).remove(workOrder);
-
             // Refresh vendor's inventory to client
 
             outMsg = new ManageNPCMsg(vendor);