Index: trunk/src/game/World.h
===================================================================
--- trunk/src/game/World.h (revision 44)
+++ trunk/src/game/World.h (revision 51)
@@ -148,5 +148,4 @@
     CONFIG_TALENTS_INSPECTING,
     CONFIG_CHAT_FAKE_MESSAGE_PREVENTING,
-    CONFIG_TCP_NO_DELAY,
     CONFIG_CORPSE_DECAY_NORMAL,
     CONFIG_CORPSE_DECAY_RARE,
Index: trunk/src/game/World.cpp
===================================================================
--- trunk/src/game/World.cpp (revision 49)
+++ trunk/src/game/World.cpp (revision 51)
@@ -540,5 +540,4 @@
 
 
-    m_configs[CONFIG_TCP_NO_DELAY] = sConfig.GetBoolDefault("TcpNoDelay", false);
     m_configs[CONFIG_GROUP_XP_DISTANCE] = sConfig.GetIntDefault("MaxGroupXPDistance", 74);
     /// \todo Add MonsterSight and GuarderSight (with meaning) in Trinityd.conf or put them as define
Index: trunk/src/trinitycore/trinitycore.conf.dist
===================================================================
--- trunk/src/trinitycore/trinitycore.conf.dist (revision 44)
+++ trunk/src/trinitycore/trinitycore.conf.dist (revision 51)
@@ -93,9 +93,4 @@
 #                 9 (best compression)
 #
-#    TcpNoDelay
-#        TCP Nagle algorithm setting
-#        Default: 0 (enable Nagle algorithm, less traffic, more latency)
-#                 1 (TCP_NO_DELAY, disable Nagle algorithm, more traffic but less latency)
-#
 #    PlayerLimit
 #        Maximum number of players in the world. Excluding Mods, GM's and Admins
@@ -183,5 +178,4 @@
 ProcessPriority = 1
 Compression = 1
-TcpNoDelay = 0
 PlayerLimit = 100
 SaveRespawnTimeImmediately = 1
