diff --git a/extensions/m_privs.c b/extensions/m_privs.c
index beb8b9e..2b1f1d5 100644
--- a/extensions/m_privs.c
+++ b/extensions/m_privs.c
@@ -91,7 +91,6 @@ static struct mode_table auth_client_table[] = {
 	{"gline_exempt",	FLAGS2_EXEMPTGLINE	},
 	{"kline_exempt",	FLAGS2_EXEMPTKLINE	},
 	{"flood_exempt",	FLAGS2_EXEMPTFLOOD	},
-	/*{"exceed_limit",	FLAGS2_NOLIMIT		}, no effect (?) */
 	{"spambot_exempt",	FLAGS2_EXEMPTSPAMBOT	},
 	{"shide_exempt",	FLAGS2_EXEMPTSHIDE	},
 	{"jupe_exempt",		FLAGS2_EXEMPTJUPE	},
diff --git a/include/client.h b/include/client.h
index 1b8899d..a2d2a14 100644
--- a/include/client.h
+++ b/include/client.h
@@ -458,7 +458,6 @@ struct exit_client_hook
 #define FLAGS2_EXEMPTGLINE      0x00800000
 #define FLAGS2_EXEMPTKLINE      0x01000000
 #define FLAGS2_EXEMPTFLOOD      0x02000000
-#define FLAGS2_NOLIMIT          0x04000000
 #define FLAGS2_IP_SPOOFING      0x10000000
 #define FLAGS2_EXEMPTSPAMBOT	0x20000000
 #define FLAGS2_EXEMPTSHIDE	0x40000000
@@ -539,8 +538,6 @@ struct exit_client_hook
  */
 #define IsExemptKline(x)        ((x)->flags2 & FLAGS2_EXEMPTKLINE)
 #define SetExemptKline(x)       ((x)->flags2 |= FLAGS2_EXEMPTKLINE)
-#define IsExemptLimits(x)       ((x)->flags2 & FLAGS2_NOLIMIT)
-#define SetExemptLimits(x)      ((x)->flags2 |= FLAGS2_NOLIMIT)
 #define IsExemptGline(x)        ((x)->flags2 & FLAGS2_EXEMPTGLINE)
 #define SetExemptGline(x)       ((x)->flags2 |= FLAGS2_EXEMPTGLINE)
 #define IsExemptFlood(x)        ((x)->flags2 & FLAGS2_EXEMPTFLOOD)
diff --git a/src/s_conf.c b/src/s_conf.c
index c14e2f8..1d6abd0 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -599,7 +599,6 @@ attach_conf(struct Client *client_p, struct ConfItem *aconf)
 		else
 		{
 			sendto_one_notice(client_p, ":*** I: line is full, but you have an >I: line!");
-			SetExemptLimits(client_p);
 		}
 
 	}
diff --git a/src/s_user.c b/src/s_user.c
index 58b0568..abbd36f 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -398,7 +398,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 	 */
 	/* Except "F:" clients */
 	if(dlink_list_length(&lclient_list) >=
-	    (unsigned long)GlobalSetOptions.maxclients && !IsExemptLimits(source_p))
+	    (unsigned long)GlobalSetOptions.maxclients && !IsConfExemptLimits(aconf))
 	{
 		sendto_realops_snomask(SNO_FULL, L_ALL,
 				     "Too many clients, rejecting %s[%s].", source_p->name, source_p->host);
@@ -831,7 +831,6 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
 	/* If this user is exempt from user limits set it F lined" */
 	if(IsConfExemptLimits(aconf))
 	{
-		SetExemptLimits(source_p);
 		sendto_one_notice(source_p, ":*** You are exempt from user limits. congrats.");
 	}