client id return routine removal