Adjusting orders to have single shipment and removing return logic