Remove remaining order_id from queries