Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9

156 files changed, 21 insertions, 198 deletions

diff --git a/src/core/bs_act.cpp b/src/core/bs_act.cpp
index 3cf1cb0f9..2b89a67c0 100644
--- a/src/core/bs_act.cpp
+++ b/src/core/bs_act.cpp
@@ -77,7 +77,6 @@ class BSAct : public Module
 	BSAct(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BotServ, new CommandBSAct());
 	}
diff --git a/src/core/bs_assign.cpp b/src/core/bs_assign.cpp
index b6703c04c..0695a7e6d 100644
--- a/src/core/bs_assign.cpp
+++ b/src/core/bs_assign.cpp
@@ -87,7 +87,6 @@ class BSAssign : public Module
 	BSAssign(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BotServ, new CommandBSAssign);
 	}
diff --git a/src/core/bs_badwords.cpp b/src/core/bs_badwords.cpp
index d4be661bf..b77607f79 100644
--- a/src/core/bs_badwords.cpp
+++ b/src/core/bs_badwords.cpp
@@ -268,7 +268,6 @@ class BSBadwords : public Module
 	BSBadwords(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BotServ, new CommandBSBadwords);
 	}
diff --git a/src/core/bs_bot.cpp b/src/core/bs_bot.cpp
index 2b7cc5cf4..657ac76cd 100644
--- a/src/core/bs_bot.cpp
+++ b/src/core/bs_bot.cpp
@@ -409,7 +409,6 @@ class BSBot : public Module
 	BSBot(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BotServ, new CommandBSBot());
 	}
diff --git a/src/core/bs_botlist.cpp b/src/core/bs_botlist.cpp
index bfc0cfc58..fc24f8437 100644
--- a/src/core/bs_botlist.cpp
+++ b/src/core/bs_botlist.cpp
@@ -85,7 +85,6 @@ class BSBotList : public Module
 	BSBotList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BotServ, new CommandBSBotList());
 	}
diff --git a/src/core/bs_help.cpp b/src/core/bs_help.cpp
index 3842b8910..694318187 100644
--- a/src/core/bs_help.cpp
+++ b/src/core/bs_help.cpp
@@ -44,7 +44,6 @@ class BSHelp : public Module
 	BSHelp(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BotServ, new CommandBSHelp());
 	}
diff --git a/src/core/bs_info.cpp b/src/core/bs_info.cpp
index 45e650d29..3df82a3a8 100644
--- a/src/core/bs_info.cpp
+++ b/src/core/bs_info.cpp
@@ -225,7 +225,6 @@ class BSInfo : public Module
 	BSInfo(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BotServ, new CommandBSInfo());
 	}
diff --git a/src/core/bs_kick.cpp b/src/core/bs_kick.cpp
index 54781a134..2f2784d93 100644
--- a/src/core/bs_kick.cpp
+++ b/src/core/bs_kick.cpp
@@ -380,7 +380,6 @@ class BSKick : public Module
 	BSKick(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BotServ, new CommandBSKick());
 	}
diff --git a/src/core/bs_say.cpp b/src/core/bs_say.cpp
index 40d48fef2..71eb06fe2 100644
--- a/src/core/bs_say.cpp
+++ b/src/core/bs_say.cpp
@@ -83,7 +83,6 @@ class BSSay : public Module
 	BSSay(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BotServ, new CommandBSSay());
 	}
diff --git a/src/core/bs_set.cpp b/src/core/bs_set.cpp
index 9d89c696c..d6f70352a 100644
--- a/src/core/bs_set.cpp
+++ b/src/core/bs_set.cpp
@@ -207,7 +207,6 @@ class BSSet : public Module
 	BSSet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BotServ, new CommandBSSet());
 	}
diff --git a/src/core/bs_unassign.cpp b/src/core/bs_unassign.cpp
index cab7e817c..cf6d8d7ab 100644
--- a/src/core/bs_unassign.cpp
+++ b/src/core/bs_unassign.cpp
@@ -65,7 +65,6 @@ class BSUnassign : public Module
 	BSUnassign(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(BotServ, new CommandBSUnassign);
 	}
diff --git a/src/core/cs_access.cpp b/src/core/cs_access.cpp
index 3ab17a31a..da919c95a 100644
--- a/src/core/cs_access.cpp
+++ b/src/core/cs_access.cpp
@@ -604,7 +604,6 @@ class CSAccess : public Module
 	CSAccess(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(ChanServ, new CommandCSAccess());
diff --git a/src/core/cs_akick.cpp b/src/core/cs_akick.cpp
index cb9ae7f08..d366304d5 100644
--- a/src/core/cs_akick.cpp
+++ b/src/core/cs_akick.cpp
@@ -567,7 +567,6 @@ class CSAKick : public Module
 	CSAKick(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(ChanServ, new CommandCSAKick());
 	}
diff --git a/src/core/cs_ban.cpp b/src/core/cs_ban.cpp
index 578ca9868..17fbc1946 100644
--- a/src/core/cs_ban.cpp
+++ b/src/core/cs_ban.cpp
@@ -102,7 +102,6 @@ class CSBan : public Module
 	CSBan(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(ChanServ, new CommandCSBan("BAN"));
 		this->AddCommand(ChanServ, new CommandCSBan("KB"));
diff --git a/src/core/cs_clear.cpp b/src/core/cs_clear.cpp
index 088dae741..7cc2631a4 100644
--- a/src/core/cs_clear.cpp
+++ b/src/core/cs_clear.cpp
@@ -170,7 +170,6 @@ class CSClear : public Module
 	CSClear(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(ChanServ, new CommandCSClear());
 	}
diff --git a/src/core/cs_drop.cpp b/src/core/cs_drop.cpp
index cb54ab274..98daaee4f 100644
--- a/src/core/cs_drop.cpp
+++ b/src/core/cs_drop.cpp
@@ -108,7 +108,6 @@ class CSDrop : public Module
 	CSDrop(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(ChanServ, new CommandCSDrop());
 	}
diff --git a/src/core/cs_forbid.cpp b/src/core/cs_forbid.cpp
index e1717548b..a4e62eef7 100644
--- a/src/core/cs_forbid.cpp
+++ b/src/core/cs_forbid.cpp
@@ -121,7 +121,6 @@ class CSForbid : public Module
 	CSForbid(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(ChanServ, new CommandCSForbid());
 	}
diff --git a/src/core/cs_getkey.cpp b/src/core/cs_getkey.cpp
index 5c92d1d70..dc2f74655 100644
--- a/src/core/cs_getkey.cpp
+++ b/src/core/cs_getkey.cpp
@@ -67,7 +67,6 @@ class CSGetKey : public Module
 	CSGetKey(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(ChanServ, new CommandCSGetKey());
 	}
diff --git a/src/core/cs_help.cpp b/src/core/cs_help.cpp
index e7c352644..f655752e6 100644
--- a/src/core/cs_help.cpp
+++ b/src/core/cs_help.cpp
@@ -64,7 +64,6 @@ class CSHelp : public Module
 	CSHelp(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(ChanServ, new CommandCSHelp());
 	}
diff --git a/src/core/cs_info.cpp b/src/core/cs_info.cpp
index 8ff54de67..c437d4a15 100644
--- a/src/core/cs_info.cpp
+++ b/src/core/cs_info.cpp
@@ -163,7 +163,6 @@ class CSInfo : public Module
 	CSInfo(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(ChanServ, new CommandCSInfo());
 	}
diff --git a/src/core/cs_invite.cpp b/src/core/cs_invite.cpp
index c8b1f15e2..48425e387 100644
--- a/src/core/cs_invite.cpp
+++ b/src/core/cs_invite.cpp
@@ -86,7 +86,6 @@ class CSInvite : public Module
 	CSInvite(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(ChanServ, new CommandCSInvite());
 	}
diff --git a/src/core/cs_kick.cpp b/src/core/cs_kick.cpp
index 70c3114a3..9aa4d30f6 100644
--- a/src/core/cs_kick.cpp
+++ b/src/core/cs_kick.cpp
@@ -88,7 +88,6 @@ class CSKick : public Module
 	CSKick(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(ChanServ, new CommandCSKick("KICK"));
 		this->AddCommand(ChanServ, new CommandCSKick("K"));
diff --git a/src/core/cs_list.cpp b/src/core/cs_list.cpp
index 0fc272e46..5d7547499 100644
--- a/src/core/cs_list.cpp
+++ b/src/core/cs_list.cpp
@@ -168,7 +168,6 @@ public:
 	CSList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(ChanServ, new CommandCSList());
 	}
diff --git a/src/core/cs_modes.cpp b/src/core/cs_modes.cpp
index 343f96ddf..dce79f50d 100644
--- a/src/core/cs_modes.cpp
+++ b/src/core/cs_modes.cpp
@@ -402,7 +402,6 @@ class CSModes : public Module
 	CSModes(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(ChanServ, new CommandCSOp());
diff --git a/src/core/cs_register.cpp b/src/core/cs_register.cpp
index 38aced195..7bc146409 100644
--- a/src/core/cs_register.cpp
+++ b/src/core/cs_register.cpp
@@ -122,7 +122,6 @@ class CSRegister : public Module
 	CSRegister(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(ChanServ, new CommandCSRegister());
diff --git a/src/core/cs_saset.cpp b/src/core/cs_saset.cpp
index 02a44e974..161bf6f7c 100644
--- a/src/core/cs_saset.cpp
+++ b/src/core/cs_saset.cpp
@@ -113,7 +113,6 @@ class CSSASet : public Module
 	CSSASet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(ChanServ, new CommandCSSASet("SASET"));
diff --git a/src/core/cs_saset_noexpire.cpp b/src/core/cs_saset_noexpire.cpp
index c73bcf7b8..bbed7f014 100644
--- a/src/core/cs_saset_noexpire.cpp
+++ b/src/core/cs_saset_noexpire.cpp
@@ -64,7 +64,6 @@ class CSSetNoexpire : public Module
 	CSSetNoexpire(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SASET");
diff --git a/src/core/cs_set.cpp b/src/core/cs_set.cpp
index 5f7d2da83..c9331e6a3 100644
--- a/src/core/cs_set.cpp
+++ b/src/core/cs_set.cpp
@@ -118,7 +118,6 @@ class CSSet : public Module
 	CSSet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(ChanServ, new CommandCSSet("SET"));
diff --git a/src/core/cs_set_bantype.cpp b/src/core/cs_set_bantype.cpp
index 7095ad717..aad7841e6 100644
--- a/src/core/cs_set_bantype.cpp
+++ b/src/core/cs_set_bantype.cpp
@@ -84,7 +84,6 @@ class CSSetBanType : public Module
 	CSSetBanType(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_description.cpp b/src/core/cs_set_description.cpp
index b4b99cde0..57209ce2e 100644
--- a/src/core/cs_set_description.cpp
+++ b/src/core/cs_set_description.cpp
@@ -78,7 +78,6 @@ class CSSetDescription : public Module
 	CSSetDescription(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_email.cpp b/src/core/cs_set_email.cpp
index 98253999b..61bd4ee76 100644
--- a/src/core/cs_set_email.cpp
+++ b/src/core/cs_set_email.cpp
@@ -85,7 +85,6 @@ class CSSetEMail : public Module
 	CSSetEMail(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_entrymsg.cpp b/src/core/cs_set_entrymsg.cpp
index 651f68271..cddcff36b 100644
--- a/src/core/cs_set_entrymsg.cpp
+++ b/src/core/cs_set_entrymsg.cpp
@@ -85,7 +85,6 @@ class CSSetEntryMsg : public Module
 	CSSetEntryMsg(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_founder.cpp b/src/core/cs_set_founder.cpp
index d835e7fea..35422755e 100644
--- a/src/core/cs_set_founder.cpp
+++ b/src/core/cs_set_founder.cpp
@@ -112,7 +112,6 @@ class CSSetFounder : public Module
 	CSSetFounder(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_keeptopic.cpp b/src/core/cs_set_keeptopic.cpp
index 5fa154fd2..10595373f 100644
--- a/src/core/cs_set_keeptopic.cpp
+++ b/src/core/cs_set_keeptopic.cpp
@@ -83,7 +83,6 @@ class CSSetKeepTopic : public Module
 	CSSetKeepTopic(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_mlock.cpp b/src/core/cs_set_mlock.cpp
index 291bd8925..5a31a8565 100644
--- a/src/core/cs_set_mlock.cpp
+++ b/src/core/cs_set_mlock.cpp
@@ -156,7 +156,6 @@ class CSSetMLock : public Module
 	CSSetMLock(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_opnotice.cpp b/src/core/cs_set_opnotice.cpp
index eb7259d8a..79e953ef2 100644
--- a/src/core/cs_set_opnotice.cpp
+++ b/src/core/cs_set_opnotice.cpp
@@ -83,7 +83,6 @@ class CSSetOpNotice : public Module
 	CSSetOpNotice(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_peace.cpp b/src/core/cs_set_peace.cpp
index f0eef7c29..3dadcb5e3 100644
--- a/src/core/cs_set_peace.cpp
+++ b/src/core/cs_set_peace.cpp
@@ -83,7 +83,6 @@ class CSSetPeace : public Module
 	CSSetPeace(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_persist.cpp b/src/core/cs_set_persist.cpp
index c3f3c16d0..c32603104 100644
--- a/src/core/cs_set_persist.cpp
+++ b/src/core/cs_set_persist.cpp
@@ -128,7 +128,6 @@ class CSSetPersist : public Module
 	CSSetPersist(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_private.cpp b/src/core/cs_set_private.cpp
index edbd6b036..ed618c6ca 100644
--- a/src/core/cs_set_private.cpp
+++ b/src/core/cs_set_private.cpp
@@ -83,7 +83,6 @@ class CSSetPrivate : public Module
 	CSSetPrivate(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_restricted.cpp b/src/core/cs_set_restricted.cpp
index b2b06dcff..5d9537443 100644
--- a/src/core/cs_set_restricted.cpp
+++ b/src/core/cs_set_restricted.cpp
@@ -86,7 +86,6 @@ class CSSetRestricted : public Module
 	CSSetRestricted(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_secure.cpp b/src/core/cs_set_secure.cpp
index a20aa72ff..d5f26fcba 100644
--- a/src/core/cs_set_secure.cpp
+++ b/src/core/cs_set_secure.cpp
@@ -83,7 +83,6 @@ class CSSetSecure : public Module
 	CSSetSecure(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_securefounder.cpp b/src/core/cs_set_securefounder.cpp
index 710a5a613..cda7deef8 100644
--- a/src/core/cs_set_securefounder.cpp
+++ b/src/core/cs_set_securefounder.cpp
@@ -89,7 +89,6 @@ class CSSetSecureFounder : public Module
 	CSSetSecureFounder(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_secureops.cpp b/src/core/cs_set_secureops.cpp
index 4d7df341e..8409018d2 100644
--- a/src/core/cs_set_secureops.cpp
+++ b/src/core/cs_set_secureops.cpp
@@ -83,7 +83,6 @@ class CSSetSecureOps : public Module
 	CSSetSecureOps(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_signkick.cpp b/src/core/cs_set_signkick.cpp
index fa8105bb1..b792ec9c9 100644
--- a/src/core/cs_set_signkick.cpp
+++ b/src/core/cs_set_signkick.cpp
@@ -91,7 +91,6 @@ class CSSetSignKick : public Module
 	CSSetSignKick(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_successor.cpp b/src/core/cs_set_successor.cpp
index 9beb4ee51..f5517b8a9 100644
--- a/src/core/cs_set_successor.cpp
+++ b/src/core/cs_set_successor.cpp
@@ -114,7 +114,6 @@ class CSSetSuccessor : public Module
 	CSSetSuccessor(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_topiclock.cpp b/src/core/cs_set_topiclock.cpp
index 4ea832020..5e89862f6 100644
--- a/src/core/cs_set_topiclock.cpp
+++ b/src/core/cs_set_topiclock.cpp
@@ -83,7 +83,6 @@ class CSSetTopicLock : public Module
 	CSSetTopicLock(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_url.cpp b/src/core/cs_set_url.cpp
index 26f6decee..878cc9562 100644
--- a/src/core/cs_set_url.cpp
+++ b/src/core/cs_set_url.cpp
@@ -85,7 +85,6 @@ class CSSetURL : public Module
 	CSSetURL(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_set_xop.cpp b/src/core/cs_set_xop.cpp
index 05e050837..854989fba 100644
--- a/src/core/cs_set_xop.cpp
+++ b/src/core/cs_set_xop.cpp
@@ -121,7 +121,6 @@ class CSSetXOP : public Module
 	CSSetXOP(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = FindCommand(ChanServ, "SET");
diff --git a/src/core/cs_status.cpp b/src/core/cs_status.cpp
index 498f9b2b5..31dab055c 100644
--- a/src/core/cs_status.cpp
+++ b/src/core/cs_status.cpp
@@ -67,7 +67,6 @@ class CSStatus : public Module
 	CSStatus(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 	}
 };
diff --git a/src/core/cs_suspend.cpp b/src/core/cs_suspend.cpp
index 486c210df..8878e5552 100644
--- a/src/core/cs_suspend.cpp
+++ b/src/core/cs_suspend.cpp
@@ -185,7 +185,6 @@ class CSSuspend : public Module
 	CSSuspend(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(ChanServ, new CommandCSSuspend());
diff --git a/src/core/cs_topic.cpp b/src/core/cs_topic.cpp
index 6030c6a9b..f267ee436 100644
--- a/src/core/cs_topic.cpp
+++ b/src/core/cs_topic.cpp
@@ -89,7 +89,6 @@ class CSTopic : public Module
 	CSTopic(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(ChanServ, new CommandCSTopic());
diff --git a/src/core/cs_unban.cpp b/src/core/cs_unban.cpp
index 23d530c52..9085d46a1 100644
--- a/src/core/cs_unban.cpp
+++ b/src/core/cs_unban.cpp
@@ -79,7 +79,6 @@ class CSUnban : public Module
 	CSUnban(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(ChanServ, new CommandCSUnban());
diff --git a/src/core/cs_xop.cpp b/src/core/cs_xop.cpp
index 5a3757035..8e63b61e9 100644
--- a/src/core/cs_xop.cpp
+++ b/src/core/cs_xop.cpp
@@ -624,7 +624,6 @@ class CSXOP : public Module
 	CSXOP(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(ChanServ, new CommandCSSOP());
diff --git a/src/core/db_plain.cpp b/src/core/db_plain.cpp
index 151cb3c4a..cf41ea104 100644
--- a/src/core/db_plain.cpp
+++ b/src/core/db_plain.cpp
@@ -516,7 +516,6 @@ class DBPlain : public Module
 	DBPlain(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(DATABASE);
 
 		Implementation i[] = { I_OnReload, I_OnDatabaseRead, I_OnLoadDatabase, I_OnDatabaseReadMetadata, I_OnSaveDatabase, I_OnModuleLoad };
diff --git a/src/core/enc_md5.cpp b/src/core/enc_md5.cpp
index 87daea319..5644cf869 100644
--- a/src/core/enc_md5.cpp
+++ b/src/core/enc_md5.cpp
@@ -318,7 +318,6 @@ class EMD5 : public Module
 	EMD5(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(ENCRYPTION);
 
 		ModuleManager::Attach(I_OnEncrypt, this);
diff --git a/src/core/enc_none.cpp b/src/core/enc_none.cpp
index 3cbd93060..9e618baed 100644
--- a/src/core/enc_none.cpp
+++ b/src/core/enc_none.cpp
@@ -15,7 +15,6 @@ class ENone : public Module
 	ENone(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(ENCRYPTION);
 
 		ModuleManager::Attach(I_OnEncrypt, this);
diff --git a/src/core/enc_old.cpp b/src/core/enc_old.cpp
index 2e1b57e10..af4613699 100644
--- a/src/core/enc_old.cpp
+++ b/src/core/enc_old.cpp
@@ -323,7 +323,6 @@ class EOld : public Module
 	EOld(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(ENCRYPTION);
 
 		ModuleManager::Attach(I_OnEncrypt, this);
diff --git a/src/core/enc_sha1.cpp b/src/core/enc_sha1.cpp
index 1668811d7..180a8b58d 100644
--- a/src/core/enc_sha1.cpp
+++ b/src/core/enc_sha1.cpp
@@ -171,7 +171,6 @@ class ESHA1 : public Module
 	ESHA1(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(ENCRYPTION);
 
 		ModuleManager::Attach(I_OnEncrypt, this);
diff --git a/src/core/enc_sha256.cpp b/src/core/enc_sha256.cpp
index f47aa6a4d..bef38fb1d 100644
--- a/src/core/enc_sha256.cpp
+++ b/src/core/enc_sha256.cpp
@@ -251,7 +251,6 @@ class ESHA256 : public Module
 	ESHA256(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(ENCRYPTION);
 
 		ModuleManager::Attach(I_OnEncrypt, this);
diff --git a/src/core/hs_del.cpp b/src/core/hs_del.cpp
index 9944326b0..9c3f8da62 100644
--- a/src/core/hs_del.cpp
+++ b/src/core/hs_del.cpp
@@ -64,7 +64,6 @@ class HSDel : public Module
 	HSDel(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HostServ, new CommandHSDel());
diff --git a/src/core/hs_delall.cpp b/src/core/hs_delall.cpp
index 89b3551ae..cf249371a 100644
--- a/src/core/hs_delall.cpp
+++ b/src/core/hs_delall.cpp
@@ -69,7 +69,6 @@ class HSDelAll : public Module
 	HSDelAll(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HostServ, new CommandHSDelAll());
diff --git a/src/core/hs_group.cpp b/src/core/hs_group.cpp
index f56015f98..add5c1ecb 100644
--- a/src/core/hs_group.cpp
+++ b/src/core/hs_group.cpp
@@ -57,7 +57,6 @@ class HSGroup : public Module
 	HSGroup(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HostServ, new CommandHSGroup());
diff --git a/src/core/hs_help.cpp b/src/core/hs_help.cpp
index a6029d5a0..507f887ed 100644
--- a/src/core/hs_help.cpp
+++ b/src/core/hs_help.cpp
@@ -41,7 +41,6 @@ class HSHelp : public Module
 	HSHelp(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HostServ, new CommandHSHelp());
diff --git a/src/core/hs_list.cpp b/src/core/hs_list.cpp
index 1812c3a54..7e4d16cb8 100644
--- a/src/core/hs_list.cpp
+++ b/src/core/hs_list.cpp
@@ -123,7 +123,6 @@ class HSList : public Module
 	HSList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HostServ, new CommandHSList());
diff --git a/src/core/hs_off.cpp b/src/core/hs_off.cpp
index 64828c2b7..6d87a1288 100644
--- a/src/core/hs_off.cpp
+++ b/src/core/hs_off.cpp
@@ -53,7 +53,6 @@ class HSOff : public Module
 	HSOff(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HostServ, new CommandHSOff());
diff --git a/src/core/hs_on.cpp b/src/core/hs_on.cpp
index a4514f0a2..d58348d8d 100644
--- a/src/core/hs_on.cpp
+++ b/src/core/hs_on.cpp
@@ -67,7 +67,6 @@ class HSOn : public Module
 	HSOn(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HostServ, new CommandHSOn());
diff --git a/src/core/hs_set.cpp b/src/core/hs_set.cpp
index 7cba19c21..bf6c8788a 100644
--- a/src/core/hs_set.cpp
+++ b/src/core/hs_set.cpp
@@ -156,7 +156,6 @@ class HSSet : public Module
 	HSSet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HostServ, new CommandHSSet());
diff --git a/src/core/hs_setall.cpp b/src/core/hs_setall.cpp
index eddf6202a..c0f3b1422 100644
--- a/src/core/hs_setall.cpp
+++ b/src/core/hs_setall.cpp
@@ -155,7 +155,6 @@ class HSSetAll : public Module
 	HSSetAll(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(HostServ, new CommandHSSetAll());
diff --git a/src/core/ms_cancel.cpp b/src/core/ms_cancel.cpp
index 62f3026b7..af26ab6b8 100644
--- a/src/core/ms_cancel.cpp
+++ b/src/core/ms_cancel.cpp
@@ -79,7 +79,6 @@ class MSCancel : public Module
 	MSCancel(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(MemoServ, new CommandMSCancel());
 	}
diff --git a/src/core/ms_check.cpp b/src/core/ms_check.cpp
index 90e45ebaa..62400641b 100644
--- a/src/core/ms_check.cpp
+++ b/src/core/ms_check.cpp
@@ -97,7 +97,6 @@ class MSCheck : public Module
 	MSCheck(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(MemoServ, new CommandMSCheck());
diff --git a/src/core/ms_del.cpp b/src/core/ms_del.cpp
index 507f410af..7217f3baf 100644
--- a/src/core/ms_del.cpp
+++ b/src/core/ms_del.cpp
@@ -150,7 +150,6 @@ class MSDel : public Module
 	MSDel(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(MemoServ, new CommandMSDel());
diff --git a/src/core/ms_help.cpp b/src/core/ms_help.cpp
index 9a982e7b5..f2646904c 100644
--- a/src/core/ms_help.cpp
+++ b/src/core/ms_help.cpp
@@ -42,7 +42,6 @@ class MSHelp : public Module
 	MSHelp(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(MemoServ, new CommandMSHelp());
diff --git a/src/core/ms_info.cpp b/src/core/ms_info.cpp
index 89c814a6e..1a368baf9 100644
--- a/src/core/ms_info.cpp
+++ b/src/core/ms_info.cpp
@@ -206,7 +206,6 @@ class MSInfo : public Module
 	MSInfo(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(MemoServ, new CommandMSInfo());
diff --git a/src/core/ms_list.cpp b/src/core/ms_list.cpp
index f635db8c8..3b3a9600f 100644
--- a/src/core/ms_list.cpp
+++ b/src/core/ms_list.cpp
@@ -164,7 +164,6 @@ class MSList : public Module
 	MSList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(MemoServ, new CommandMSList());
diff --git a/src/core/ms_read.cpp b/src/core/ms_read.cpp
index fb2de7c9e..7b18f2d9e 100644
--- a/src/core/ms_read.cpp
+++ b/src/core/ms_read.cpp
@@ -147,7 +147,6 @@ class MSRead : public Module
 	MSRead(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(MemoServ, new CommandMSRead());
diff --git a/src/core/ms_rsend.cpp b/src/core/ms_rsend.cpp
index 3776333f8..0c21ac5fc 100644
--- a/src/core/ms_rsend.cpp
+++ b/src/core/ms_rsend.cpp
@@ -81,7 +81,6 @@ class MSRSend : public Module
 			throw ModuleException("Don't like memo reciepts, or something.");
 
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(MemoServ, new CommandMSRSend());
diff --git a/src/core/ms_send.cpp b/src/core/ms_send.cpp
index 1958cce79..5f55fc774 100644
--- a/src/core/ms_send.cpp
+++ b/src/core/ms_send.cpp
@@ -52,7 +52,6 @@ class MSSend : public Module
 	MSSend(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(MemoServ, new CommandMSSend());
diff --git a/src/core/ms_sendall.cpp b/src/core/ms_sendall.cpp
index b8b0d2bf1..16b95f928 100644
--- a/src/core/ms_sendall.cpp
+++ b/src/core/ms_sendall.cpp
@@ -68,7 +68,6 @@ class MSSendAll : public Module
 	MSSendAll(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(MemoServ, new CommandMSSendAll());
diff --git a/src/core/ms_set.cpp b/src/core/ms_set.cpp
index dfb2d6f54..11ba9d9cc 100644
--- a/src/core/ms_set.cpp
+++ b/src/core/ms_set.cpp
@@ -263,7 +263,6 @@ class MSSet : public Module
 	MSSet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(MemoServ, new CommandMSSet());
diff --git a/src/core/ms_staff.cpp b/src/core/ms_staff.cpp
index 66a24aa68..481ad9db4 100644
--- a/src/core/ms_staff.cpp
+++ b/src/core/ms_staff.cpp
@@ -65,7 +65,6 @@ class MSStaff : public Module
 	MSStaff(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(MemoServ, new CommandMSStaff());
diff --git a/src/core/ns_access.cpp b/src/core/ns_access.cpp
index c578e6095..e0549172e 100644
--- a/src/core/ns_access.cpp
+++ b/src/core/ns_access.cpp
@@ -173,7 +173,6 @@ class NSAccess : public Module
 	NSAccess(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSAccess());
diff --git a/src/core/ns_alist.cpp b/src/core/ns_alist.cpp
index a904fe9b0..ddbb6c1db 100644
--- a/src/core/ns_alist.cpp
+++ b/src/core/ns_alist.cpp
@@ -147,7 +147,6 @@ class NSAList : public Module
 	NSAList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSAList());
diff --git a/src/core/ns_drop.cpp b/src/core/ns_drop.cpp
index 7383706d9..f5e52c575 100644
--- a/src/core/ns_drop.cpp
+++ b/src/core/ns_drop.cpp
@@ -120,7 +120,6 @@ class NSDrop : public Module
 	NSDrop(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSDrop());
diff --git a/src/core/ns_forbid.cpp b/src/core/ns_forbid.cpp
index 61a28e552..ff54de4c3 100644
--- a/src/core/ns_forbid.cpp
+++ b/src/core/ns_forbid.cpp
@@ -113,7 +113,6 @@ class NSForbid : public Module
 	NSForbid(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSForbid());
diff --git a/src/core/ns_getemail.cpp b/src/core/ns_getemail.cpp
index c0a2980c5..01dff2cfa 100644
--- a/src/core/ns_getemail.cpp
+++ b/src/core/ns_getemail.cpp
@@ -79,7 +79,6 @@ class NSGetEMail : public Module
 	NSGetEMail(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSGetEMail());
diff --git a/src/core/ns_getpass.cpp b/src/core/ns_getpass.cpp
index cda008967..98170b7ac 100644
--- a/src/core/ns_getpass.cpp
+++ b/src/core/ns_getpass.cpp
@@ -82,7 +82,6 @@ class NSGetPass : public Module
 	NSGetPass(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSGetPass());
diff --git a/src/core/ns_ghost.cpp b/src/core/ns_ghost.cpp
index 1ae0a1946..3f1ae6897 100644
--- a/src/core/ns_ghost.cpp
+++ b/src/core/ns_ghost.cpp
@@ -95,7 +95,6 @@ class NSGhost : public Module
 	NSGhost(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSGhost());
diff --git a/src/core/ns_group.cpp b/src/core/ns_group.cpp
index cc5da7860..bf9371f75 100644
--- a/src/core/ns_group.cpp
+++ b/src/core/ns_group.cpp
@@ -292,7 +292,6 @@ class NSGroup : public Module
 	NSGroup(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSGroup());
diff --git a/src/core/ns_help.cpp b/src/core/ns_help.cpp
index a9b40592f..b212d5498 100644
--- a/src/core/ns_help.cpp
+++ b/src/core/ns_help.cpp
@@ -58,7 +58,6 @@ class NSHelp : public Module
 	NSHelp(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSHelp());
diff --git a/src/core/ns_identify.cpp b/src/core/ns_identify.cpp
index 2f02cac81..b749358ac 100644
--- a/src/core/ns_identify.cpp
+++ b/src/core/ns_identify.cpp
@@ -118,7 +118,6 @@ class NSIdentify : public Module
 	NSIdentify(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSIdentify("IDENTIFY"));
diff --git a/src/core/ns_info.cpp b/src/core/ns_info.cpp
index e5a4d5e9e..72bb59d94 100644
--- a/src/core/ns_info.cpp
+++ b/src/core/ns_info.cpp
@@ -212,7 +212,6 @@ class NSInfo : public Module
 	NSInfo(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSInfo());
diff --git a/src/core/ns_list.cpp b/src/core/ns_list.cpp
index 7b9419a14..b0a2663c0 100644
--- a/src/core/ns_list.cpp
+++ b/src/core/ns_list.cpp
@@ -219,7 +219,6 @@ class NSList : public Module
 	NSList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSList());
diff --git a/src/core/ns_logout.cpp b/src/core/ns_logout.cpp
index c3d5696f2..860e60c36 100644
--- a/src/core/ns_logout.cpp
+++ b/src/core/ns_logout.cpp
@@ -90,7 +90,6 @@ class NSLogout : public Module
 	NSLogout(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSLogout());
diff --git a/src/core/ns_recover.cpp b/src/core/ns_recover.cpp
index 501c06642..da6d4381f 100644
--- a/src/core/ns_recover.cpp
+++ b/src/core/ns_recover.cpp
@@ -116,7 +116,6 @@ class NSRecover : public Module
 	NSRecover(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSRecover());
diff --git a/src/core/ns_register.cpp b/src/core/ns_register.cpp
index 26b8976b1..ece85a9be 100644
--- a/src/core/ns_register.cpp
+++ b/src/core/ns_register.cpp
@@ -380,7 +380,6 @@ class NSRegister : public Module
 	NSRegister(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSRegister());
diff --git a/src/core/ns_release.cpp b/src/core/ns_release.cpp
index 7efcdae88..e01fa3efb 100644
--- a/src/core/ns_release.cpp
+++ b/src/core/ns_release.cpp
@@ -98,7 +98,6 @@ class NSRelease : public Module
 	NSRelease(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSRelease());
diff --git a/src/core/ns_resetpass.cpp b/src/core/ns_resetpass.cpp
index be14caa08..9dfd56603 100644
--- a/src/core/ns_resetpass.cpp
+++ b/src/core/ns_resetpass.cpp
@@ -68,7 +68,6 @@ class NSResetPass : public Module
 	NSResetPass(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		if (!Config.UseMail)
diff --git a/src/core/ns_saset.cpp b/src/core/ns_saset.cpp
index ccc6be928..7d487c1fa 100644
--- a/src/core/ns_saset.cpp
+++ b/src/core/ns_saset.cpp
@@ -242,7 +242,6 @@ public:
 	NSSASet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *c = new CommandNSSASet("SASET");
diff --git a/src/core/ns_sendpass.cpp b/src/core/ns_sendpass.cpp
index 6d4358f06..0708f5f24 100644
--- a/src/core/ns_sendpass.cpp
+++ b/src/core/ns_sendpass.cpp
@@ -75,7 +75,6 @@ class NSSendPass : public Module
 	NSSendPass(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSSendPass());
diff --git a/src/core/ns_set.cpp b/src/core/ns_set.cpp
index ecb1355c3..af3cd7a7f 100644
--- a/src/core/ns_set.cpp
+++ b/src/core/ns_set.cpp
@@ -226,7 +226,6 @@ class NSSet : public Module
 	NSSet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		Command *set = new CommandNSSet("SET");
diff --git a/src/core/ns_status.cpp b/src/core/ns_status.cpp
index 9695dd4fd..df6785902 100644
--- a/src/core/ns_status.cpp
+++ b/src/core/ns_status.cpp
@@ -69,7 +69,6 @@ class NSStatus : public Module
 	NSStatus(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSStatus());
diff --git a/src/core/ns_suspend.cpp b/src/core/ns_suspend.cpp
index 4359eedcf..17bfc46c7 100644
--- a/src/core/ns_suspend.cpp
+++ b/src/core/ns_suspend.cpp
@@ -190,7 +190,6 @@ class NSSuspend : public Module
 	NSSuspend(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(NickServ, new CommandNSSuspend());
diff --git a/src/core/ns_update.cpp b/src/core/ns_update.cpp
index 4ed3b5b77..271784202 100644
--- a/src/core/ns_update.cpp
+++ b/src/core/ns_update.cpp
@@ -59,7 +59,6 @@ class NSUpdate : public Module
 	NSUpdate(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(NickServ, new CommandNSUpdate());
 	}
diff --git a/src/core/os_akill.cpp b/src/core/os_akill.cpp
index fd840cd5c..06be20d1b 100644
--- a/src/core/os_akill.cpp
+++ b/src/core/os_akill.cpp
@@ -393,7 +393,6 @@ class OSAKill : public Module
 	OSAKill(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(OperServ, new CommandOSAKill());
 	}
diff --git a/src/core/os_chankill.cpp b/src/core/os_chankill.cpp
index 033bf380d..8a22fa256 100644
--- a/src/core/os_chankill.cpp
+++ b/src/core/os_chankill.cpp
@@ -109,7 +109,6 @@ class OSChanKill : public Module
 	OSChanKill(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSChanKill());
diff --git a/src/core/os_chanlist.cpp b/src/core/os_chanlist.cpp
index eb8c32e6a..e48cd2b9c 100644
--- a/src/core/os_chanlist.cpp
+++ b/src/core/os_chanlist.cpp
@@ -99,7 +99,6 @@ class OSChanList : public Module
 	OSChanList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSChanList());
diff --git a/src/core/os_clearmodes.cpp b/src/core/os_clearmodes.cpp
index b5ebba938..f3d6223ea 100644
--- a/src/core/os_clearmodes.cpp
+++ b/src/core/os_clearmodes.cpp
@@ -179,7 +179,6 @@ class OSClearModes : public Module
 	OSClearModes(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSClearModes());
diff --git a/src/core/os_defcon.cpp b/src/core/os_defcon.cpp
index caf2836fe..de3c6b030 100644
--- a/src/core/os_defcon.cpp
+++ b/src/core/os_defcon.cpp
@@ -138,7 +138,6 @@ class OSDEFCON : public Module
 	OSDEFCON(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		if (!Config.DefConLevel)
diff --git a/src/core/os_global.cpp b/src/core/os_global.cpp
index df62f753f..afa040be8 100644
--- a/src/core/os_global.cpp
+++ b/src/core/os_global.cpp
@@ -54,7 +54,6 @@ class OSGlobal : public Module
 	OSGlobal(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSGlobal());
diff --git a/src/core/os_help.cpp b/src/core/os_help.cpp
index d6f9001b4..433d673c7 100644
--- a/src/core/os_help.cpp
+++ b/src/core/os_help.cpp
@@ -42,7 +42,6 @@ class OSHelp : public Module
 	OSHelp(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(OperServ, new CommandOSHelp());
 	}
diff --git a/src/core/os_ignore.cpp b/src/core/os_ignore.cpp
index f852a36b8..cbee6e3fb 100644
--- a/src/core/os_ignore.cpp
+++ b/src/core/os_ignore.cpp
@@ -140,7 +140,6 @@ class OSIgnore : public Module
 	OSIgnore(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(OperServ, new CommandOSIgnore());
 
diff --git a/src/core/os_jupe.cpp b/src/core/os_jupe.cpp
index 7fedb968c..cce908949 100644
--- a/src/core/os_jupe.cpp
+++ b/src/core/os_jupe.cpp
@@ -70,7 +70,6 @@ class OSJupe : public Module
 	OSJupe(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSJupe());
diff --git a/src/core/os_kick.cpp b/src/core/os_kick.cpp
index f4fb4f7e5..e05764a09 100644
--- a/src/core/os_kick.cpp
+++ b/src/core/os_kick.cpp
@@ -72,7 +72,6 @@ class OSKick : public Module
 	OSKick(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSKick());
diff --git a/src/core/os_mode.cpp b/src/core/os_mode.cpp
index 1f9396169..139ef8edf 100644
--- a/src/core/os_mode.cpp
+++ b/src/core/os_mode.cpp
@@ -63,7 +63,6 @@ class OSMode : public Module
 	OSMode(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSMode());
diff --git a/src/core/os_modinfo.cpp b/src/core/os_modinfo.cpp
index 055d2a136..e867713f8 100644
--- a/src/core/os_modinfo.cpp
+++ b/src/core/os_modinfo.cpp
@@ -72,7 +72,6 @@ class OSModInfo : public Module
 	OSModInfo(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(OperServ, new CommandOSModInfo());
 	}
diff --git a/src/core/os_modlist.cpp b/src/core/os_modlist.cpp
index 3ebaed08e..114327aaa 100644
--- a/src/core/os_modlist.cpp
+++ b/src/core/os_modlist.cpp
@@ -200,7 +200,6 @@ class OSModList : public Module
 	OSModList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSModList());
diff --git a/src/core/os_modload.cpp b/src/core/os_modload.cpp
index 9265c8e72..7134aae9f 100644
--- a/src/core/os_modload.cpp
+++ b/src/core/os_modload.cpp
@@ -64,7 +64,6 @@ class OSModLoad : public Module
 	OSModLoad(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->SetPermanent(true);
 
diff --git a/src/core/os_modunload.cpp b/src/core/os_modunload.cpp
index 77ef413ca..12dce4300 100644
--- a/src/core/os_modunload.cpp
+++ b/src/core/os_modunload.cpp
@@ -66,7 +66,6 @@ class OSModUnLoad : public Module
 	OSModUnLoad(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->SetPermanent(true);
 
diff --git a/src/core/os_news.cpp b/src/core/os_news.cpp
index 7be0bc5f7..3626d4e02 100644
--- a/src/core/os_news.cpp
+++ b/src/core/os_news.cpp
@@ -410,7 +410,6 @@ class OSNews : public Module
 	OSNews(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSLogonNews());
diff --git a/src/core/os_noop.cpp b/src/core/os_noop.cpp
index 270373f0c..f6269592a 100644
--- a/src/core/os_noop.cpp
+++ b/src/core/os_noop.cpp
@@ -81,7 +81,6 @@ class OSNOOP : public Module
 	OSNOOP(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSNOOP());
diff --git a/src/core/os_oline.cpp b/src/core/os_oline.cpp
index d0ee5ea96..49d9ed8af 100644
--- a/src/core/os_oline.cpp
+++ b/src/core/os_oline.cpp
@@ -72,7 +72,6 @@ class OSOLine : public Module
 	OSOLine(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSOLine());
diff --git a/src/core/os_quit.cpp b/src/core/os_quit.cpp
index 41703c1b7..9c3e56bc6 100644
--- a/src/core/os_quit.cpp
+++ b/src/core/os_quit.cpp
@@ -54,7 +54,6 @@ class OSQuit : public Module
 	OSQuit(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSQuit());
diff --git a/src/core/os_reload.cpp b/src/core/os_reload.cpp
index 07fffa94f..4bad807e5 100644
--- a/src/core/os_reload.cpp
+++ b/src/core/os_reload.cpp
@@ -56,7 +56,6 @@ class OSReload : public Module
 	OSReload(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSReload());
diff --git a/src/core/os_restart.cpp b/src/core/os_restart.cpp
index efb5bdada..bf08fbbcb 100644
--- a/src/core/os_restart.cpp
+++ b/src/core/os_restart.cpp
@@ -54,7 +54,6 @@ class OSRestart : public Module
 	OSRestart(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->AddCommand(OperServ, new CommandOSRestart());
 	}
diff --git a/src/core/os_session.cpp b/src/core/os_session.cpp
index 34d34fcc4..798ca4021 100644
--- a/src/core/os_session.cpp
+++ b/src/core/os_session.cpp
@@ -497,7 +497,6 @@ class OSSession : public Module
 	OSSession(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSSession());
diff --git a/src/core/os_set.cpp b/src/core/os_set.cpp
index d51a13bd6..9a84d1e05 100644
--- a/src/core/os_set.cpp
+++ b/src/core/os_set.cpp
@@ -300,7 +300,6 @@ class OSSet : public Module
 	OSSet(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSSet());
diff --git a/src/core/os_shutdown.cpp b/src/core/os_shutdown.cpp
index 772457602..73e6b1bba 100644
--- a/src/core/os_shutdown.cpp
+++ b/src/core/os_shutdown.cpp
@@ -54,7 +54,6 @@ class OSShutdown : public Module
 	OSShutdown(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSShutdown());
diff --git a/src/core/os_sqline.cpp b/src/core/os_sqline.cpp
index 37f22b14a..6961140f3 100644
--- a/src/core/os_sqline.cpp
+++ b/src/core/os_sqline.cpp
@@ -393,7 +393,6 @@ class OSSQLine : public Module
 	OSSQLine(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSSQLine());
diff --git a/src/core/os_staff.cpp b/src/core/os_staff.cpp
index 842791187..7955367a7 100644
--- a/src/core/os_staff.cpp
+++ b/src/core/os_staff.cpp
@@ -76,7 +76,6 @@ class OSStaff : public Module
 	OSStaff(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSStaff());
diff --git a/src/core/os_stats.cpp b/src/core/os_stats.cpp
index 5b993ad8f..05968540a 100644
--- a/src/core/os_stats.cpp
+++ b/src/core/os_stats.cpp
@@ -306,7 +306,6 @@ class OSStats : public Module
 	OSStats(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSStats());
diff --git a/src/core/os_svsnick.cpp b/src/core/os_svsnick.cpp
index d3b0a5eaa..c12f87a78 100644
--- a/src/core/os_svsnick.cpp
+++ b/src/core/os_svsnick.cpp
@@ -90,7 +90,6 @@ class OSSVSNick : public Module
 	OSSVSNick(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSSVSNick());
diff --git a/src/core/os_szline.cpp b/src/core/os_szline.cpp
index 2a8b642cd..56674dd97 100644
--- a/src/core/os_szline.cpp
+++ b/src/core/os_szline.cpp
@@ -391,7 +391,6 @@ class OSSZLine : public Module
 	OSSZLine(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSSZLine());
diff --git a/src/core/os_umode.cpp b/src/core/os_umode.cpp
index bfd0e3777..e20c0329f 100644
--- a/src/core/os_umode.cpp
+++ b/src/core/os_umode.cpp
@@ -75,7 +75,6 @@ class OSUMode : public Module
 	OSUMode(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSUMode());
diff --git a/src/core/os_update.cpp b/src/core/os_update.cpp
index 0355db90e..7451d974a 100644
--- a/src/core/os_update.cpp
+++ b/src/core/os_update.cpp
@@ -46,7 +46,6 @@ class OSUpdate : public Module
 	OSUpdate(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSUpdate());
diff --git a/src/core/os_userlist.cpp b/src/core/os_userlist.cpp
index 2a35299fd..c2f9d8f96 100644
--- a/src/core/os_userlist.cpp
+++ b/src/core/os_userlist.cpp
@@ -102,7 +102,6 @@ class OSUserList : public Module
 	OSUserList(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 
 		this->AddCommand(OperServ, new CommandOSUserList());
diff --git a/src/core/ss_main.cpp b/src/core/ss_main.cpp
index d0578b16d..dc83c6e58 100644
--- a/src/core/ss_main.cpp
+++ b/src/core/ss_main.cpp
@@ -35,7 +35,6 @@ class SSMain : public Module
 	SSMain(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(CORE);
 		this->SetPermanent(true);
 
diff --git a/src/init.cpp b/src/init.cpp
index fc5b61a03..88a9e441b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -198,13 +198,13 @@ int init_primary(int ac, char **av)
 
 	if (GetCommandLineArgument("version", 'v'))
 	{
-		Alog(LOG_TERMINAL) << "Anope-" << version_number << " -- " << version_build;
+		Alog(LOG_TERMINAL) << "Anope-" << Anope::Version() << " -- " << Anope::Build();
 		return -1;
 	}
 
 	if (GetCommandLineArgument("help", 'h'))
 	{
-		Alog(LOG_TERMINAL) << "Anope-" << version_number << " -- " << version_build;
+		Alog(LOG_TERMINAL) << "Anope-" << Anope::Version() << " -- " << Anope::Build();
 		Alog(LOG_TERMINAL) << "Anope IRC Services (http://www.anope.org)";
 		Alog(LOG_TERMINAL) << "Usage ./" << SERVICES_BIN << " [options] ...";
 		Alog(LOG_TERMINAL) << "-c, --config=filename.conf";
@@ -413,7 +413,7 @@ int init_secondary(int ac, char **av)
 	write_pidfile();
 
 	/* Announce ourselves to the logfile. */
-	Alog() << "Anope " << version_number << " (ircd protocol: " << version_protocol << ") starting up" << (debug || readonly ? " (options:" : "") << (debug ? " debug" : "") << (readonly ? " readonly" : "") << (debug || readonly ? ")" : "");
+	Alog() << "Anope " << Anope::Version() << " (ircd protocol: " << version_protocol << ") starting up" << (debug || readonly ? " (options:" : "") << (debug ? " debug" : "") << (readonly ? " readonly" : "") << (debug || readonly ? ")" : "");
 	start_time = time(NULL);
 
 	/* If in read-only mode, close the logfile again. */
diff --git a/src/main.cpp b/src/main.cpp
index cb63060ea..06f10ab3e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,7 +25,6 @@
 
 #include "services.h"
 #include "timers.h"
-#include "version.h"
 #include "modules.h"
 
 // getrlimit.
@@ -34,6 +33,8 @@
 # include <sys/resource.h>
 #endif
 
+const char * const Anope::compiled = __TIME__ " " __DATE__;
+
 /******** Global variables! ********/
 
 /* Command-line options: (note that configuration variables are in config.c) */
@@ -74,12 +75,6 @@ time_t start_time;
 /* Parameters and environment */
 char **my_av, **my_envp;
 
-/* Moved here from version.h */
-const char version_number[] = VERSION_STRING;
-const char version_number_dotted[] = VERSION_STRING_DOTTED;
-const char version_build[] = "build #" BUILD ", compiled " __DATE__ " " __TIME__;
-/* the space is needed cause if you build with nothing it will complain */
-
 /******** Local variables! ********/
 
 /* Set to 1 after we've set everything up */
@@ -455,7 +450,7 @@ int main(int ac, char **av, char **envp)
 	if ((i = init_primary(ac, av)))
 		return i;
 
-	Alog(LOG_TERMINAL) << "Anope " << version_number << ", " << version_build;
+	Alog(LOG_TERMINAL) << "Anope " << Anope::Version() << ", " << Anope::Build();
 #ifdef _WIN32
 	Alog(LOG_TERMINAL) << "Using configuration file " << services_dir << "\\" << services_conf;
 #else
diff --git a/src/messages.cpp b/src/messages.cpp
index 8ecd038cf..804adac7d 100644
--- a/src/messages.cpp
+++ b/src/messages.cpp
@@ -276,7 +276,7 @@ int m_stats(const char *source, int ac, const char **av)
 int m_version(const char *source, int ac, const char **av)
 {
 	if (source)
-		ircdproto->SendNumeric(Config.ServerName, 351, source, "Anope-%s %s :%s -(%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
+		ircdproto->SendNumeric(Config.ServerName, 351, source, "Anope-%s %s :%s -(%s) -- %s", Anope::Version().c_str(), Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), Anope::Build().c_str());
 	return MOD_CONT;
 }
 
diff --git a/src/module.cpp b/src/module.cpp
index 0556abc4e..7c83a7937 100644
--- a/src/module.cpp
+++ b/src/module.cpp
@@ -26,6 +26,8 @@ Module::Module(const std::string &mname, const std::string &creator)
 
 	this->created = time(NULL);
 
+	this->SetVersion(Anope::Version());
+
 	Modules.push_back(this);
 }
 
diff --git a/src/modules/cs_appendtopic.cpp b/src/modules/cs_appendtopic.cpp
index a44e6d1a9..40c1cd374 100644
--- a/src/modules/cs_appendtopic.cpp
+++ b/src/modules/cs_appendtopic.cpp
@@ -19,7 +19,6 @@
 #include "module.h"
 
 #define AUTHOR "SGR"
-#define VERSION VERSION_STRING
 
 /* ------------------------------------------------------------
  * Name: cs_appendtopic
@@ -143,7 +142,6 @@ class CSAppendTopic : public Module
 		me = this;
 
 		this->SetAuthor(AUTHOR);
-		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		this->AddCommand(ChanServ, new CommandCSAppendTopic());
diff --git a/src/modules/cs_enforce.cpp b/src/modules/cs_enforce.cpp
index 271b9da05..a3be24c7a 100644
--- a/src/modules/cs_enforce.cpp
+++ b/src/modules/cs_enforce.cpp
@@ -16,7 +16,6 @@
 #include "module.h"
 
 #define AUTHOR "Anope"
-#define VERSION VERSION_STRING
 
 #define LNG_NUM_STRINGS	6
 
@@ -231,7 +230,6 @@ class CSEnforce : public Module
 		me = this;
 
 		this->SetAuthor(AUTHOR);
-		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		this->AddCommand(ChanServ, new CommandCSEnforce());
diff --git a/src/modules/cs_tban.cpp b/src/modules/cs_tban.cpp
index 5a768dc81..88e541ac8 100644
--- a/src/modules/cs_tban.cpp
+++ b/src/modules/cs_tban.cpp
@@ -19,7 +19,6 @@
 #include "module.h"
 
 #define AUTHOR "Rob"
-#define VERSION VERSION_STRING
 
 void mySendResponse(User *u, const char *channel, char *mask, const char *time);
 
@@ -100,7 +99,6 @@ class CSTBan : public Module
 		this->AddCommand(ChanServ, new CommandCSTBan());
 
 		this->SetAuthor(AUTHOR);
-		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		const char* langtable_en_us[] = {
diff --git a/src/modules/hs_request.cpp b/src/modules/hs_request.cpp
index 574611f09..05e5969f2 100644
--- a/src/modules/hs_request.cpp
+++ b/src/modules/hs_request.cpp
@@ -18,7 +18,6 @@
 #include "module.h"
 
 #define AUTHOR "Rob"
-#define VERSION VERSION_STRING
 
 /* Configuration variables */
 int HSRequestMemoUser = 0;
@@ -394,7 +393,6 @@ class HSRequest : public Module
 		this->AddCommand(HostServ, new CommandHSWaiting());
 
 		this->SetAuthor(AUTHOR);
-		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		my_load_config();
diff --git a/src/modules/m_helpchan.cpp b/src/modules/m_helpchan.cpp
index 6255d5012..c63703f33 100644
--- a/src/modules/m_helpchan.cpp
+++ b/src/modules/m_helpchan.cpp
@@ -15,7 +15,6 @@ class HelpChannel : public Module
 	HelpChannel(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(SUPPORTED);
 
 		Implementation i[] = { I_OnChannelModeSet, I_OnReload };
diff --git a/src/modules/ns_maxemail.cpp b/src/modules/ns_maxemail.cpp
index 2399dba68..1d89a28e3 100644
--- a/src/modules/ns_maxemail.cpp
+++ b/src/modules/ns_maxemail.cpp
@@ -16,7 +16,6 @@
 #include "module.h"
 
 #define AUTHOR "Anope"
-#define VERSION VERSION_STRING
 
 void my_load_config();
 void my_add_languages();
@@ -38,7 +37,6 @@ class NSMaxEmail : public Module
 		me = this;
 
 		this->SetAuthor(AUTHOR);
-		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		ModuleManager::Attach(I_OnReload, this);
diff --git a/src/modules/os_info.cpp b/src/modules/os_info.cpp
index 38d9c99c5..1b4075f63 100644
--- a/src/modules/os_info.cpp
+++ b/src/modules/os_info.cpp
@@ -19,7 +19,6 @@
 #include "module.h"
 
 #define AUTHOR "Rob"
-#define VERSION VERSION_STRING
 
 /* Multi-language stuff */
 #define LANG_NUM_STRINGS   10
@@ -200,7 +199,6 @@ class OSInfo : public Module
 		me = this;
 
 		this->SetAuthor(AUTHOR);
-		this->SetVersion(VERSION);
 		this->SetType(SUPPORTED);
 
 		this->AddCommand(NickServ, new CommandNSOInfo());
diff --git a/src/protocol/bahamut.cpp b/src/protocol/bahamut.cpp
index d55a08123..d9f575846 100644
--- a/src/protocol/bahamut.cpp
+++ b/src/protocol/bahamut.cpp
@@ -803,7 +803,6 @@ class ProtoBahamut : public Module
 	ProtoBahamut(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("BahamutIRCd 1.4.*/1.8.*");
diff --git a/src/protocol/inspircd11.cpp b/src/protocol/inspircd11.cpp
index 09c329f0c..a5deafec7 100644
--- a/src/protocol/inspircd11.cpp
+++ b/src/protocol/inspircd11.cpp
@@ -248,7 +248,7 @@ class InspIRCdProto : public IRCDProto
 		inspircd_cmd_pass(uplink_server->password);
 		SendServer(Me);
 		send_cmd(NULL, "BURST");
-		send_cmd(Config.ServerName, "VERSION :Anope-%s %s :%s - (%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
+		send_cmd(Config.ServerName, "VERSION :Anope-%s %s :%s - (%s) -- %s", Anope::Version().c_str(), Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), Anope::Build().c_str());
 	}
 
 	/* CHGIDENT */
@@ -1160,7 +1160,6 @@ class ProtoInspIRCd : public Module
 	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("InspIRCd 1.1");
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index 9a9f88fea..aa7d6a019 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -252,7 +252,7 @@ class InspIRCdProto : public IRCDProto
 		inspircd_cmd_pass(uplink_server->password);
 		SendServer(Me);
 		send_cmd(TS6SID, "BURST");
-		send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - (%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
+		send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - (%s) -- %s", Anope::Version().c_str(), Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), Anope::Build().c_str());
 	}
 
 	/* CHGIDENT */
@@ -1370,7 +1370,6 @@ class ProtoInspIRCd : public Module
 	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		if (Config.Numeric)
diff --git a/src/protocol/inspircd20.cpp b/src/protocol/inspircd20.cpp
index 4d333658c..7974fade0 100644
--- a/src/protocol/inspircd20.cpp
+++ b/src/protocol/inspircd20.cpp
@@ -251,7 +251,7 @@ class InspIRCdProto : public IRCDProto
 		inspircd_cmd_pass(uplink_server->password);
 		SendServer(Me);
 		send_cmd(TS6SID, "BURST");
-		send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - (%s) -- %s", version_number, Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), version_build);
+		send_cmd(TS6SID, "VERSION :Anope-%s %s :%s - (%s) -- %s", Anope::Version().c_str(), Config.ServerName, ircd->name, Config.EncModuleList.begin()->c_str(), Anope::Build().c_str());
 	}
 
 	/* CHGIDENT */
@@ -1369,7 +1369,6 @@ class ProtoInspIRCd : public Module
 	ProtoInspIRCd(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		if (Config.Numeric)
diff --git a/src/protocol/ratbox.cpp b/src/protocol/ratbox.cpp
index 339113e33..41759e79b 100644
--- a/src/protocol/ratbox.cpp
+++ b/src/protocol/ratbox.cpp
@@ -869,7 +869,6 @@ class ProtoRatbox : public Module
 	ProtoRatbox(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		if (Config.Numeric)
diff --git a/src/protocol/unreal32.cpp b/src/protocol/unreal32.cpp
index 65ee9d3e2..99a156f00 100644
--- a/src/protocol/unreal32.cpp
+++ b/src/protocol/unreal32.cpp
@@ -1319,7 +1319,6 @@ class ProtoUnreal : public Module
 	ProtoUnreal(const std::string &modname, const std::string &creator) : Module(modname, creator)
 	{
 		this->SetAuthor("Anope");
-		this->SetVersion(VERSION_STRING);
 		this->SetType(PROTOCOL);
 
 		pmodule_ircd_version("UnrealIRCd 3.2+");
diff --git a/src/tools/README b/src/tools/README
deleted file mode 100644
index 0b2b2ec32..000000000
--- a/src/tools/README
+++ /dev/null
@@ -1,27 +0,0 @@
-Anope Bundled Tools
--------------------
-
-1) Anope SMTP Client
-
-    Provided with Anope is a simple SMTP client which can be used instead of
-    programs like SendMail in some cases.
-
-    The SMTP client can be used instead of sendmail for use with Anope's mail
-    options. To use the SMTP client instead of sendmail, find the line in your
-    services configuration file (services.conf) that defines SendMailPath. On
-    that line, change the path to your services installation directory, then
-    followed by "tools/anopesmtp" and the IP address of a valid SMTP server. It
-    should look like this:
-
-        SendMailPath "/home/anope/services/tools/anopesmtp 127.0.0.1"
-
-    If the SMTP client doesn't send mail, or if there's an other problem with
-    it, you can compile it in debug mode. To do this, open smtp.h, and look
-    for "smtp_debug" near the bottom. Change this from 0 to 1 and recompile
-    the code. This should generate a log file of what happened when it tried
-    to connect to the SMTP server.
-
-        Credits:
-    Originally written by  Dominick Meglio    <codemastr@unrealircd.com>
-    Ported to *nix by      Trystan Scott Lee  <trystan@nomadirc.net>
-
diff --git a/src/tools/db-convert.c b/src/tools/db-convert.c
index 20f8718d1..34bb01d8c 100644
--- a/src/tools/db-convert.c
+++ b/src/tools/db-convert.c
@@ -391,7 +391,7 @@ int main(int argc, char *argv[])
 
 			if (nc->accesscount)
 			{
-				for (j = 0, access = nc->access; j < nc->accesscount; j++, access++)
+				for (j = 0, access = nc->access; j < nc->accesscount && *access; j++, access++)
 					fs << "MD ACCESS " << *access << std::endl;
 			}
 
diff --git a/src/version.sh b/src/version.sh
new file mode 100644
index 000000000..78b1310ff
--- /dev/null
+++ b/src/version.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+VERSION_MAJOR="1"
+VERSION_MINOR="9"
+VERSION_PATCH="3"
+VERSION_EXTRA="-tastes-good-on-toast"
+
+VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH$VERSION_EXTRA"
+