1 files changed, 2 insertions, 10 deletions
diff --git a/src/module.cpp b/src/module.cpp
index 9431137b7..98eb9b4fd 100644
--- a/src/module.cpp
+++ b/src/module.cpp
@@ -37,6 +37,8 @@ Module::~Module()
 	for (i = 0; i < NUM_LANGS; ++i)
 		this->DeleteLanguage(i);
 
+	/* Detach all event hooks for this module */
+	ModuleManager::DetachAll(this);
 	/* Clear any active callbacks this module has */
 	ModuleManager::ClearCallBacks(this);
 
@@ -93,13 +95,3 @@ unsigned Version::GetBuild() const
 	return this->Build;
 }
 
-Service::Service(Module *o, const Anope::string &n) : owner(o), name(n)
-{
-	ModuleManager::RegisterService(this);
-}
-
-Service::~Service()
-{
-	ModuleManager::UnregisterService(this);
-}
-