diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index be5756232..ceae8e1aa 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -37,7 +37,7 @@ R_MODULES= \
 	 m_setident.so m_sdesc.so m_svsmode.so m_swhois.so\
 	 m_svsmotd.so m_svsnline.so m_who.so m_mkpasswd.so \
 	 m_away.so m_svsnoop.so m_svsnick.so \
-	 m_chgname.so m_guest.so m_kill.so \
+	 m_chgname.so m_kill.so \
 	 m_lag.so m_message.so m_oper.so m_pingpong.so \
 	 m_quit.so m_rping.so m_sendumode.so m_sqline.so \
 	 m_tsctl.so m_unsqline.so m_whois.so \
@@ -80,10 +80,6 @@ m_chgname.so: m_chgname.c $(INCLUDES)
 	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
 		-o m_chgname.so m_chgname.c
 
-m_guest.so: m_guest.c $(INCLUDES)
-	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
-		-o m_guest.so m_guest.c
-
 m_kill.so: m_kill.c $(INCLUDES)
 	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
 		-o m_kill.so m_kill.c
diff --git a/src/modules/m_guest.c b/src/modules/m_guest.c
deleted file mode 100644
index d4f3cc2c4..000000000
--- a/src/modules/m_guest.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *   Unreal Internet Relay Chat Daemon, src/modules/m_guest.c
- *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
- *   Moved to modules by Fish (Justin Hammond)
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 1, or (at your option)
- *   any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "config.h"
-#include "struct.h"
-#include "common.h"
-#include "sys.h"
-#include "numeric.h"
-#include "msg.h"
-#include "channel.h"
-#include <time.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef _WIN32
-//#define snprintf _snprintf
-#include <io.h>
-#endif
-#include <fcntl.h>
-#include "h.h"
-#ifdef _WIN32
-#include "version.h"
-#endif
-
-DLLFUNC int m_guest(aClient *cptr, aClient *sptr, int parc, char *parv[]);
-#ifdef GUEST
-static Hook *GuestHook = NULL;
-#endif
-/* Place includes here */
-
-ModuleHeader MOD_HEADER(m_guest)
-  = {
-	"guest",	/* Name of module */
-	"$Id$", /* Version */
-	"command /guest", /* Short description of module */
-	"3.2-b8-1",
-	NULL 
-    };
-
-ModuleInfo *ModGuestInfo;
-/* This is called on module init, before Server Ready */
-MOD_INIT(m_guest)
-{
-#ifdef GUEST
-	ModGuestInfo = modinfo;
-	GuestHook = HookAdd(ModGuestInfo->handle, HOOKTYPE_GUEST, 0, m_guest);
-#endif
-	MARK_AS_OFFICIAL_MODULE(modinfo);
-	return MOD_SUCCESS;
-}
-
-/* Is first run when server is 100% ready */
-MOD_LOAD(m_guest)
-{
-	return MOD_SUCCESS;
-	
-}
-
-
-/* Called when module is unloaded */
-MOD_UNLOAD(m_guest)
-{
-#ifdef GUEST
-	HookDel(GuestHook);
-#endif
-	return MOD_SUCCESS;
-}
-
-DLLFUNC int m_guest(aClient *cptr, aClient *sptr, int parc, char *parv[])
-{
-	char guestnick[NICKLEN];
-	char *param[3];
-
-	snprintf(guestnick, NICKLEN, "Guest%d", getrandom32());
-
-	while(find_client(guestnick, (aClient *)NULL))
-	{ 
-		snprintf(guestnick, NICKLEN, "Guest%d", getrandom32());
-	}
-	param[0] = sptr->name;
-	param[1] = guestnick;
-	param[2] = NULL;
-	do_cmd(sptr, cptr, "NICK", 2, param);
-	return 0;
-}
diff --git a/src/modules/m_nick.c b/src/modules/m_nick.c
index 0b2869acf..26499e02b 100644
--- a/src/modules/m_nick.c
+++ b/src/modules/m_nick.c
@@ -505,13 +505,11 @@ DLLFUNC CMD_FUNC(m_nick)
 	{
 		if (MyConnect(sptr))
 		{
-#ifdef GUEST
 			if (IsUnknown(sptr))
 			{
 				RunHook4(HOOKTYPE_GUEST, cptr, sptr, parc, parv);
 				return 0;
 			}
-#endif
 			sendto_one(sptr, err_str(ERR_NICKNAMEINUSE), me.name,
 			    *sptr->name ? sptr->name : "*", nick);
 			return 0;	/* NICK message ignored */
@@ -682,13 +680,11 @@ DLLFUNC CMD_FUNC(m_nick)
 		   ** NICK is coming from local client connection. Just
 		   ** send error reply and ignore the command.
 		 */
-#ifdef GUEST
 		if (IsUnknown(sptr))
 		{
 			RunHook4(HOOKTYPE_GUEST, cptr, sptr, parc, parv);
 			return 0;
 		}
-#endif
 		sendto_one(sptr, err_str(ERR_NICKNAMEINUSE),
 		    me.name, *sptr->name ? sptr->name : "*", nick);
 		return 0;	/* NICK message ignored */