resolve_addr() was removed from core
Use new public api
Remove duplicated function resolve_addr
Remove unused global variable