diff --git a/Changes b/Changes
index 92f3f656e..a6eec9659 100644
--- a/Changes
+++ b/Changes
@@ -393,3 +393,4 @@
   work)
 - Fixed last R_LINE stuff (check_time_interval)
 - Fixed /setname desynch
+- Removed IsService()
diff --git a/include/struct.h b/include/struct.h
index 800b478da..41eff178d 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -162,7 +162,6 @@ typedef unsigned int  u_int32_t; /* XXX Hope this works! */
 #define	IsServer(x)		((x)->status == STAT_SERVER)
 #define	IsClient(x)		((x)->status == STAT_CLIENT)
 #define	IsLog(x)		((x)->status == STAT_LOG)
-#define IsService(x)		0
 
 #define	SetMaster(x)		((x)->status = STAT_MASTER)
 #define	SetConnecting(x)	((x)->status = STAT_CONNECTING)
diff --git a/src/channel.c b/src/channel.c
index 0a77f6fe8..c47397089 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -735,6 +735,7 @@ static void channel_modes(cptr, mbuf, pbuf, chptr)
 			(void)strcat(pbuf, bcbuf);
 		}
 	}
+	/* if we add more parameter modes, add a space to the strings here --Stskeeps*/
 	if (chptr->mode.per)
 	{
 		*mbuf++ = 'f';
@@ -751,6 +752,7 @@ static void channel_modes(cptr, mbuf, pbuf, chptr)
 		}
 
 	}
+
 	*mbuf++ = '\0';
 	return;
 }
@@ -5105,7 +5107,8 @@ void send_channel_modes_sjoin(cptr, chptr)
 	channel_modes(cptr, modebuf, parabuf, chptr);
 
 	if (*parabuf)
-		strcat(parabuf, " ");
+	{
+	}
 	else
 	{
 		if (!SupportSJOIN2(cptr))
diff --git a/src/s_bsd.c b/src/s_bsd.c
index b7f3ddc7f..d677b2ef7 100644
--- a/src/s_bsd.c
+++ b/src/s_bsd.c
@@ -1479,8 +1479,7 @@ static int read_packet(cptr, rfd)
 	   ** For server connections, we process as many as we can without
 	   ** worrying about the time of day or anything :)
 	 */
-	if (IsServer(cptr) || IsConnecting(cptr) || IsHandshake(cptr) ||
-	    IsService(cptr))
+	if (IsServer(cptr) || IsConnecting(cptr) || IsHandshake(cptr))
 	{
 		if (length > 0)
 			if ((done = dopacket(cptr, readbuf, length)))
@@ -1514,7 +1513,7 @@ static int read_packet(cptr, rfd)
 			   ** If it has become registered as a Service or Server
 			   ** then skip the per-message parsing below.
 			 */
-			if (IsService(cptr) || IsServer(cptr))
+			if (IsServer(cptr))
 			{
 				dolen = dbuf_get(&cptr->recvQ, readbuf,
 				    sizeof(readbuf));
diff --git a/src/s_misc.c b/src/s_misc.c
index 2ab0b70a0..1acb8a530 100644
--- a/src/s_misc.c
+++ b/src/s_misc.c
@@ -657,7 +657,7 @@ static void exit_one_client_backend(cptr, sptr, from, comment, split)
 			}
 		}
 	}
-	else if (!(IsPerson(sptr) || IsService(sptr)))
+	else if (!(IsPerson(sptr)))
 		/* ...this test is *dubious*, would need
 		   ** some thougth.. but for now it plugs a
 		   ** nasty hole in the server... --msa
diff --git a/src/s_serv.c b/src/s_serv.c
index 0b5fa083a..73554080f 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -1067,13 +1067,6 @@ int  m_server_estab(cptr)
 			if (!SupportSJOIN(cptr))
 				send_user_joins(cptr, acptr);
 		}
-		else if (IsService(acptr))
-		{
-			sendto_one(cptr, "NICK %s :%d",
-			    acptr->name, acptr->hopcount + 1);
-			sendto_one(cptr, ":%s SERVICE * * :%s",
-			    acptr->name, acptr->info);
-		}
 	}
 	/*
 	   ** Last, pass all channels plus statuses
@@ -2390,7 +2383,7 @@ int  m_error(cptr, sptr, parc, parv)
 	   ** screen otherwise). Pass ERROR's from other sources to
 	   ** the local operator...
 	 */
-	if (IsPerson(cptr) || IsUnknown(cptr) || IsService(cptr))
+	if (IsPerson(cptr) || IsUnknown(cptr))
 		return 0;
 	if (cptr == sptr)
 	{
diff --git a/src/s_user.c b/src/s_user.c
index e3a57d329..1490f3f6f 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -275,8 +275,6 @@ aClient *next_client(next, ch)
 		return next;
 	for (; next; next = next->next)
 	{
-		if (IsService(next))
-			continue;
 		if (!match(ch, next->name) || !match(next->name, ch))
 			break;
 	}