diff --git a/doc/ircd.conf.example b/doc/ircd.conf.example
index 9f261661..d7525a7a 100644
--- a/doc/ircd.conf.example
+++ b/doc/ircd.conf.example
@@ -51,7 +51,6 @@ serverinfo {
 	sid = "42X";
 	description = "charybdis test server";
 	network_name = "StaticBox";
-	hub = yes;
 
 	/* On multi-homed hosts you may need the following. These define
 	 * the addresses we connect from to other servers. */
diff --git a/doc/reference.conf b/doc/reference.conf
index a72a7539..5c9bd0b5 100644
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -134,11 +134,6 @@ serverinfo {
 	 */
 	network_name = "MyNet";
 
-	/* hub: allow this server to act as a hub and have multiple servers
-	 * connected to it.  
-	 */
-	hub = no;
-
 	/* vhost: the IP to bind to when we connect outward to ipv4 servers.
 	 * This should be an ipv4 IP only.
 	 */
diff --git a/doc/server-version-info.txt b/doc/server-version-info.txt
index 6019ee73..194c6b35 100644
--- a/doc/server-version-info.txt
+++ b/doc/server-version-info.txt
@@ -17,8 +17,6 @@
    +----------------------------+
    | 'e'  | USE_EXCEPT          |
    |------+---------------------|
-   | 'H'  | HUB                 |
-   |------+---------------------|
    | 'I'  | USE_INVEX           |
    |------+---------------------|
    | 'K'  | USE_KNOCK           |
@@ -29,8 +27,6 @@
    |------+---------------------|
    | 'S'  | OPERS_SEE_ALL_USERS |
    |------+---------------------|
-   | 'T'  | IGNORE_BOGUS_TS     |
-   |------+---------------------|
    | 'Z'  | ZIPLINKS            |
    |------+---------------------|
    | '6'  | IPv6                |
diff --git a/ircd/newconf.c b/ircd/newconf.c
index a0877598..974f798b 100644
--- a/ircd/newconf.c
+++ b/ircd/newconf.c
@@ -2265,7 +2265,6 @@ remove_conf_item(const char *topconf, const char *name)
 static struct ConfEntry conf_serverinfo_table[] =
 {
 	{ "description", 	CF_QSTRING, NULL, 0, &ServerInfo.description	},
-	{ "hub", 		CF_YESNO,   NULL, 0, &ServerInfo.hub		},
 
 	{ "network_name", 	CF_QSTRING, conf_set_serverinfo_network_name,	0, NULL },
 	{ "name", 		CF_QSTRING, conf_set_serverinfo_name,	0, NULL },
diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index 18d628bd..78bf23d8 100644
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -690,8 +690,6 @@ set_default_conf(void)
 	ServerInfo.specific_ipv6_vhost = 0;
 #endif
 
-	/* Don't reset hub, as that will break lazylinks */
-	/* ServerInfo.hub = false; */
 	AdminInfo.name = NULL;
 	AdminInfo.email = NULL;
 	AdminInfo.description = NULL;
diff --git a/ircd/s_serv.c b/ircd/s_serv.c
index 208a6fe1..9f4d3735 100644
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -797,19 +797,6 @@ server_estab(struct Client *client_p)
 	/* Its got identd , since its a server */
 	SetGotId(client_p);
 
-	/* If there is something in the serv_list, it might be this
-	 * connecting server..
-	 */
-	if(!ServerInfo.hub && serv_list.head)
-	{
-		if(client_p != serv_list.head->data || serv_list.head->next)
-		{
-			ServerStats.is_ref++;
-			sendto_one(client_p, "ERROR :I'm a leaf not a hub");
-			return exit_client(client_p, client_p, client_p, "I'm a leaf");
-		}
-	}
-
 	if(IsUnknown(client_p))
 	{
 		/* the server may be linking based on certificate fingerprint now. --nenolod */
diff --git a/modules/m_info.c b/modules/m_info.c
index 733df8be..60461e16 100644
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -285,12 +285,6 @@ static struct InfoStruct info_table[] = {
 		&ConfigFileEntry.hide_spoof_ips,
 		"Hide IPs of spoofed users"
 	},
-	{
-		"hub",
-		OUTPUT_BOOLEAN_YN,
-		&ServerInfo.hub,
-		"Server is a hub"
-	},
 	{
 		"kline_delay",
 		OUTPUT_DECIMAL,
diff --git a/modules/m_version.c b/modules/m_version.c
index ba099fe6..02cc6369 100644
--- a/modules/m_version.c
+++ b/modules/m_version.c
@@ -124,10 +124,6 @@ confopts(void)
 	if(ConfigChannel.use_except)
 		*p++ = 'e';
 
-	/* might wanna hide this :P */
-	if(ServerInfo.hub)
-		*p++ = 'H';
-
 	if(ConfigChannel.use_invex)
 		*p++ = 'I';