Remove duplicate setting of order on a shipment