remove the shipments here as well