remove extra logic, check for valid shipment