diff --git a/net/socket/recvmsg.c b/net/socket/recvmsg.c
index 2f8e98c589..d9fb7159e8 100644
--- a/net/socket/recvmsg.c
+++ b/net/socket/recvmsg.c
@@ -103,45 +103,6 @@ ssize_t psock_recvmsg(FAR struct socket *psock, FAR struct msghdr *msg,
   return psock->s_sockif->si_recvmsg(psock, msg, flags);
 }
 
-/****************************************************************************
- * Name: nx_recvmsg
- *
- * Description:
- *   nx_recvmsg() receives messages from a socket, and may be used to
- *   receive data on a socket whether or not it is connection-oriented.
- *   This is an internal OS interface.  It is functionally equivalent to
- *   recvmsg() except that:
- *
- *   - It is not a cancellation point, and
- *   - It does not modify the errno variable.
- *
- * Input Parameters:
- *   sockfd  - Socket descriptor of socket
- *   msg      Buffer to receive the message
- *   flags   - Receive flags
- *
- * Returned Value:
- *   On success, returns the number of characters received.  If no data is
- *   available to be received and the peer has performed an orderly shutdown,
- *   nx_recvmsg() will return 0.  Otherwise, on any failure, a negated errno
- *   value is returned (see comments with recvmsg() for a list of appropriate
- *   errno values).
- *
- ****************************************************************************/
-
-ssize_t nx_recvmsg(int sockfd, FAR struct msghdr *msg, int flags)
-{
-  FAR struct socket *psock;
-
-  /* Get the underlying socket structure */
-
-  psock = sockfd_socket(sockfd);
-
-  /* Then let psock_recvmsg() do all of the work */
-
-  return psock_recvmsg(psock, msg, flags);
-}
-
 /****************************************************************************
  * Function: recvmsg
  *
@@ -187,18 +148,23 @@ ssize_t nx_recvmsg(int sockfd, FAR struct msghdr *msg, int flags)
 
 ssize_t recvmsg(int sockfd, FAR struct msghdr *msg, int flags)
 {
+  FAR struct socket *psock;
   ssize_t ret;
 
   /* recvmsg() is a cancellation point */
 
   enter_cancellation_point();
 
-  /* Let nx_recvmsg() do all of the work */
+  /* Get the underlying socket structure */
 
-  ret = nx_recvmsg(sockfd, msg, flags);
+  psock = sockfd_socket(sockfd);
+
+  /* Then let psock_recvmsg() do all of the work */
+
+  ret = psock_recvmsg(psock, msg, flags);
   if (ret < 0)
     {
-      _SO_SETERRNO(sockfd_socket(sockfd), -ret);
+      _SO_SETERRNO(psock, -ret);
       ret = ERROR;
     }
 
diff --git a/net/socket/sendmsg.c b/net/socket/sendmsg.c
index 714baa76c1..868054fa94 100644
--- a/net/socket/sendmsg.c
+++ b/net/socket/sendmsg.c
@@ -93,45 +93,6 @@ ssize_t psock_sendmsg(FAR struct socket *psock, FAR struct msghdr *msg,
   return psock->s_sockif->si_sendmsg(psock, msg, flags);
 }
 
-/****************************************************************************
- * Name: nx_sendmsg
- *
- * Description:
- *   nx_sendmsg() receives messages from a socket, and may be used to
- *   receive data on a socket whether or not it is connection-oriented.
- *   This is an internal OS interface.  It is functionally equivalent to
- *   sendmsg() except that:
- *
- *   - It is not a cancellation point, and
- *   - It does not modify the errno variable.
- *
- * Input Parameters:
- *   sockfd   Socket descriptor of socket
- *   msg      Buffer to receive the message
- *   flags    Receive flags
- *
- * Returned Value:
- *   On success, returns the number of characters sent.  If no data is
- *   available to be received and the peer has performed an orderly shutdown,
- *   sendmsg() will return 0. Otherwise, on any failure, a negated errno
- *   value is returned (see comments with sendmsg() for a list of appropriate
- *   errno values).
- *
- ****************************************************************************/
-
-ssize_t nx_sendmsg(int sockfd, FAR struct msghdr *msg, int flags)
-{
-  FAR struct socket *psock;
-
-  /* Get the underlying socket structure */
-
-  psock = sockfd_socket(sockfd);
-
-  /* Then let psock_sendmsg() do all of the work */
-
-  return psock_sendmsg(psock, msg, flags);
-}
-
 /****************************************************************************
  * Function: sendmsg
  *
@@ -177,18 +138,23 @@ ssize_t nx_sendmsg(int sockfd, FAR struct msghdr *msg, int flags)
 
 ssize_t sendmsg(int sockfd, FAR struct msghdr *msg, int flags)
 {
+  FAR struct socket *psock;
   ssize_t ret;
 
   /* sendmsg() is a cancellation point */
 
   enter_cancellation_point();
 
-  /* Let psock_sendmsg() do all of the work */
+  /* Get the underlying socket structure */
 
-  ret = nx_sendmsg(sockfd, msg, flags);
+  psock = sockfd_socket(sockfd);
+
+  /* Then let psock_sendmsg() do all of the work */
+
+  ret = psock_sendmsg(psock, msg, flags);
   if (ret < 0)
     {
-      _SO_SETERRNO(sockfd_socket(sockfd), -ret);
+      _SO_SETERRNO(psock, -ret);
       ret = ERROR;
     }