Remove run_id stuff from iterator
s/run_id/run_token/