diff --git a/GUI/Window/Window.cs b/GUI/Window/Window.cs
index 21eb18b96..083371eb5 100644
--- a/GUI/Window/Window.cs
+++ b/GUI/Window/Window.cs
@@ -97,7 +97,6 @@ namespace MCGalaxy.Gui {
             Server s = new Server();
             Logger.LogHandler += LogMessage;
 
-            Server.HeartBeatFail += HeartBeatFail;
             Server.OnURLChange += UpdateUrl;
             Server.OnPlayerListChange += UpdateClientList;
             Server.OnSettingsUpdate += SettingsUpdate;
@@ -182,10 +181,6 @@ namespace MCGalaxy.Gui {
             }
         }
 
-        void HeartBeatFail() {
-            WriteLine("Recent Heartbeat Failed");
-        }
-
         delegate void LogDelegate(string message);
 
         /// <summary> Does the same as Console.WriteLine() only in the form </summary>
diff --git a/MCGalaxy/Server/Server.Fields.cs b/MCGalaxy/Server/Server.Fields.cs
index afaa2ebad..21832fe5d 100644
--- a/MCGalaxy/Server/Server.Fields.cs
+++ b/MCGalaxy/Server/Server.Fields.cs
@@ -31,11 +31,9 @@ namespace MCGalaxy {
         
         public delegate void OnConsoleCommand(string cmd, string message);
         public static event OnConsoleCommand ConsoleCommand;
-        public delegate void HeartBeatHandler();
         public delegate void MessageEventHandler(string message);
         public delegate void VoidHandler();
         
-        public static event HeartBeatHandler HeartBeatFail;
         public static event MessageEventHandler OnURLChange;
         public static event VoidHandler OnPlayerListChange;
         public static event VoidHandler OnSettingsUpdate;
diff --git a/MCGalaxy/Server/Server.cs b/MCGalaxy/Server/Server.cs
index 1bab2a190..54d85abaf 100644
--- a/MCGalaxy/Server/Server.cs
+++ b/MCGalaxy/Server/Server.cs
@@ -257,10 +257,6 @@ namespace MCGalaxy {
             if (OnPlayerListChange != null) OnPlayerListChange();
         }
 
-        public static void FailBeat()  {
-            if (HeartBeatFail != null) HeartBeatFail();
-        }
-
         public static void UpdateUrl(string url) {
             if (OnURLChange != null) OnURLChange(url);
         }