diff --git a/reactos/base/system/smss/smapi.c b/reactos/base/system/smss/smapi.c
index df9e0c777bb..53595d751e4 100644
--- a/reactos/base/system/smss/smapi.c
+++ b/reactos/base/system/smss/smapi.c
@@ -285,49 +285,6 @@ SmpHandleConnectionRequest (PSM_PORT_MESSAGE Request)
 	return Status;
 }
 
-/**********************************************************************
- * NAME
- * 	SmpApiThread/1
- *
- * DECRIPTION
- * 	Due to differences in LPC implementation between NT and ROS,
- * 	we need a thread to listen to for connection request that
- * 	creates a new thread for each connected port. This is not
- * 	necessary in NT LPC, because server side connected ports are
- * 	never used to receive requests.
- */
-#if 0
-VOID NTAPI
-SmpApiThread (HANDLE ListeningPort)
-{
-	NTSTATUS	Status = STATUS_SUCCESS;
-	SM_PORT_MESSAGE	Request;
-
-	DPRINT("SM: %s called\n", __FUNCTION__);
-    RtlZeroMemory(&Request, sizeof(PORT_MESSAGE));
-
-	while (TRUE)
-	{
-		Status = NtListenPort (ListeningPort, & Request.Header);
-		if (!NT_SUCCESS(Status))
-		{
-			DPRINT1("SM: %s: NtListenPort() failed! (Status==x%08lx)\n", __FUNCTION__, Status);
-			break;
-		}
-		Status = SmpHandleConnectionRequest (& Request);
-		if(!NT_SUCCESS(Status))
-		{
-			DPRINT1("SM: %s: SmpHandleConnectionRequest failed (Status=0x%08lx)\n",
-				__FUNCTION__, Status);
-			break;
-		}
-	}
-	/* Cleanup */
-	NtClose(ListeningPort);
-	/* DIE */
-	NtTerminateThread(NtCurrentThread(), Status);
-}
-#endif
 
 /* LPC PORT INITIALIZATION **************************************************/
 
@@ -360,6 +317,7 @@ SmCreateApiPort(VOID)
     {
       return(Status);
     }
+
   /*
    * Create one thread for the named LPC
    * port \SmApiPort
diff --git a/reactos/subsystems/win32/csrss/api/wapi.c b/reactos/subsystems/win32/csrss/api/wapi.c
index db10d67dd56..50e2fef3c85 100644
--- a/reactos/subsystems/win32/csrss/api/wapi.c
+++ b/reactos/subsystems/win32/csrss/api/wapi.c
@@ -300,51 +300,6 @@ ClientConnectionThread(HANDLE ServerPort)
     RtlExitUserThread(STATUS_SUCCESS);
 }
 
-/**********************************************************************
- * NAME
- *	ServerApiPortThread/1
- *
- * DESCRIPTION
- * 	Handle connection requests from clients to the port
- * 	"\Windows\ApiPort".
- */
-#if 0
-DWORD WINAPI
-ServerApiPortThread (HANDLE hApiListenPort)
-{
-    NTSTATUS Status = STATUS_SUCCESS;
-    BYTE RawRequest[sizeof(PORT_MESSAGE) + sizeof(CSR_CONNECTION_INFO)];
-    PPORT_MESSAGE Request = (PPORT_MESSAGE)RawRequest;
-
-    DPRINT("CSR: %s called", __FUNCTION__);
-
-    for (;;)
-    {
-         REMOTE_PORT_VIEW LpcRead;
-         LpcRead.Length = sizeof(LpcRead);
-
-         Status = NtListenPort (hApiListenPort, Request);
-         if (!NT_SUCCESS(Status))
-         {
-             DPRINT1("CSR: NtListenPort() failed, status=%x\n", Status);
-             break;
-         }
-
-         Status = CsrpHandleConnectionRequest(Request, hApiListenPort);
-         if(!NT_SUCCESS(Status))
-         {
-             DPRINT1("CSR: %s: SmpHandleConnectionRequest failed (Status=0x%08lx)\n",
-                     __FUNCTION__, Status);
-             break;
-         }
-    }
-
-    NtClose(hApiListenPort);
-    NtTerminateThread(NtCurrentThread(), Status);
-    return 0;
-}
-#endif
-
 /**********************************************************************
  * NAME
  *	ServerSbApiPortThread/1