Index: binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Telnet/TelnetConnection.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Telnet/TelnetConnection.cs	(revision 202)
+++ binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Telnet/TelnetConnection.cs	(revision 224)
@@ -13,6 +13,4 @@
 		private readonly BlockingQueue<string> toClientQueue = new BlockingQueue<string> ();
 		private readonly Telnet telnet;
-		private readonly Thread receiveThread = null;
-		private readonly Thread sendThread = null;
 		private bool authenticated = false;
 		private readonly bool authEnabled;
@@ -44,8 +42,6 @@
 			Log.Out ("Telnet connection from: " + endpoint);
 
-			receiveThread = ThreadMaster.Create ("TelnetClientReceive_" + endpoint.ToString (), new ThreadStart (ReceiveThread));
-			receiveThread.Start ();
-			sendThread = ThreadMaster.Create ("TelnetClientSend" + endpoint.ToString (), new ThreadStart (SendThread));
-			sendThread.Start ();
+			ThreadManager.StartThread ("TelnetClientReceive_" + endpoint.ToString (), new ThreadManager.ThreadFunctionDelegate (ReceiveThread), System.Threading.ThreadPriority.BelowNormal);
+			ThreadManager.StartThread ("TelnetClientSend_" + endpoint.ToString (), new ThreadManager.ThreadFunctionDelegate (SendThread), System.Threading.ThreadPriority.BelowNormal);
 
 			if (authEnabled) {
@@ -77,5 +73,5 @@
 		}
 
-		private void ReceiveThread ()
+		private void ReceiveThread (ThreadManager.ThreadInfo _tInfo)
 		{
 			try {
@@ -116,8 +112,7 @@
 			if (!closed)
 				Close ();
-			ThreadMaster.Remove (Thread.CurrentThread.Name);
 		}
 
-		private void SendThread ()
+		private void SendThread (ThreadManager.ThreadInfo _tInfo)
 		{
 			try {
@@ -140,5 +135,4 @@
 			if (!closed)
 				Close ();
-			ThreadMaster.Remove (Thread.CurrentThread.Name);
 		}