diff --git a/include/whowas.h b/include/whowas.h
index f157567..e7b0837 100644
--- a/include/whowas.h
+++ b/include/whowas.h
@@ -39,7 +39,7 @@ typedef struct _whowas_wrap_str {
 } WhowasWrapList;
 
 WhowasList *check_whowas_buffer (char *, char *, char *);
-WhowasList *check_whowas_nick_buffer (char *, char *, int);
+WhowasList *check_whowas_nick_buffer(const char *, const char *);
 WhowasList *check_whosplitin_buffer (char *, char *, char *, int);
 
 void add_to_whowas_buffer (NickList *, char *, char *, char *);
diff --git a/source/banlist.c b/source/banlist.c
index 2837f62..7795e6c 100644
--- a/source/banlist.c
+++ b/source/banlist.c
@@ -305,7 +305,7 @@ void userhost_unban(UserhostItem *stuff, char *nick1, char *args)
 	
 	if (!stuff || !stuff->nick || !strcmp(stuff->user, "<UNKNOWN>") || my_stricmp(stuff->nick, nick1))
 	{
-		if ((whowas = check_whowas_nick_buffer(nick1, args, 0)))
+		if ((whowas = check_whowas_nick_buffer(nick1, args)))
 		{
 			malloc_sprintf(&host, "%s!%s", whowas->nicklist->nick, whowas->nicklist->host);
 			bitchsay("Using WhoWas info for unban of %s ", nick1);
@@ -369,7 +369,7 @@ void userhost_ban(UserhostItem *stuff, char *nick1, char *args)
 	
 	if (!stuff || !stuff->nick || !strcmp(stuff->user, "<UNKNOWN>") || my_stricmp(stuff->nick, nick1))
 	{
-		if (channel && (whowas = check_whowas_nick_buffer(nick1, channel, 0)))
+		if (channel && (whowas = check_whowas_nick_buffer(nick1, channel)))
 		{
 			nick = whowas->nicklist->nick;
 			user = m_strdup(clear_server_flags(whowas->nicklist->host));
diff --git a/source/misc.c b/source/misc.c
index 81ecbe7..ce4880a 100644
--- a/source/misc.c
+++ b/source/misc.c
@@ -3842,7 +3842,7 @@ void userhost_ignore (UserhostItem *stuff, char *nick1, char *args)
 	arg = next_arg(args, &args);
 	if (!stuff || !stuff->nick || !strcmp(stuff->user, "<UNKNOWN>") || my_stricmp(stuff->nick, nick1))
 	{
-		if ((whowas = check_whowas_nick_buffer(nick1, arg, 0)))
+		if ((whowas = check_whowas_nick_buffer(nick1, arg)))
 		{
 			bitchsay("Using WhoWas info for %s of %s ", arg, nick1);
 			user = host; host = strchr(host, '@'); *host++ = 0;
diff --git a/source/whowas.c b/source/whowas.c
index f4b8cfe..d9ca2d5 100644
--- a/source/whowas.c
+++ b/source/whowas.c
@@ -77,34 +77,25 @@ extern	WhowasList *check_whowas_buffer(char *nick, char *userhost, char *channel
 }
 
 
-extern	WhowasList * check_whowas_nick_buffer(char *nick, char *channel, int unlink)
+WhowasList *check_whowas_nick_buffer(const char *nick, const char *channel)
 {
-	WhowasList *tmp = NULL, *last = NULL;
+	WhowasList *tmp = NULL;
+
 	for (tmp = next_userhost(&whowas_userlist_list, NULL); tmp; tmp = next_userhost(&whowas_userlist_list, tmp))
 	{
 		if (!my_stricmp(tmp->nicklist->nick, nick) && !my_stricmp(tmp->channel, channel))
 		{
-			if (unlink)
-			{
-				last = find_userhost_channel(tmp->nicklist->host, tmp->channel, 1, &whowas_userlist_list);
-				tmp = NULL;
-			}
-			return last?last:tmp;
+			return tmp;
 		}
 	}
 	for (tmp = next_userhost(&whowas_reg_list, NULL); tmp; tmp = next_userhost(&whowas_reg_list, tmp))
 	{
 		if (!my_stricmp(tmp->nicklist->nick, nick) && !my_stricmp(tmp->channel, channel))
 		{
-			if (unlink)
-			{
-				last = find_userhost_channel(tmp->nicklist->host, tmp->channel, 1, &whowas_reg_list);
-				tmp = NULL;
-			}
-			return last?last:tmp;
+			return tmp;
 		}
 	}
-	return( NULL );
+	return NULL;
 }
 
 extern	WhowasList * check_whosplitin_buffer(char *nick, char *userhost, char *channel, int unlink)