Get rid of the remaining references in the core to specific services. Move more stuff out of the core to the proper modules.

100 files changed, 197 insertions, 371 deletions

diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp
index bbac6e689..9a0b638c7 100644
--- a/modules/commands/bs_assign.cpp
+++ b/modules/commands/bs_assign.cpp
@@ -9,8 +9,6 @@
  * Based on the original code of Services by Andy Church.
  */
 
-/*************************************************************************/
-
 #include "module.h"
 
 class CommandBSAssign : public Command
diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp
index 31dee8f8e..22fa74714 100644
--- a/modules/commands/bs_badwords.cpp
+++ b/modules/commands/bs_badwords.cpp
@@ -215,7 +215,6 @@ class CommandBSBadwords : public Command
 
 		ci->ClearBadWords();
 		source.Reply(_("Bad words list is now empty."));
-		return;
 	}
 
  public:
diff --git a/modules/commands/bs_bot.cpp b/modules/commands/bs_bot.cpp
index 16fd9f2f2..aa3cf378d 100644
--- a/modules/commands/bs_bot.cpp
+++ b/modules/commands/bs_bot.cpp
@@ -9,8 +9,6 @@
  * Based on the original code of Services by Andy Church.
  */
 
-/*************************************************************************/
-
 #include "module.h"
 
 class CommandBSBot : public Command
diff --git a/modules/commands/bs_botlist.cpp b/modules/commands/bs_botlist.cpp
index e682bd47d..2714c3fdc 100644
--- a/modules/commands/bs_botlist.cpp
+++ b/modules/commands/bs_botlist.cpp
@@ -9,8 +9,6 @@
  * Based on the original code of Services by Andy Church.
  */
 
-/*************************************************************************/
-
 #include "module.h"
 
 class CommandBSBotList : public Command
diff --git a/modules/commands/bs_control.cpp b/modules/commands/bs_control.cpp
index 32e9392d7..94186c13b 100644
--- a/modules/commands/bs_control.cpp
+++ b/modules/commands/bs_control.cpp
@@ -9,8 +9,6 @@
  * Based on the original code of Services by Andy Church.
  */
 
-/*************************************************************************/
-
 #include "module.h"
 
 class CommandBSSay : public Command
diff --git a/modules/commands/bs_info.cpp b/modules/commands/bs_info.cpp
index 6c017dc55..8bbfd0b18 100644
--- a/modules/commands/bs_info.cpp
+++ b/modules/commands/bs_info.cpp
@@ -10,8 +10,6 @@
  *
  *
  */
-/*************************************************************************/
-
 #include "module.h"
 
 class CommandBSInfo : public Command
diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp
index 5c1bdc6a8..4b869421d 100644
--- a/modules/commands/bs_kick.cpp
+++ b/modules/commands/bs_kick.cpp
@@ -74,7 +74,7 @@ class CommandBSKickBase : public Command
 	virtual bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override = 0;
 
  protected:
-	bool CheckArguments(CommandSource &source, const std::vector<Anope::string> &params, ChannelInfo* &ci) anope_override
+	bool CheckArguments(CommandSource &source, const std::vector<Anope::string> &params, ChannelInfo* &ci)
 	{
 		const Anope::string &chan = params[0];
 		const Anope::string &option = params[1];
diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index f8356b383..64b2386fb 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -9,8 +9,6 @@
  * Based on the original code of Services by Andy Church.
  */
 
-/*************************************************************************/
-
 #include "module.h"
 
 static std::map<Anope::string, int16_t, ci::less> defaultLevels;
diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp
index 51665d309..1cce6afbe 100644
--- a/modules/commands/cs_akick.cpp
+++ b/modules/commands/cs_akick.cpp
@@ -9,8 +9,6 @@
  * Based on the original code of Services by Andy Church.
  */
 
-/*************************************************************************/
-
 #include "module.h"
 
 class CommandCSAKick : public Command
diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp
index c3fffecd9..fbd9833a5 100644
--- a/modules/commands/cs_ban.cpp
+++ b/modules/commands/cs_ban.cpp
@@ -9,7 +9,6 @@
  * Based on the original code of Services by Andy Church.
  */
 
-/*************************************************************************/
 
 #include "module.h"
 
diff --git a/modules/commands/cs_clone.cpp b/modules/commands/cs_clone.cpp
index e4c1ac7f6..d7045123f 100644
--- a/modules/commands/cs_clone.cpp
+++ b/modules/commands/cs_clone.cpp
@@ -9,8 +9,6 @@
  * Based on the original code of Services by Andy Church.
  */
 
-/*************************************************************************/
-
 #include "module.h"
 
 class CommandCSClone : public Command
@@ -75,14 +73,7 @@ public:
 
 				target_ci->c->CheckModes();
 
-				target_ci->c->SetCorrectModes(u, true, true);
-
-				/* Mark the channel as persistent */
-				if (target_ci->c->HasMode("PERM"))
-					target_ci->ExtendMetadata("PERSIST");
-				/* Persist may be in def cflags, set it here */
-				else if (target_ci->HasExt("PERSIST"))
-					target_ci->c->SetMode(NULL, "PERM");
+				target_ci->c->SetCorrectModes(u, true);
 			}
 
 			if (target_ci->c && !target_ci->c->topic.empty())
diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp
index 433e35799..998dd8ab0 100644
--- a/modules/commands/cs_drop.cpp
+++ b/modules/commands/cs_drop.cpp
@@ -9,8 +9,6 @@
  * Based on the original code of Services by Andy Church.
  */
 
-/*************************************************************************/
-
 #include "module.h"
 
 class CommandCSDrop : public Command
diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp
index 0579ebb2b..e40676186 100644
--- a/modules/commands/cs_enforce.cpp
+++ b/modules/commands/cs_enforce.cpp
@@ -33,7 +33,7 @@ class CommandCSEnforce : public Command
 		{
 			ChanUserContainer *uc = it->second;
 
-			ci->c->SetCorrectModes(uc->user, false, false);
+			ci->c->SetCorrectModes(uc->user, false);
 		}
 
 		if (!hadsecureops)
diff --git a/modules/commands/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp
index da764d81c..c5e31f122 100644
--- a/modules/commands/cs_entrymsg.cpp
+++ b/modules/commands/cs_entrymsg.cpp
@@ -9,8 +9,6 @@
  * Based on the original code of Services by Andy Church.
  */
 
-/*************************************************************************/
-
 #include "module.h"
 
 struct EntryMsg : Serializable
diff --git a/modules/commands/cs_fantasy_stats.cpp b/modules/commands/cs_fantasy_stats.cpp
index b8c83e73b..a7324bf9f 100644
--- a/modules/commands/cs_fantasy_stats.cpp
+++ b/modules/commands/cs_fantasy_stats.cpp
@@ -9,8 +9,6 @@
  * Based on the original code of Services by Andy Church.
  */
 
-/*************************************************************************/
-
 #include "module.h"
 #includ