diff --git a/engine/server/application/CentralServer/src/linux/main.cpp b/engine/server/application/CentralServer/src/linux/main.cpp
index f7eeb540..01310248 100755
--- a/engine/server/application/CentralServer/src/linux/main.cpp
+++ b/engine/server/application/CentralServer/src/linux/main.cpp
@@ -12,18 +12,10 @@
 #include "sharedRandom/SetupSharedRandom.h"
 #include "sharedThread/SetupSharedThread.h"
 
-#ifndef STELLA_INTERNAL
-#include "webAPIHeartbeat.h"
-#endif
-
 // ======================================================================
 
 int main(int argc, char ** argv)
 {
-#ifndef STELLA_INTERNAL
-	StellaBellum::webAPIHeartbeat();
-#endif
-
 	SetupSharedThread::install();
 	SetupSharedDebug::install(1024);
 
diff --git a/engine/server/application/ConnectionServer/src/linux/main.cpp b/engine/server/application/ConnectionServer/src/linux/main.cpp
index 0bc0d1a3..f002559c 100755
--- a/engine/server/application/ConnectionServer/src/linux/main.cpp
+++ b/engine/server/application/ConnectionServer/src/linux/main.cpp
@@ -12,10 +12,6 @@
 #include "sharedRandom/SetupSharedRandom.h"
 #include "sharedThread/SetupSharedThread.h"
 
-#ifndef STELLA_INTERNAL
-#include "webAPIHeartbeat.h"
-#endif
-
 // ======================================================================
 
 void dumpPid(const char * argv)
@@ -29,10 +25,6 @@ void dumpPid(const char * argv)
 
 int main(int argc, char ** argv)
 {
-#ifndef STELLA_INTERNAL
-	StellaBellum::webAPIHeartbeat();
-#endif
-
 	SetupSharedThread::install();
 	SetupSharedDebug::install(1024);
 
diff --git a/engine/server/application/LogServer/src/linux/main.cpp b/engine/server/application/LogServer/src/linux/main.cpp
index 5fe224ec..5346cbe6 100755
--- a/engine/server/application/LogServer/src/linux/main.cpp
+++ b/engine/server/application/LogServer/src/linux/main.cpp
@@ -17,17 +17,10 @@
 #include "sharedNetworkMessages/SetupSharedNetworkMessages.h"
 #include "sharedThread/SetupSharedThread.h"
 
-#ifndef STELLA_INTERNAL
-#include "webAPIHeartbeat.h"
-#endif
 // ======================================================================
 
 int main(int argc, char **argv)
 {
-#ifndef STELLA_INTERNAL
-	StellaBellum::webAPIHeartbeat();
-#endif
-
 	SetupSharedThread::install();
 	SetupSharedDebug::install(1024);
 
diff --git a/engine/server/application/PlanetServer/src/linux/main.cpp b/engine/server/application/PlanetServer/src/linux/main.cpp
index fff64b5e..8cdb46bc 100755
--- a/engine/server/application/PlanetServer/src/linux/main.cpp
+++ b/engine/server/application/PlanetServer/src/linux/main.cpp
@@ -14,10 +14,6 @@
 #include "sharedThread/SetupSharedThread.h"
 #include "sharedUtility/SetupSharedUtility.h"
 
-#ifndef STELLA_INTERNAL
-#include "webAPIHeartbeat.h"
-#endif
-
 // ======================================================================
 
 void dumpPid(const char * argv)
@@ -31,10 +27,6 @@ void dumpPid(const char * argv)
 
 int main(int argc, char ** argv)
 {
-#ifndef STELLA_INTERNAL
-	StellaBellum::webAPIHeartbeat();
-#endif
-
 //	dumpPid(argv[0]);
 
 	SetupSharedThread::install();
diff --git a/external/3rd/library/webAPI/CMakeLists.txt b/external/3rd/library/webAPI/CMakeLists.txt
index 881f54a9..0c2a2f9f 100644
--- a/external/3rd/library/webAPI/CMakeLists.txt
+++ b/external/3rd/library/webAPI/CMakeLists.txt
@@ -6,8 +6,6 @@ add_library(webAPI
 	webAPI.h
 	webAPI.cpp
 	json.hpp
-	webAPIHeartbeat.h
-	webAPIHeartbeat.cpp
 )
 
 include_directories(
diff --git a/external/3rd/library/webAPI/webAPIHeartbeat.cpp b/external/3rd/library/webAPI/webAPIHeartbeat.cpp
deleted file mode 100644
index e5f0cb64..00000000
--- a/external/3rd/library/webAPI/webAPIHeartbeat.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// Created by Darth on 10/17/2016.
-//
-
-#include "webAPIHeartbeat.h"
-
-using namespace StellaBellum;
-
-webAPIHeartbeat::webAPIHeartbeat() {
-    webAPI api(std::string("https://login.stellabellum.net/metric/shoulderTap"), std::string("StellaBellum WebAPI Metrics Sender"));
-    api.addJsonData<std::string>(std::string("type"), std::string("server"));
-
-    api.submit();
-}
diff --git a/external/3rd/library/webAPI/webAPIHeartbeat.h b/external/3rd/library/webAPI/webAPIHeartbeat.h
deleted file mode 100644
index 31dcb2aa..00000000
--- a/external/3rd/library/webAPI/webAPIHeartbeat.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// Created by Darth on 10/17/2016.
-//
-
-#ifndef webAPIHeartbeat_H
-#define webAPIHeartbeat_H
-
-#include <cstdio>
-#include <unistd.h>
-#include <limits.h>
-#include <libgen.h>
-#include <signal.h>
-
-#include "webAPI.h"
-
-namespace StellaBellum {
-
-    class webAPIHeartbeat {
-    public:
-        webAPIHeartbeat();
-
-    private:
-        const inline std::string get_selfpath() {
-            char buff[PATH_MAX];
-            ssize_t len = ::readlink("/proc/self/exe", buff, sizeof(buff) - 1);
-            if (len != -1) {
-                buff[len] = '\0';
-                return std::string(buff);
-            }
-            return std::string();
-        }
-    };
-}
-
-#endif //webAPIHeartbeat_H
diff --git a/game/server/application/SwgDatabaseServer/src/linux/main.cpp b/game/server/application/SwgDatabaseServer/src/linux/main.cpp
index e006ffb0..93d348af 100755
--- a/game/server/application/SwgDatabaseServer/src/linux/main.cpp
+++ b/game/server/application/SwgDatabaseServer/src/linux/main.cpp
@@ -19,10 +19,6 @@
 #include "swgSharedNetworkMessages/SetupSwgSharedNetworkMessages.h"
 #include "swgServerNetworkMessages/SetupSwgServerNetworkMessages.h"
 
-#ifndef STELLA_INTERNAL
-#include "webAPIHeartbeat.h"
-#endif
-
 // ======================================================================
 
 void dumpPid(const char * argv)
@@ -38,10 +34,6 @@ int main(int argc, char ** argv)
 {
 //	dumpPid(argv[0]);
 
-#ifndef STELLA_INTERNAL
-        StellaBellum::webAPIHeartbeat();
-#endif
-
 	SetupSharedThread::install();
 	SetupSharedDebug::install(1024);
 
diff --git a/game/server/application/SwgGameServer/src/linux/main.cpp b/game/server/application/SwgGameServer/src/linux/main.cpp
index 9fcbfb4a..2510428e 100755
--- a/game/server/application/SwgGameServer/src/linux/main.cpp
+++ b/game/server/application/SwgGameServer/src/linux/main.cpp
@@ -32,16 +32,10 @@
 #include "swgSharedNetworkMessages/SetupSwgSharedNetworkMessages.h"
 #include "swgServerNetworkMessages/SetupSwgServerNetworkMessages.h"
 
-#ifndef STELLA_INTERNAL
-#include "webAPIHeartbeat.h"
-#endif
 // ======================================================================
 
 int main(int argc, char ** argv)
 {
-#ifndef STELLA_INTERNAL
-	StellaBellum::webAPIHeartbeat();
-#endif
 
 	SetupSharedThread::install();
 	SetupSharedDebug::install(1024);