correctly remove current remote when resolving socks target