Automatically register ServiceProviders created by modules

5 files changed, 0 insertions, 23 deletions

diff --git a/src/commands/cmd_dns.cpp b/src/commands/cmd_dns.cpp
index f97d68783..f9ec8e990 100644
--- a/src/commands/cmd_dns.cpp
+++ b/src/commands/cmd_dns.cpp
@@ -795,11 +795,6 @@ class ModuleDNS : public Module
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(this->manager);
-	}
-
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		std::string oldserver = DNSServer;
diff --git a/src/commands/cmd_hostname_lookup.cpp b/src/commands/cmd_hostname_lookup.cpp
index f352443d0..3287f3662 100644
--- a/src/commands/cmd_hostname_lookup.cpp
+++ b/src/commands/cmd_hostname_lookup.cpp
@@ -191,12 +191,6 @@ class ModuleHostnameLookup : public Module
 		ph = &ptrHosts;
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(this->dnsLookup);
-		ServerInstance->Modules->AddService(this->ptrHosts);
-	}
-
 	void OnUserInit(LocalUser *user)
 	{
 		if (!DNS || !user->MyClass->resolvehostnames)
diff --git a/src/commands/cmd_lusers.cpp b/src/commands/cmd_lusers.cpp
index 06419733d..63ce032d1 100644
--- a/src/commands/cmd_lusers.cpp
+++ b/src/commands/cmd_lusers.cpp
@@ -156,7 +156,6 @@ class ModuleLusers : public Module
 
 	void init()
 	{
-		ServerInstance->Modules->AddService(cmd);
 		ServerInstance->Modes->AddModeWatcher(&mw);
 	}
 
diff --git a/src/commands/cmd_privmsg.cpp b/src/commands/cmd_privmsg.cpp
index ed98c771f..5a8e23e9b 100644
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/commands/cmd_privmsg.cpp
@@ -269,12 +269,6 @@ class ModuleCoreMessage : public Module
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(CommandPrivmsg);
-		ServerInstance->Modules->AddService(CommandNotice);
-	}
-
 	Version GetVersion()
 	{
 		return Version("PRIVMSG, NOTICE", VF_CORE|VF_VENDOR);
diff --git a/src/commands/cmd_whowas.cpp b/src/commands/cmd_whowas.cpp
index ea1020fbc..175b2bdf3 100644
--- a/src/commands/cmd_whowas.cpp
+++ b/src/commands/cmd_whowas.cpp
@@ -228,11 +228,6 @@ class ModuleWhoWas : public Module
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(cmd);
-	}
-
 	void OnGarbageCollect()
 	{
 		// Remove all entries older than MaxKeep