remove address finding in client