order item delete and order delete fixes