Drop shipments from orders, and ensure shipment as order_id