diff --git a/libraries/libwhb/include/whb/commandserver.h b/libraries/libwhb/include/whb/commandserver.h
deleted file mode 100644
index 59f5d3f..0000000
--- a/libraries/libwhb/include/whb/commandserver.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-#include <wut.h>
-
-/**
- * \defgroup whb_commandserver Network Command Server
- * \ingroup whb
- * @{
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define WHB_SERVER_BUFFER_SIZE 1024
-
-BOOL
-WHBCommandServerInit();
-
-void
-WHBCommandServerStop();
-
-BOOL
-WHBCommandServerListen(char * stringLocation);
-
-#ifdef __cplusplus
-}
-#endif
-
-/** @} */
diff --git a/libraries/libwhb/src/commandserver.c b/libraries/libwhb/src/commandserver.c
deleted file mode 100644
index 76a23af..0000000
--- a/libraries/libwhb/src/commandserver.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include <nsysnet/socket.h>
-#include <whb/commandserver.h>
-#include <whb/libmanager.h>
-#include <whb/log.h>
-
-#include <string.h>
-
-#define SERVER_PORT 4406
-
-int
-sSocket = -1;
-
-int
-sClient = -1;
-
-struct sockaddr_in
-sAddr;
-
-static inline void
-closeSocket(const char * funcName)
-{
-   int ret = socketclose(sSocket);
-   if(ret < 0) {
-      WHBLogPrintf("%s: Error occurred closing socket: %d", funcName, socketlasterr());
-   }
-   else {
-      sSocket = -1;
-   }
-}
-
-static inline void
-closeClient(const char * funcName)
-{
-   int ret = socketclose(sClient);
-   if(ret < 0) {
-      WHBLogPrintf("%s: Error occurred closing client socket: %d", funcName, socketlasterr());
-   }
-   else {
-      sClient = -1;
-   }
-}
-
-BOOL
-WHBCommandServerInit()
-{
-   int ret = 0;
-
-   if(sSocket >= 0) {
-      WHBLogPrintf("%s: Command server is already running.", __FUNCTION__);
-      return TRUE;
-   }
-
-   WHBInitializeSocketLibrary();
-
-   sSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-   if(sSocket < 0) {
-      WHBLogPrintf("%s: Error occurred while creating socket: %d", __FUNCTION__, socketlasterr());
-      sSocket = -1;
-      return FALSE;
-   }
-
-   memset(&sAddr, 0, sizeof(struct sockaddr_in));
-   sAddr.sin_family = AF_INET;
-   sAddr.sin_port = htons(SERVER_PORT);
-   sAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-
-   ret = bind(sSocket, (struct sockaddr *)&sAddr, sizeof(struct sockaddr_in));
-   if(ret < 0) {
-      WHBLogPrintf("%s: Error occurred while binding to socket: %d", __FUNCTION__, socketlasterr());
-      closeSocket(__FUNCTION__);
-      return FALSE;
-   }
-
-   ret = listen(sSocket, 3);
-   if(ret < 0) {
-      WHBLogPrintf("%s: Error occurred while setting socket to listen mode: %d", __FUNCTION__, socketlasterr());
-      closeSocket(__FUNCTION__);
-      return FALSE;
-   }
-
-   return TRUE;
-}
-
-void
-WHBCommandServerStop()
-{
-   if(sSocket < 0) {
-      WHBLogPrintf("%s: Socket is already closed.", __FUNCTION__);
-      return;
-   }
-
-   if(sClient >= 0) {
-      closeClient(__FUNCTION__);
-   }
-   closeSocket(__FUNCTION__);
-   WHBDeinitializeSocketLibrary();
-}
-
-BOOL
-WHBCommandServerListen(char * stringLocation)
-{
-   char buffer[WHB_SERVER_BUFFER_SIZE];
-   memset(buffer, 0, WHB_SERVER_BUFFER_SIZE);
-
-   int ret;
-   struct sockaddr_in sClientAddr;
-   socklen_t sClientAddrLen = sizeof(struct sockaddr_in);
-
-   if(sSocket < 0) {
-      WHBLogPrintf("%s: Socket is not open. Please run WHBCommandServerInit() first.", __FUNCTION__);
-      return FALSE;
-   }
-
-   if(sClient < 0) {
-      sClient = accept(sSocket, (struct sockaddr *)&sClientAddr, &sClientAddrLen);
-      if(sClient < 0) {
-         WHBLogPrintf("%s: Error occurred while accepting a client connection: %d", __FUNCTION__, socketlasterr());
-         return FALSE;
-      }
-   }
-
-   ret = recv(sClient, buffer, WHB_SERVER_BUFFER_SIZE, 0);
-   if(ret < 0) {
-      WHBLogPrintf("%s: Error occurred while receiving data from client: %d", __FUNCTION__, socketlasterr());
-      closeClient(__FUNCTION__);
-      return FALSE;
-   }
-   if(ret == 0) {
-      WHBLogPrintf("%s: Remote socket was closed. Closing client connection...", __FUNCTION__);
-      closeClient(__FUNCTION__);
-      return FALSE;
-   }
-
-   memcpy(stringLocation, buffer, WHB_SERVER_BUFFER_SIZE);
-   return TRUE;
-}