Remove order_id field from tables