4 files changed, 0 insertions, 12 deletions

diff --git a/src/commands.c b/src/commands.c
index da13b6357..256115f73 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -62,13 +62,11 @@ void mod_run_cmd(char *service, User * u, CommandHash * cmdTable[],
 				notice_lang(service, u, OPER_DEFCON_DENIED);
 			}
 		} else {
-			mod_current_module = NULL;
 			if ((c->has_priv == NULL) || c->has_priv(u)) {
 				retVal = c->routine(u);
 				if (retVal == MOD_CONT) {
 					current = c->next;
 					while (current && retVal == MOD_CONT) {
-						mod_current_module = NULL;
 						retVal = current->routine(u);
 						current = current->next;
 					}
@@ -129,7 +127,6 @@ void mod_help_cmd(char *service, User * u, CommandHash * cmdTable[],
 	int has_had_help = 0;
 	int cont = MOD_CONT;
 	const char *p1 = NULL, *p2 = NULL, *p3 = NULL, *p4 = NULL;
-	Module *calling_module = mod_current_module;
 
 	for (current = c; (current) && (cont == MOD_CONT);
 		 current = current->next) {
@@ -187,8 +184,6 @@ void mod_help_cmd(char *service, User * u, CommandHash * cmdTable[],
 	} else {
 		do_help_limited(service, u, c);
 	}
-
-	mod_current_module = calling_module;
 }
 
 /*************************************************************************/
diff --git a/src/module.cpp b/src/module.cpp
index 877b966c5..027cddb0d 100644
--- a/src/module.cpp
+++ b/src/module.cpp
@@ -62,7 +62,6 @@ Module::Module(const std::string &mname, const std::string &creator)
 Module::~Module()
 {
 	int i = 0;
-	mod_current_module = this;
 
 	for (i = 0; i < NUM_LANGS; i++)
 		this->DeleteLanguage(i);
diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index 6d11299f6..4fd6043e3 100644
--- a/src/modulemanager.cpp
+++ b/src/modulemanager.cpp
@@ -21,7 +21,6 @@ void ModuleManager::LoadModuleList(int total_modules, char **module_list)
 		m = findModule(module_list[idx]);
 		if (!m) {
 			status = ModuleManager::LoadModule(module_list[idx], NULL);
-			mod_current_module = NULL;
 		}
 	}
 }
@@ -191,7 +190,6 @@ int ModuleManager::LoadModule(const std::string &modname, User * u)
 		return MOD_STOP;
 	}
 
-	mod_current_module = m;
 	m->filename = pbuf;
 	m->handle = handle;
 
diff --git a/src/modules.c b/src/modules.c
index 6a25f4830..cf202916c 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -28,7 +28,6 @@ CommandHash *OPERSERV[MAX_CMD_HASH];
 MessageHash *IRCD[MAX_CMD_HASH];
 ModuleHash *MODULE_HASH[MAX_CMD_HASH];
 
-Module *mod_current_module;
 char *mod_current_buffer = NULL;
 ModuleCallBack *moduleCallBackHead = NULL;
 
@@ -67,7 +66,6 @@ int encryption_module_init(void) {
 	ret = ModuleManager::LoadModule(EncModule, NULL);
 	if (ret == MOD_ERR_OK)
 		findModule(EncModule)->SetType(ENCRYPTION);
-	mod_current_module = NULL;
 	return ret;
 }
 
@@ -102,7 +100,6 @@ int protocol_module_init(void)
 		}
 	}
 
-	mod_current_module = NULL;
 	return ret;
 }
 
@@ -1319,7 +1316,6 @@ void ModuleManager::RunCallbacks()
 			alog("debug: executing callback: %s", tmp->name ? tmp->name : "<unknown>");
 		if (tmp->func) {
 			tmp->func(tmp->argc, tmp->argv);
-			mod_current_module = NULL;
 			moduleCallBackDeleteEntry(NULL);
 		}
 	}