Remove references to run_id, not user accessible