diff --git a/modules/m_away.c b/modules/m_away.c
index 6cd488d..d52c66f 100644
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -84,8 +84,6 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
 			/* we now send this only if they were away before --is */
 			sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
 				      ":%s AWAY", use_id(source_p));
-			sendto_server(client_p, NULL, NOCAPS, CAP_TS6, 
-				      ":%s AWAY", source_p->name);
 			free_away(source_p);
 		}
 		if(MyConnect(source_p))
@@ -100,8 +98,6 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
 		rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);
 		sendto_server(client_p, NULL, CAP_TS6, NOCAPS, 
 			      ":%s AWAY :%s", use_id(source_p), source_p->user->away);
-		sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
-			      ":%s AWAY :%s", source_p->name, source_p->user->away);
 			
 	} else {
 		rb_strlcpy(source_p->user->away, parv[1], AWAYLEN);
diff --git a/modules/m_chghost.c b/modules/m_chghost.c
index 294c3c7..a4b4ce3 100644
--- a/modules/m_chghost.c
+++ b/modules/m_chghost.c
@@ -161,9 +161,6 @@ ms_chghost(struct Client *client_p, struct Client *source_p,
 		sendto_server(client_p, NULL,
 			CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s",
 			use_id(source_p), use_id(target_p), parv[2]);
-		sendto_server(client_p, NULL,
-			NOCAPS, CAP_TS6, ":%s ENCAP * CHGHOST %s :%s",
-			source_p->name, target_p->name, parv[2]);
 	}
 
 	return 0;
@@ -233,9 +230,6 @@ mo_chghost(struct Client *client_p, struct Client *source_p,
 	sendto_server(NULL, NULL,
 		CAP_TS6, CAP_EUID, ":%s ENCAP * CHGHOST %s :%s",
 		use_id(source_p), use_id(target_p), parv[2]);
-	sendto_server(NULL, NULL,
-		NOCAPS, CAP_TS6, ":%s ENCAP * CHGHOST %s :%s",
-		source_p->name, target_p->name, parv[2]);
 #else
 	sendto_one_numeric(source_p, ERR_DISABLED, form_str(ERR_DISABLED),
 			"CHGHOST");
diff --git a/modules/m_connect.c b/modules/m_connect.c
index 9f586b4..3b8e4d5 100644
--- a/modules/m_connect.c
+++ b/modules/m_connect.c
@@ -235,9 +235,6 @@ ms_connect(struct Client *client_p, struct Client *source_p, int parc, const cha
 	sendto_server(NULL, NULL, CAP_TS6, NOCAPS,
 		      ":%s WALLOPS :Remote CONNECT %s %d from %s",
 		      me.id, parv[1], port, source_p->name);
-	sendto_server(NULL, NULL, NOCAPS, CAP_TS6,
-		      ":%s WALLOPS :Remote CONNECT %s %d from %s",
-		      me.name, parv[1], port, source_p->name);
 
 	ilog(L_SERVER, "CONNECT From %s : %s %d", source_p->name, parv[1], port);
 
diff --git a/modules/m_services.c b/modules/m_services.c
index 9199906..a78cc7f 100644
--- a/modules/m_services.c
+++ b/modules/m_services.c
@@ -224,8 +224,6 @@ me_rsfnc(struct Client *client_p, struct Client *source_p,
 	add_history(target_p, 1);
 	sendto_server(NULL, NULL, CAP_TS6, NOCAPS, ":%s NICK %s :%ld",
 			use_id(target_p), parv[2], (long) target_p->tsinfo);
-	sendto_server(NULL, NULL, NOCAPS, CAP_TS6, ":%s NICK %s :%ld",
-			target_p->name, parv[2], (long) target_p->tsinfo);
 
 	del_from_client_hash(target_p->name, target_p);
 	strcpy(target_p->name, parv[2]);
diff --git a/modules/m_signon.c b/modules/m_signon.c
index 51d7971..d57d953 100644
--- a/modules/m_signon.c
+++ b/modules/m_signon.c
@@ -431,9 +431,6 @@ send_signon(struct Client *client_p, struct Client *target_p,
 	sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s SIGNON %s %s %s %ld %s",
 			use_id(target_p), nick, user, host,
 			(long) target_p->tsinfo, *login ? login : "0");
-	sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s SIGNON %s %s %s %ld %s",
-			target_p->name, nick, user, host,
-			(long) target_p->tsinfo, *login ? login : "0");
 
 	strcpy(target_p->user->suser, login);
 
diff --git a/modules/m_topic.c b/modules/m_topic.c
index 9c91170..da5a8c2 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -108,10 +108,6 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
 					":%s TOPIC %s :%s",
 					use_id(source_p), chptr->chname,
 					chptr->topic == NULL ? "" : chptr->topic);
-			sendto_server(client_p, chptr, NOCAPS, CAP_TS6,
-					":%s TOPIC %s :%s",
-					source_p->name, chptr->chname,
-					chptr->topic == NULL ? "" : chptr->topic);
 			sendto_channel_local(ALL_MEMBERS,
 					chptr, ":%s!%s@%s TOPIC %s :%s",
 					source_p->name, source_p->username,
diff --git a/modules/m_wallops.c b/modules/m_wallops.c
index f468bff..1a591ab 100644
--- a/modules/m_wallops.c
+++ b/modules/m_wallops.c
@@ -71,8 +71,6 @@ mo_operwall(struct Client *client_p, struct Client *source_p, int parc, const ch
 	sendto_wallops_flags(UMODE_OPERWALL, source_p, "OPERWALL - %s", parv[1]);
 	sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s OPERWALL :%s", 
 		      use_id(source_p), parv[1]);
-	sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s OPERWALL :%s", 
-		      source_p->name, parv[1]);
 
 	return 0;
 }
@@ -88,8 +86,6 @@ ms_operwall(struct Client *client_p, struct Client *source_p, int parc, const ch
 {
 	sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s OPERWALL :%s",
 		      use_id(source_p), parv[1]);
-	sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s OPERWALL :%s",
-		      source_p->name, parv[1]);
 	sendto_wallops_flags(UMODE_OPERWALL, source_p, "OPERWALL - %s", parv[1]);
 
 	return 0;
@@ -124,8 +120,6 @@ ms_wallops(struct Client *client_p, struct Client *source_p, int parc, const cha
 
 	sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s WALLOPS :%s", 
 		      use_id(source_p), parv[1]);
-	sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s WALLOPS :%s", 
-		      source_p->name, parv[1]);
 
 	return 0;
 }