diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 3b43683f..23f0fef7 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -343,10 +343,6 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 					      ":%s SJOIN %ld %s +nt :@%s",
 					      me.id, (long) chptr->channelts,
 					      chptr->chname, source_p->id);
-				sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-					      ":%s SJOIN %ld %s +nt :@%s",
-					      me.name, (long) chptr->channelts,
-					      chptr->chname, source_p->name);
 			}
 		}
 		else
@@ -355,11 +351,6 @@ m_join(struct Client *client_p, struct Client *source_p, int parc, const char *p
 				      ":%s JOIN %ld %s +",
 				      use_id(source_p), (long) chptr->channelts,
 				      chptr->chname);
-
-			sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-				      ":%s SJOIN %ld %s + :%s",
-				      me.name, (long) chptr->channelts,
-				      chptr->chname, source_p->name);
 		}
 
 		del_invite(chptr, source_p);
@@ -518,18 +509,12 @@ ms_join(struct Client *client_p, struct Client *source_p, int parc, const char *
 	sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 		      ":%s JOIN %ld %s +",
 		      source_p->id, (long) chptr->channelts, chptr->chname);
-	sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-		      ":%s SJOIN %ld %s %s :%s",
-		      source_p->servptr->name, (long) chptr->channelts,
-		      chptr->chname, keep_new_modes ? "+" : "0",
-		      source_p->name);
 	return 0;
 }
 
 static int
 ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
-	static char buf_nick[BUFSIZE];
 	static char buf_uid[BUFSIZE];
 	static const char empty_modes[] = "0";
 	struct Channel *chptr;
@@ -549,7 +534,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	int len;
 	int joins = 0;
 	const char *s;
-	char *ptr_nick;
 	char *ptr_uid;
 	char *p;
 	int i, joinc = 0, timeslice = 0;
@@ -729,9 +713,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 					      ":%s KICK %s %s :Net Rider",
 					      me.id, chptr->chname,
 					      who->id);
-				sendto_server(NULL, chptr, NOCAPS, CAP_TS6,
-					      ":%s KICK %s %s :Net Rider",
-					      me.name, chptr->chname, who->name);
 				remove_user_from_channel(msptr);
 				if (--l == 0)
 					break;
@@ -816,10 +797,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	else
 		modes = empty_modes;
 
-	mlen_nick = rb_sprintf(buf_nick, ":%s SJOIN %ld %s %s :",
-			       source_p->name, (long) chptr->channelts, parv[2], modes);
-	ptr_nick = buf_nick + mlen_nick;
-
 	/* working on the presumption eventually itll be more efficient to
 	 * build a TS6 buffer without checking its needed..
 	 */
@@ -869,14 +846,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		/* we assume for these we can fit at least one nick/uid in.. */
 
 		/* check we can fit another status+nick+space into a buffer */
-		if((mlen_nick + len_nick + NICKLEN + 3) > (BUFSIZE - 3))
-		{
-			*(ptr_nick - 1) = '\0';
-			sendto_server(client_p->from, NULL, NOCAPS, CAP_TS6, "%s", buf_nick);
-			ptr_nick = buf_nick + mlen_nick;
-			len_nick = 0;
-		}
-
 		if((mlen_uid + len_uid + IDLEN + 3) > (BUFSIZE - 3))
 		{
 			*(ptr_uid - 1) = '\0';
@@ -889,14 +858,12 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		{
 			if(fl & CHFL_CHANOP)
 			{
-				*ptr_nick++ = '@';
 				*ptr_uid++ = '@';
 				len_nick++;
 				len_uid++;
 			}
 			if(fl & CHFL_VOICE)
 			{
-				*ptr_nick++ = '+';
 				*ptr_uid++ = '+';
 				len_nick++;
 				len_uid++;
@@ -904,9 +871,6 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 		}
 
 		/* copy the nick to the two buffers */
-		len = rb_sprintf(ptr_nick, "%s ", target_p->name);
-		ptr_nick += len;
-		len_nick += len;
 		len = rb_sprintf(ptr_uid, "%s ", use_id(target_p));
 		ptr_uid += len;
 		len_uid += len;
@@ -1013,12 +977,10 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 	/* Keep the colon if we're sending an SJOIN without nicks -- jilles */
 	if (joins)
 	{
-		*(ptr_nick - 1) = '\0';
 		*(ptr_uid - 1) = '\0';
 	}
 
 	sendto_server(client_p->from, NULL, CAP_TS6, NOCAPS, "%s", buf_uid);
-	sendto_server(client_p->from, NULL, NOCAPS, CAP_TS6, "%s", buf_nick);
 
 	/* if the source does TS6 we have to remove our bans.  Its now safe
 	 * to issue -b's to the non-ts6 servers, as the sjoin we've just
@@ -1068,9 +1030,7 @@ do_join_0(struct Client *client_p, struct Client *source_p)
 	if(MyClient(source_p) && !IsFloodDone(source_p))
 		flood_endgrace(source_p);
 
-
 	sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p));
-	sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s JOIN 0", source_p->name);
 
 	if(source_p->user->channel.head && MyConnect(source_p) &&
 	   !IsOper(source_p) && !IsExemptSpambot(source_p))
diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c
index a7d5e2a7..ecf1d218 100644
--- a/modules/core/m_kick.c
+++ b/modules/core/m_kick.c
@@ -181,9 +181,6 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 			      ":%s KICK %s %s :%s",
 			      use_id(source_p), chptr->chname, use_id(who), comment);
-		sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-			      ":%s KICK %s %s :%s",
-			      source_p->name, chptr->chname, who->name, comment);
 		remove_user_from_channel(msptr);
 	}
 	else if (MyClient(source_p))
diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 352de580..2f583ea6 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -801,8 +801,6 @@ change_local_nick(struct Client *client_p, struct Client *source_p,
 		{
 			sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
 					use_id(source_p), nick, (long) source_p->tsinfo);
-			sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-					source_p->name, nick, (long) source_p->tsinfo);
 		}
 	}
 
@@ -862,8 +860,6 @@ change_remote_nick(struct Client *client_p, struct Client *source_p,
 		{
 			sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
 					use_id(source_p), nick, (long) source_p->tsinfo);
-			sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-					source_p->name, nick, (long) source_p->tsinfo);
 		}
 	}
 
@@ -1327,8 +1323,6 @@ save_user(struct Client *client_p, struct Client *source_p,
 			source_p->id, target_p->id, (long)target_p->tsinfo);
 	sendto_server(client_p, NULL, CAP_TS6, CAP_SAVE, ":%s NICK %s :%ld",
 			target_p->id, target_p->id, (long)SAVE_NICKTS);
-	sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-			target_p->name, target_p->id, (long)SAVE_NICKTS);
 	if (!IsMe(client_p))
 		sendto_realops_snomask(SNO_SKILL, L_ALL,
 				"Received SAVE message for %s from %s",
@@ -1354,9 +1348,6 @@ static void bad_nickname(struct Client *client_p, const char *nick)
 	sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
 			":%s WALLOPS :Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
 			me.id, client_p->name, nick);
-	sendto_server(NULL, NULL, NOCAPS, CAP_TS6,
-			":%s WALLOPS :Squitting %s because of bad nickname %s (NICKLEN mismatch?)",
-			me.name, client_p->name, nick);
 
 	rb_snprintf(squitreason, sizeof squitreason,
 			"Bad nickname introduced [%s]", nick);
diff --git a/modules/core/m_part.c b/modules/core/m_part.c
index 64e9b35d..d6ed969a 100644
--- a/modules/core/m_part.c
+++ b/modules/core/m_part.c
@@ -132,8 +132,6 @@ part_one_client(struct Client *client_p, struct Client *source_p, char *name, ch
 	{
 		sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 			      ":%s PART %s :%s", use_id(source_p), chptr->chname, reason);
-		sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-			      ":%s PART %s :%s", source_p->name, chptr->chname, reason);
 		sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s :%s",
 				     source_p->name, source_p->username,
 				     source_p->host, chptr->chname, reason);
@@ -142,8 +140,6 @@ part_one_client(struct Client *client_p, struct Client *source_p, char *name, ch
 	{
 		sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
 			      ":%s PART %s", use_id(source_p), chptr->chname);
-		sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-			      ":%s PART %s", source_p->name, chptr->chname);
 		sendto_channel_local(ALL_MEMBERS, chptr, ":%s!%s@%s PART %s",
 				     source_p->name, source_p->username,
 				     source_p->host, chptr->chname);
diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index f4835090..129d4664 100644
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -589,10 +589,6 @@ ms_sid(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		      ":%s SID %s %d %s :%s%s",
 		      source_p->id, target_p->name, target_p->hopcount + 1,
 		      target_p->id, IsHidden(target_p) ? "(H) " : "", target_p->info);
-	sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
-		      ":%s SERVER %s %d :%s%s",
-		      source_p->name, target_p->name, target_p->hopcount + 1,
-		      IsHidden(target_p) ? "(H) " : "", target_p->info);
 
 	sendto_realops_snomask(SNO_EXTERNAL, L_ALL,
 			     "Server %s being introduced by %s", target_p->name, source_p->name);
diff --git a/modules/core/m_squit.c b/modules/core/m_squit.c
index 9a2c2b75..28362218 100644
--- a/modules/core/m_squit.c
+++ b/modules/core/m_squit.c
@@ -148,12 +148,7 @@ ms_squit(struct Client *client_p, struct Client *source_p, int parc, const char
 			      ":%s WALLOPS :Remote SQUIT %s from %s (%s)",
 			      me.id, target_p->name, source_p->name, comment);
 
-		sendto_server(NULL, NULL, NOCAPS, CAP_TS6,
-			      ":%s WALLOPS :Remote SQUIT %s from %s (%s)",
-			      me.name, target_p->name, source_p->name, comment);
-
 		ilog(L_SERVER, "SQUIT From %s : %s (%s)", parv[0], target_p->name, comment);
-
 	}
 	exit_client(client_p, target_p, source_p, comment);
 	return 0;