diff --git a/features/net/network-socket/NetworkStack.cpp b/features/net/network-socket/NetworkStack.cpp
index 5d8348c3d5..b9c39afd7c 100644
--- a/features/net/network-socket/NetworkStack.cpp
+++ b/features/net/network-socket/NetworkStack.cpp
@@ -24,14 +24,7 @@
 // Default NetworkStack operations
 int NetworkStack::gethostbyname(SocketAddress *address, const char *name)
 {
-    nsapi_addr_t addr;
-    int err = nsapi_dns_query(this, &addr, name);
-    if (err) {
-        return err;
-    }
-
-    address->set_addr(addr);
-    return 0;
+    return nsapi_dns_query(this, address, name);
 }
 
 int NetworkStack::setstackopt(int level, int optname, const void *optval, unsigned optlen)
diff --git a/features/net/network-socket/nsapi_dns.cpp b/features/net/network-socket/nsapi_dns.cpp
index 553ba88f9f..78eff0f1c8 100644
--- a/features/net/network-socket/nsapi_dns.cpp
+++ b/features/net/network-socket/nsapi_dns.cpp
@@ -176,7 +176,7 @@ static int dns_scan_response(const uint8_t **p, nsapi_addr_t *addr, unsigned add
 }
 
 // core query function
-int nsapi_dns_query_multiple(NetworkStack *stack,
+static int nsapi_dns_query_multiple(NetworkStack *stack,
         nsapi_addr_t *addr, unsigned addr_count,
         const char *host, nsapi_version_t version)
 {
@@ -299,13 +299,6 @@ int nsapi_dns_query(nsapi_stack_t *stack,
     return (result > 0) ? 0 : result;
 }
 
-int nsapi_dns_query(NetworkStack *stack,
-        nsapi_addr_t *addr, const char *host, nsapi_version_t version)
-{
-    int result = nsapi_dns_query_multiple(stack, addr, 1, host, version);
-    return (result > 0) ? 0 : result;
-}
-
 int nsapi_dns_query(NetworkStack *stack,
         SocketAddress *address, const char *host, nsapi_version_t version)
 {
diff --git a/features/net/network-socket/nsapi_dns.h b/features/net/network-socket/nsapi_dns.h
index 53a20d6bcc..11f9541519 100644
--- a/features/net/network-socket/nsapi_dns.h
+++ b/features/net/network-socket/nsapi_dns.h
@@ -37,18 +37,9 @@ int nsapi_dns_query(nsapi_stack_t *stack, nsapi_addr_t *addr,
 #ifdef __cplusplus
 int nsapi_dns_query(nsapi_stack_t *stack, nsapi_addr_t *addr,
         const char *host);
-int nsapi_dns_query(NetworkStack *stack, nsapi_addr_t *addr,
-        const char *host, nsapi_version_t version = NSAPI_IPv4);
 int nsapi_dns_query(NetworkStack *stack, SocketAddress *addr,
         const char *host, nsapi_version_t version = NSAPI_IPv4);
 
-template <typename S>
-int nsapi_dns_query(S *stack, nsapi_addr_t *addr,
-        const char *host, nsapi_version_t version = NSAPI_IPv4)
-{
-    return nsapi_dns_query(nsapi_create_stack(stack), addr, host, version);
-}
-
 template <typename S>
 int nsapi_dns_query(S *stack, SocketAddress *addr,
         const char *host, nsapi_version_t version = NSAPI_IPv4)
@@ -77,22 +68,10 @@ int nsapi_dns_query_multiple(nsapi_stack_t *stack,
 int nsapi_dns_query_multiple(nsapi_stack_t *stack,
         nsapi_addr_t *addr, unsigned addr_count,
         const char *host);
-int nsapi_dns_query_multiple(NetworkStack *stack,
-        nsapi_addr_t *addr, unsigned addr_count,
-        const char *host, nsapi_version_t version = NSAPI_IPv4);
 int nsapi_dns_query_multiple(NetworkStack *stack,
         SocketAddress *addr, unsigned addr_count,
         const char *host, nsapi_version_t version = NSAPI_IPv4);
 
-template <typename S>
-int nsapi_dns_query_multiple(S *stack,
-        nsapi_addr_t *addr, unsigned addr_count,
-        const char *host, nsapi_version_t version = NSAPI_IPv4)
-{
-    return nsapi_dns_query_multiple(nsapi_create_stack(stack),
-                addr, addr_count, host, version);
-}
-
 template <typename S>
 int nsapi_dns_query_multiple(S *stack,
         SocketAddress *addr, unsigned addr_count,