diff --git a/TODO b/TODO
index 73b0614..100bbf5 100644
--- a/TODO
+++ b/TODO
@@ -23,8 +23,12 @@
   [x] remote d:lines support
 [F] kline/xline/resv sync
 [F] make an ability of using bandb instead of .conf files as bans storage
+<<<<<<< local
+[/] drop non-TS6 (legacy protocol) support
+=======
 [F] drop non-TS6 (legacy protocol) support
 [F] Doxygen code documentation
+>>>>>>> other
 [F] module engine rework
   [F] more beautiful way of adding new channel modes by module
   [F] make nick/user/host validation functions/match tables able to work in separated modules,
diff --git a/include/client.h b/include/client.h
index 1b934e7..4190c77 100644
--- a/include/client.h
+++ b/include/client.h
@@ -373,12 +373,7 @@ struct exit_client_hook
  * ts stuff
  */
 #define TS_CURRENT	6
-
-#ifdef TS6_ONLY
 #define TS_MIN          6
-#else
-#define TS_MIN          3
-#endif
 
 #define TS_DOESTS       0x10000000
 #define DoesTS(x)       ((x)->tsinfo & TS_DOESTS)
diff --git a/include/config.h b/include/config.h
index d20bfd9..0470d2e 100644
--- a/include/config.h
+++ b/include/config.h
@@ -88,14 +88,6 @@
  */
 #define  HIDE_SERVERS_IPS
 
-/* TS6_ONLY
- *
- * If this is defined only TS6 servers may link to the network.  See
- * doc/TS6.txt for more information.  If your network has old servers
- * (hyb7.0, ircd-ratbox-1.x, +CSr) or hybserv you should NOT define this.
- */
-#undef TS6_ONLY
-
 /* HANGONGOODLINK and HANGONRETRYDELAY
  * Often net breaks for a short time and it's useful to try to
  * establishing the same connection again faster than CONNECTFREQUENCY
diff --git a/include/config.h.dist b/include/config.h.dist
index d20bfd9..0470d2e 100644
--- a/include/config.h.dist
+++ b/include/config.h.dist
@@ -88,14 +88,6 @@
  */
 #define  HIDE_SERVERS_IPS
 
-/* TS6_ONLY
- *
- * If this is defined only TS6 servers may link to the network.  See
- * doc/TS6.txt for more information.  If your network has old servers
- * (hyb7.0, ircd-ratbox-1.x, +CSr) or hybserv you should NOT define this.
- */
-#undef TS6_ONLY
-
 /* HANGONGOODLINK and HANGONRETRYDELAY
  * Often net breaks for a short time and it's useful to try to
  * establishing the same connection again faster than CONNECTFREQUENCY