diff --git a/src/sbbs3/misc.c b/src/sbbs3/misc.c
index 6544d8d07e54acbe9ec84e7073c9d8f1aec4fbd8..a8439ef87474b56848058fc6c5ee1ff6993056ad 100644
--- a/src/sbbs3/misc.c
+++ b/src/sbbs3/misc.c
@@ -108,7 +108,7 @@ int bstrlen(char *str)
 	int i=0;
 
 	while(*str) {
-		if(*str==1) /* ctrl-a */
+		if(*str==CTRL_A)
 			str++;
 		else
 			i++;
@@ -124,7 +124,7 @@ void strip_ctrl(char *str)
 
 	k=strlen(str);
 	for(i=j=0;i<k;i++)
-		if(str[i]==1)  /* Ctrl-a */
+		if(str[i]==CTRL_A)
 			i++;
 		else if(j && str[i]<=SP && tmp[j-1]==SP)
 			continue;
@@ -178,9 +178,6 @@ void truncsp(char *str)
 {
 	uint c;
 
-#if 0  /* no longer terminates at first tab OCT-09-2000 rswindell */
-	str[strcspn(str,"\t")]=0;
-#endif
 	c=strlen(str);
 	while(c && (uchar)str[c-1]<=SP) c--;
 	str[c]=0;
diff --git a/src/sbbs3/msgtoqwk.cpp b/src/sbbs3/msgtoqwk.cpp
index 5359d0a144d11e158bdb7910219f112b35e1207f..a525a16847452afe556c6902dc277dfbd5a6991d 100644
--- a/src/sbbs3/msgtoqwk.cpp
+++ b/src/sbbs3/msgtoqwk.cpp
@@ -179,7 +179,7 @@ ulong sbbs_t::msgtoqwk(smbmsg_t* msg, FILE *qwk_fp, long mode, int subnum
 		if((uchar)ch==0xE3)					/* funky char */
 			ch='*';
 
-		if(ch==1) {  /* ctrl-a */
+		if(ch==CTRL_A) {
 			ch=buf[++l];
 			if(!ch)
 				break;