clean up pull_client_list code as well