Remove order_id from queries