diff --git a/include/client.h b/include/client.h
index 0f132160..e43838b9 100644
--- a/include/client.h
+++ b/include/client.h
@@ -444,7 +444,6 @@ struct ListClient
 #define UMODE_WALLOP       0x0002	/* send wallops to them */
 #define UMODE_OPERWALL     0x0004	/* Operwalls */
 #define UMODE_INVISIBLE    0x0008	/* makes user invisible */
-#define UMODE_CALLERID     0x0010	/* block unless caller id's */
 #define UMODE_LOCOPS       0x0020	/* show locops */
 #define UMODE_SERVICE      0x0040
 #define UMODE_DEAF	   0x0080
@@ -535,7 +534,6 @@ struct ListClient
 #define SendLocops(x)           ((x)->umodes & UMODE_LOCOPS)
 #define SendServNotice(x)       ((x)->umodes & UMODE_SERVNOTICE)
 #define SendOperwall(x)         ((x)->umodes & UMODE_OPERWALL)
-#define IsSetCallerId(x)	((x)->umodes & UMODE_CALLERID)
 #define IsService(x)		((x)->umodes & UMODE_SERVICE)
 #define IsDeaf(x)		((x)->umodes & UMODE_DEAF)
 #define IsNoForward(x)		((x)->umodes & UMODE_NOFORWARD)
diff --git a/ircd/newconf.c b/ircd/newconf.c
index 6f8a3b58..9e200fd7 100644
--- a/ircd/newconf.c
+++ b/ircd/newconf.c
@@ -316,7 +316,6 @@ struct mode_table
 
 /* *INDENT-OFF* */
 static struct mode_table umode_table[] = {
-	{"callerid",	UMODE_CALLERID	},
 	{"deaf",	UMODE_DEAF	},
 	{"invisible",	UMODE_INVISIBLE	},
 	{"locops",	UMODE_LOCOPS	},
diff --git a/ircd/s_user.c b/ircd/s_user.c
index cb4cf9db..bda9bca8 100644
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -97,7 +97,7 @@ int user_modes[256] = {
 	0,			/* d */
 	0,			/* e */
 	0,			/* f */
-	UMODE_CALLERID,		/* g */
+	0,			/* g */
 	0,			/* h */
 	UMODE_INVISIBLE,	/* i */
 	0,			/* j */
diff --git a/ircd/supported.c b/ircd/supported.c
index 09de6ce0..3dbbcd66 100644
--- a/ircd/supported.c
+++ b/ircd/supported.c
@@ -318,7 +318,6 @@ init_isupport(void)
 	add_isupport("MODES", isupport_intptr, &maxmodes);
 	add_isupport("NETWORK", isupport_stringptr, &ServerInfo.network_name);
 	add_isupport("STATUSMSG", isupport_string, "@+");
-	add_isupport("CALLERID", isupport_umode, "g");
 	add_isupport("CASEMAPPING", isupport_string, "rfc1459");
 	add_isupport("NICKLEN", isupport_nicklen, NULL);
 	add_isupport("MAXNICKLEN", isupport_intptr, &maxnicklen);