Remove dummy API_VERSION from Version constructor

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11887 e03df62e-2008-0410-955e-edbf42e46eb7

133 files changed, 134 insertions, 134 deletions

diff --git a/include/modules.h b/include/modules.h
index 4166af051..ef6f5c251 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -246,7 +246,7 @@ class CoreExport VersionBase : public classbase
 
 	/** Initialize version class
 	 */
-	VersionBase(const std::string &desc, int flags = VF_NONE, int dummy = 0, const std::string& src_rev = VERSION " r" REVISION);
+	VersionBase(const std::string &desc, int flags = VF_NONE, const std::string& src_rev = VERSION " r" REVISION);
 };
 
 typedef VersionBase<API_VERSION> Version;
diff --git a/src/modules.cpp b/src/modules.cpp
index f8989b415..913293e13 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -24,9 +24,9 @@
 #endif
 
 
-// version is a simple class for holding a modules version number
+// Version is a simple class for holding a modules version number
 template<>
-VersionBase<API_VERSION>::VersionBase(const std::string &modv, int flags, int, const std::string& rev)
+VersionBase<API_VERSION>::VersionBase(const std::string &modv, int flags, const std::string& rev)
 : description(modv), version(rev), Flags(flags)
 {
 }
diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index 13b35fdfb..ff6e3c7c2 100644
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -43,7 +43,7 @@ class ModuleGeoIP : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides a way to restrict users by country using GeoIP lookup", VF_VENDOR, API_VERSION);
+		return Version("Provides a way to restrict users by country using GeoIP lookup", VF_VENDOR);
 	}
 
 	virtual void OnRehash(User* user)
diff --git a/src/modules/extra/m_ldapauth.cpp b/src/modules/extra/m_ldapauth.cpp
index 013bdd110..50c952704 100644
--- a/src/modules/extra/m_ldapauth.cpp
+++ b/src/modules/extra/m_ldapauth.cpp
@@ -215,7 +215,7 @@ public:
 
 	Version GetVersion()
 	{
-		return Version("Allow/Deny connections based upon answer from LDAP server", VF_VENDOR, API_VERSION);
+		return Version("Allow/Deny connections based upon answer from LDAP server", VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/extra/m_ldapoper.cpp b/src/modules/extra/m_ldapoper.cpp
index 634a99fa7..7d75c4ca7 100644
--- a/src/modules/extra/m_ldapoper.cpp
+++ b/src/modules/extra/m_ldapoper.cpp
@@ -178,7 +178,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Allow/Deny connections based upon answer from LDAP server", VF_VENDOR, API_VERSION);
+		return Version("Allow/Deny connections based upon answer from LDAP server", VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp
index 25c4952a9..6a2f1aa89 100644
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -825,7 +825,7 @@ class ModuleMsSQL : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("MsSQL provider", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("MsSQL provider", VF_VENDOR | VF_SERVICEPROVIDER);
 	}
 
 };
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index a921dea8e..90a2d95dc 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -756,7 +756,7 @@ void ModuleSQL::OnRehash(User* user)
 
 Version ModuleSQL::GetVersion()
 {
-	return Version("SQL Service Provider module for all other m_sql* modules", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+	return Version("SQL Service Provider module for all other m_sql* modules", VF_VENDOR | VF_SERVICEPROVIDER);
 }
 
 void DispatcherThread::Run()
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 8e37e0dea..5d2fe106b 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -954,7 +954,7 @@ class ModulePgSQL : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+		return Version("PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API", VF_VENDOR|VF_SERVICEPROVIDER);
 	}
 };
 
diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index 16d0cfe15..8f2284ce6 100644
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -76,7 +76,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Regex Provider Module for PCRE", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Regex Provider Module for PCRE", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER);
 	}
 
 	virtual ~ModuleRegexPCRE()
diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp
index 62b44e0e4..1bcd32187 100644
--- a/src/modules/extra/m_regex_posix.cpp
+++ b/src/modules/extra/m_regex_posix.cpp
@@ -85,7 +85,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Regex Provider Module for POSIX Regular Expressions", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Regex Provider Module for POSIX Regular Expressions", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER);
 	}
 
 	virtual ~ModuleRegexPOSIX()
diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index f2a9004bd..ef0ed91a4 100644
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -82,7 +82,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Regex Provider Module for TRE Regular Expressions", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Regex Provider Module for TRE Regular Expressions", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER);
 	}
 
 	virtual ~ModuleRegexTRE()
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index cb4fb0b5e..aba3c0930 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -723,7 +723,7 @@ class ModuleSQLite3 : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("sqlite3 provider", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("sqlite3 provider", VF_VENDOR | VF_SERVICEPROVIDER);
 	}
 
 };
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index e3e533cfd..ec8993f4b 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -310,7 +310,7 @@ class ModuleSSLGnuTLS : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides SSL support for clients", VF_VENDOR, API_VERSION);
+		return Version("Provides SSL support for clients", VF_VENDOR);
 	}
 
 
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 235012746..cd648c1b4 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -264,7 +264,7 @@ class ModuleSSLOpenSSL : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides SSL support for clients", VF_VENDOR, API_VERSION);
+		return Version("Provides SSL support for clients", VF_VENDOR);
 	}
 
 
diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index c8aadfcae..a24aefc99 100644
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -29,7 +29,7 @@ class ModuleAbbreviation : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords.",VF_VENDOR,API_VERSION);
+		return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords.",VF_VENDOR);
 	}
 
 	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 3f3c3b1ba..6aa1f6c36 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -108,7 +108,7 @@ class ModuleAlias : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides aliases of commands.", VF_VENDOR,API_VERSION);
+		return Version("Provides aliases of commands.", VF_VENDOR);
 	}
 
 	std::string GetVar(std::string varname, const std::string &original_line)
diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp
index ae6c14c1f..36b3d7577 100644
--- a/src/modules/m_allowinvite.cpp
+++ b/src/modules/m_allowinvite.cpp
@@ -66,7 +66,7 @@ class ModuleAllowInvite : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for channel mode +A, allowing /invite freely on a channel (and extban A to allow specific users it)",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for channel mode +A, allowing /invite freely on a channel (and extban A to allow specific users it)",VF_COMMON|VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index 63e8067e3..b8174c7a6 100644
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -61,7 +61,7 @@ class Modulealltime : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Display timestamps from all servers connected to the network", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Display timestamps from all servers connected to the network", VF_COMMON | VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index b7a6f0663..f4f725ab2 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -33,7 +33,7 @@ class ModuleAntiBear : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Sends a numeric on connect which cripples a common type of trojan/spambot",VF_VENDOR,API_VERSION);
+		return Version("Sends a numeric on connect which cripples a common type of trojan/spambot",VF_VENDOR);
 	}
 
 	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
diff --git a/src/modules/m_antibottler.cpp b/src/modules/m_antibottler.cpp
index 8d4931e3b..f3a2613bc 100644
--- a/src/modules/m_antibottler.cpp
+++ b/src/modules/m_antibottler.cpp
@@ -33,7 +33,7 @@ class ModuleAntiBottler : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Changes the ident of connecting bottler clients to 'bottler'",VF_VENDOR,API_VERSION);
+		return Version("Changes the ident of connecting bottler clients to 'bottler'",VF_VENDOR);
 	}
 
 	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index d7a0f055c..4955b7c49 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -70,7 +70,7 @@ class ModuleAuditorium : public Module
 
 	Version GetVersion()
 	{
-		return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_COMMON | VF_VENDOR);
 	}
 
 	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index a7b94b23e..fdc5b1220 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -332,7 +332,7 @@ class ModuleBanRedirect : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR, API_VERSION);
+		return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR);
 	}
 
 	void Prioritize()
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index ffdbb65c0..d2f3f2cdb 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -60,7 +60,7 @@ class ModuleBlockAmsg : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR,API_VERSION);
+		return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR);
 	}
 
 	virtual void OnRehash(User* user)
diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index e24d9e53c..076f625ce 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -128,7 +128,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support to block all-CAPS channel messages and notices", VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support to block all-CAPS channel messages and notices", VF_COMMON|VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 73bfb7606..cc36a4709 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -86,7 +86,7 @@ class ModuleBlockColour : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for unreal-style channel mode +c",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for unreal-style channel mode +c",VF_COMMON|VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index c3d56fd8b..77364da5f 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -43,7 +43,7 @@ class ModuleBotMode : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for unreal-style umode +B",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for unreal-style umode +B",VF_COMMON|VF_VENDOR);
 	}
 
 	virtual void OnWhois(User* src, User* dst)
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 94dd009c3..cf60c084a 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -362,7 +362,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Implementation of callerid (umode +g & /accept, ala hybrid etc)", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Implementation of callerid (umode +g & /accept, ala hybrid etc)", VF_COMMON | VF_VENDOR);
 	}
 
 	virtual void On005Numeric(std::string& output)
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index bfb30f5e8..1285d7a77 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -205,7 +205,7 @@ class ModuleCBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Gives /cban, aka C:lines. Think Q:lines, for channels.", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Gives /cban, aka C:lines. Think Q:lines, for channels.", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 8ec3f72c1..398241475 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -129,7 +129,7 @@ class ModuleCensor : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides user and channel +G mode",VF_COMMON|VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index a2c8e1c0e..04e35adcb 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -434,7 +434,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR,API_VERSION);
+		return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_chancreate.cpp b/src/modules/m_chancreate.cpp
index 666353049..0ddcedf29 100644
--- a/src/modules/m_chancreate.cpp
+++ b/src/modules/m_chancreate.cpp
@@ -35,7 +35,7 @@ class ModuleChanCreate : public Module
 
 	Version GetVersion()
 	{
-		return Version("Creates a snomask with notices whenever a new channel is created",VF_VENDOR,API_VERSION);
+		return Version("Creates a snomask with notices whenever a new channel is created",VF_VENDOR);
 	}
 
 
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 25321536a..5249a088c 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -137,7 +137,7 @@ class ModuleChanFilter : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_COMMON | VF_VENDOR);
 	}
 
 	virtual ~ModuleChanFilter()
diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index e78a4dd47..f18a01b50 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -96,7 +96,7 @@ class ModuleChanLog : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Logs snomask output to channel(s).", VF_VENDOR,API_VERSION);
+		return Version("Logs snomask output to channel(s).", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index 008422c66..ba03f9af5 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -130,7 +130,7 @@ class ModuleChannelNames : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Implements config tags which allow changing characters allowed in channel names", VF_VENDOR,API_VERSION);
+		return Version("Implements config tags which allow changing characters allowed in channel names", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index 5b7b326bd..b19ab0494 100644
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -30,7 +30,7 @@ class ModuleBadChannelExtban : public Module
 
 	Version GetVersion()
 	{
-		return Version("Extban 'j' - channel status/join ban", VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Extban 'j' - channel status/join ban", VF_COMMON|VF_VENDOR);
 	}
 
 	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 7901fad7f..6884fd35a 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -110,7 +110,7 @@ class ModuleChgHost : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index f352c1c2b..b4cea8b43 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -86,7 +86,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index 0fac2bdad..86e01ad33 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -78,7 +78,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for the CHGNAME command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the CHGNAME command", VF_OPTCOMMON | VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 0aee306a3..1a1ff039e 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -344,7 +344,7 @@ class ModuleCloaking : public Module
 	{
 		// returns the version number of the module to be
 		// listed in /MODULES
-		return Version("Provides masking of user hostnames", VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides masking of user hostnames", VF_COMMON|VF_VENDOR);
 	}
 
 	void OnRehash(User* user)
diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 9742ea29d..fac64f356 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -72,7 +72,7 @@ class ModuleClones : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides the /clones command to retrieve information on clones.", VF_VENDOR, API_VERSION);
+		return Version("Provides the /clones command to retrieve information on clones.", VF_VENDOR);
 	}
 
 
diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index a2e9692cd..24831a807 100644
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -80,7 +80,7 @@ class ModuleClose : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides /CLOSE functionality", VF_VENDOR, API_VERSION);
+		return Version("Provides /CLOSE functionality", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index 4cddb651e..5d429f432 100644
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -64,7 +64,7 @@ class ModulePrivacyMode : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Adds user mode +c, which if set, users must be on a common channel with you to private message you", VF_COMMON|VF_VENDOR, API_VERSION);
+		return Version("Adds user mode +c, which if set, users must be on a common channel with you to private message you", VF_COMMON|VF_VENDOR);
 	}
 
 	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index b78cc85be..b1f12e1eb 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -71,7 +71,7 @@ class ModuleConnJoin : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR,API_VERSION);
+			return Version("Forces users to join the specified channel(s) on connect", VF_VENDOR);
 		}
 
 		virtual void OnPostConnect(User* user)
diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 0fcd73fe9..714114f04 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -32,7 +32,7 @@ class ModuleModesOnConnect : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR,API_VERSION);
+		return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
 	}
 
 	virtual void OnUserConnect(User* user)
diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index b676fa681..f956cb7db 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -37,7 +37,7 @@ class ModuleConnectBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Throttles the connections of any users who try connect flood", VF_VENDOR,API_VERSION);
+		return Version("Throttles the connections of any users who try connect flood", VF_VENDOR);
 	}
 
 	virtual void OnRehash(User* user)
diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index 419dbab9c..ae9fcf0e5 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -41,7 +41,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Connection throttle", VF_VENDOR,API_VERSION);
+		return Version("Connection throttle", VF_VENDOR);
 	}
 
 	void InitConf()
diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 4b3d3e83b..dec806b5b 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -92,7 +92,7 @@ class ModuleCycle : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for unreal-style CYCLE command.", VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style CYCLE command.", VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index b66fa436e..c202a97b4 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -471,7 +471,7 @@ class ModuleDCCAllow : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Povides support for the /DCCALLOW command", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Povides support for the /DCCALLOW command", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index d6b549de4..f52702bca 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -157,7 +157,7 @@ class ModuleDeaf : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for ircu style usermode +d (deaf to channel messages and channel notices)", VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for ircu style usermode +d (deaf to channel messages and channel notices)", VF_COMMON|VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index 7489f6dfa..0432bce5b 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -100,7 +100,7 @@ ModuleDelayMsg::~ModuleDelayMsg()
 
 Version ModuleDelayMsg::GetVersion()
 {
-	return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_COMMON | VF_VENDOR, API_VERSION);
+	return Version("Provides channelmode +d <int>, to deny messages to a channel until <int> seconds.", VF_COMMON | VF_VENDOR);
 }
 
 void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&)
diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index f95c0b107..4493b6240 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -81,7 +81,7 @@ class ModuleDenyChannels : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Implements config tags which allow blocking of joins to channels", VF_VENDOR,API_VERSION);
+		return Version("Implements config tags which allow blocking of joins to channels", VF_VENDOR);
 	}
 
 
diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 7c2dcb3d8..fcb9d3abe 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -65,7 +65,7 @@ class ModuleDeVoice : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides voiced users with the ability to devoice themselves.", VF_VENDOR, API_VERSION);
+		return Version("Provides voiced users with the ability to devoice themselves.", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 73d5316b5..5fedf08dd 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -228,7 +228,7 @@ class ModuleDNSBL : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides handling of DNS blacklists", VF_VENDOR, API_VERSION);
+		return Version("Provides handling of DNS blacklists", VF_VENDOR);
 	}
 
 
diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp
index 83e21bef3..9e6b735ed 100644
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -78,7 +78,7 @@ class ModuleExemptChanOps : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR|VF_COMMON,API_VERSION);
+		return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR|VF_COMMON);
 	}
 
 	virtual void OnRehash(User* user)
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 3f95f02c9..a9187098b 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -477,7 +477,7 @@ void FilterBase::OnLoadModule(Module* mod)
 
 Version FilterBase::GetVersion()
 {
-	return Version("Text (spam) filtering", VF_VENDOR | VF_COMMON, API_VERSION);
+	return Version("Text (spam) filtering", VF_VENDOR | VF_COMMON);
 }
 
 
diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 3574ad605..62b0961b8 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -66,7 +66,7 @@ class ModuleGlobops : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for GLOBOPS and user mode +g", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for GLOBOPS and user mode +g", VF_COMMON | VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 716b9bfb7..cba630bbc 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -183,7 +183,7 @@ class ModuleHelpop : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version("/helpop Command, Works like Unreal helpop", VF_COMMON | VF_VENDOR, API_VERSION);
+			return Version("/helpop Command, Works like Unreal helpop", VF_COMMON | VF_VENDOR);
 		}
 };
 
diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 5af5c2b6f..2cd6a69c9 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -65,7 +65,7 @@ class ModuleHideChans : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for hiding channels with user mode +I", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for hiding channels with user mode +I", VF_COMMON | VF_VENDOR);
 	}
 
 	virtual void OnRehash(User* user)
diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index b18172786..54207db55 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -69,7 +69,7 @@ class ModuleHideOper : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for hiding oper status with user mode +H", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for hiding oper status with user mode +H", VF_COMMON | VF_VENDOR);
 	}
 
 	ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index cb5ab6925..32f0d257a 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -88,7 +88,7 @@ class ModuleHostChange : public Module
 	{
 		// returns the version number of the module to be
 		// listed in /MODULES
-		return Version("Provides masking of user hostnames in a different way to m_cloaking", VF_VENDOR, API_VERSION);
+		return Version("Provides masking of user hostnames in a different way to m_cloaking", VF_VENDOR);
 	}
 
 	virtual void OnUserConnect(User* user)
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 88b635f6f..84d48cc38 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -421,7 +421,7 @@ class ModuleHttpServer : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides HTTP serving facilities to modules", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Provides HTTP serving facilities to modules", VF_VENDOR | VF_SERVICEPROVIDER);
 	}
 };
 
diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index dd68f3087..dd6f5a8bb 100644
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -277,7 +277,7 @@ class ModuleHTTPAccessList : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules", VF_VENDOR, API_VERSION);
+		return Version("Provides access control lists (passwording of resources, ip restrictions etc) to m_httpd.so dependent modules", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_httpd_config.cpp b/src/modules/m_httpd_config.cpp
index fa8f5f95f..44013b429 100644
--- a/src/modules/m_httpd_config.cpp
+++ b/src/modules/m_httpd_config.cpp
@@ -114,7 +114,7 @@ class ModuleHttpStats : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR, API_VERSION);
+		return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index cfe8f9782..a075bc59c 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -213,7 +213,7 @@ class ModuleHttpStats : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR, API_VERSION);
+		return Version("Provides statistics over HTTP via m_httpd.so", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 56fa47db8..95a0529c9 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -291,7 +291,7 @@ class ModuleIdent : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for RFC1413 ident lookups", VF_VENDOR, API_VERSION);
+		return Version("Provides support for RFC1413 ident lookups", VF_VENDOR);
 	}
 
 	virtual void OnRehash(User *user)
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 8dcd99405..2b4a006f7 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -246,7 +246,7 @@ class ModuleJoinFlood : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides channel mode +j (join flood protection)", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel mode +j (join flood protection)", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index 0e8f13c4d..b2bbe0d8c 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -161,7 +161,7 @@ class ModuleJumpServer : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for the RPL_REDIR numeric", VF_VENDOR, API_VERSION);
+		return Version("Provides support for the RPL_REDIR numeric", VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 1d80781b0..3e794547e 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -100,7 +100,7 @@ class ModuleKnock : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for /KNOCK and mode +K", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for /KNOCK and mode +K", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index fa5fc3a3f..100b7864b 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -110,7 +110,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Allows locking of the server to stop all incoming connections till unlocked again", VF_VENDOR, API_VERSION);
+		return Version("Allows locking of the server to stop all incoming connections till unlocked again", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_maphide.cpp b/src/modules/m_maphide.cpp
index d05200164..3b4135c35 100644
--- a/src/modules/m_maphide.cpp
+++ b/src/modules/m_maphide.cpp
@@ -49,7 +49,7 @@ class ModuleMapHide : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Hide /MAP and /LINKS in the same form as ircu (mostly useless)", VF_VENDOR, API_VERSION);
+		return Version("Hide /MAP and /LINKS in the same form as ircu (mostly useless)", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp
index 9fa4894fd..7669d63d7 100644
--- a/src/modules/m_md5.cpp
+++ b/src/modules/m_md5.cpp
@@ -296,7 +296,7 @@ class ModuleMD5 : public Module
 
 	Version GetVersion()
 	{
-		return Version("Allows for MD5 encrypted oper passwords",VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
+		return Version("Allows for MD5 encrypted oper passwords",VF_VENDOR|VF_SERVICEPROVIDER);
 	}
 };
 
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 96f504492..bf124839a 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -268,7 +268,7 @@ class ModuleMsgFlood : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides channel mode +f (message flood protection)", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel mode +f (message flood protection)", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index 6e3ca525f..52a3d1c23 100644
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -30,7 +30,7 @@ class ModuleQuietBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Implements extban +b m: - mute bans",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Implements extban +b m: - mute bans",VF_COMMON|VF_VENDOR);
 	}
 
 	virtual ModResult OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 04b53f02c..af6e962cf 100755
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -277,7 +277,7 @@ class ModuleNationalChars : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING",VF_COMMON,API_VERSION);
+		return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING",VF_COMMON);
 	}
 
 	/*make an array to check against it 8bit characters a bit faster. Whether allowed or uppercase (for your needs).*/
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index bfbda003f..759a38bc1 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -166,7 +166,7 @@ class ModuleNickLock : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides the NICKLOCK command, allows an oper to chage a users nick and lock them to it until they quit", VF_COMMON | VF_VENDOR);
 	}
 
 
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index b603ee95c..eca35be48 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -65,7 +65,7 @@ class ModuleNoCTCP : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for unreal-style channel mode +C", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +C", VF_COMMON | VF_VENDOR);
 	}
 
 	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 60935c30c..e648d14be 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -65,7 +65,7 @@ class ModuleNoKicks : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides support for unreal-style channel mode +Q", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +Q", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 1109ff61f..368eaa343 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -60,7 +60,7 @@ class ModuleNoNickChange : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_COMMON | VF_VENDOR);
 	}
 
 
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index b7571f35f..925b8b7fe 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -72,7 +72,7 @@ class ModuleNoNotice : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for unreal-style channel mode +T", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +T", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_nopartmsg.cpp b/src/modules/m_nopartmsg.cpp
index cdd65417f..1d3cd9012 100644
--- a/src/modules/m_nopartmsg.cpp
+++ b/src/modules/m_nopartmsg.cpp
@@ -31,7 +31,7 @@ class ModulePartMsgBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Implements extban +b p: - part message bans", VF_COMMON|VF_VENDOR, API_VERSION);
+		return Version("Implements extban +b p: - part message bans", VF_COMMON|VF_VENDOR);
 	}
 
 
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index e1d7d6f9a..4f73e0969 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -88,7 +88,7 @@ class ModuleOperChans : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR | VF_COMMON, API_VERSION);
+		return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR | VF_COMMON);
 	}
 };
 
diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index ac4aab548..772bef525 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -81,7 +81,7 @@ class ModuleOperjoin : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR, API_VERSION);
+			return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR);
 		}
 
 		virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index b992b33b6..6ed0c2a53 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -40,7 +40,7 @@ class ModuleOperLevels : public Module
 
 		virtual Version GetVersion()
 		{
-			return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR, API_VERSION);
+			return Version("Gives each oper type a 'level', cannot kill opers 'above' your level.", VF_VENDOR);
 		}
 
 		virtual ModResult OnKill(User* source, User* dest, const std::string &reason)
diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index e0ef99a22..4e4aaef4d 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -32,7 +32,7 @@ class ModuleOperLog : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("A module which logs all oper commands to the ircd log at default loglevel.", VF_VENDOR, API_VERSION);
+		return Version("A module which logs all oper commands to the ircd log at default loglevel.", VF_VENDOR);
 	}
 
 
diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 3890f82e6..d4b873918 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -45,7 +45,7 @@ class ModuleModesOnOper : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR, API_VERSION);
+		return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR);
 	}
 
 	virtual void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 411cd42c8..a9f7b3b07 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -93,7 +93,7 @@ class ModuleOpermotd : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR, API_VERSION);
+		return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR);
 	}
 
 
diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 0144e5c23..da1e4d242 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -133,7 +133,7 @@ class ModuleOperPrefixMode : public Module
 
 	Version GetVersion()
 	{
-		return Version("Gives opers cmode +y which provides a staff prefix.", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Gives opers cmode +y which provides a staff prefix.", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index c737be286..e37282525 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -207,7 +207,7 @@ class ModuleOverride : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides support for unreal-style oper-override",VF_VENDOR,API_VERSION);
+		return Version("Provides support for unreal-style oper-override",VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp
index af6256a1c..617983ec4 100644
--- a/src/modules/m_password_hash.cpp
+++ b/src/modules/m_password_hash.cpp
@@ -151,7 +151,7 @@ class ModuleOperHash : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Allows for hashed oper passwords",VF_VENDOR,API_VERSION);
+		return Version("Allows for hashed oper passwords",VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index bd358e4dc..58a54f715 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -292,7 +292,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for channel mode +P to provide permanent channels",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides support for channel mode +P to provide permanent channels",VF_COMMON|VF_VENDOR);
 	}
 
 	virtual ModResult OnChannelPreDelete(Channel *c)
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index e2910e7cd..3cdf4f30d 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -97,7 +97,7 @@ class ModuleRandQuote : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides random Quotes on Connect.",VF_VENDOR,API_VERSION);
+		return Version("Provides random Quotes on Connect.",VF_VENDOR);
 	}
 
 	virtual void OnUserConnect(User* user)
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 7d1878283..9a138b7fc 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -134,7 +134,7 @@ class ModuleRedirect : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides channel mode +L (limit redirection)", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel mode +L (limit redirection)", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 89565618b..67f81fc65 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -214,7 +214,7 @@ class ModuleRemove : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index bc66afce5..12c373ab8 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -75,7 +75,7 @@ class ModuleRestrictChans : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Only opers may create new channels if this module is loaded",VF_VENDOR,API_VERSION);
+		return Version("Only opers may create new channels if this module is loaded",VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index de7737e66..933a533ab 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -62,7 +62,7 @@ class ModuleRestrictMsg : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers.",VF_VENDOR,API_VERSION);
+		return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers.",VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_ripemd160.cpp b/src/modules/m_ripemd160.cpp
index 15eab59cf..b8647b3a9 100644
--- a/src/modules/m_ripemd160.cpp
+++ b/src/modules/m_ripemd160.cpp
@@ -465,7 +465,7 @@ class ModuleRIPEMD160 : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Allows for RIPEMD-160 encrypted oper passwords", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Allows for RIPEMD-160 encrypted oper passwords", VF_VENDOR|VF_SERVICEPROVIDER);
 	}
 
 };
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index df5fca504..63ab0ccbb 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -227,7 +227,7 @@ class ModuleRLine : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("RLINE: Regexp user banning.", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("RLINE: Regexp user banning.", VF_COMMON | VF_VENDOR);
 	}
 
 	virtual void OnUserConnect(User* user)
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 28634e4f9..7b779a880 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -109,7 +109,7 @@ class ModuleSajoin : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for unreal-style SAJOIN command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style SAJOIN command", VF_OPTCOMMON | VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index fa4d95c96..57783be8f 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -109,7 +109,7 @@ class ModuleSakick : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides a SAKICK command", VF_OPTCOMMON|VF_VENDOR, API_VERSION);
+		return Version("Provides a SAKICK command", VF_OPTCOMMON|VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index ba02c5e16..eb30398ad 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -55,7 +55,7 @@ class ModuleSaMode : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides more advanced UnrealIRCd SAMODE command", VF_VENDOR, API_VERSION);
+		return Version("Provides more advanced UnrealIRCd SAMODE command", VF_VENDOR);
 	}
 
 	ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index c164de3a2..b3f0ec32c 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -98,7 +98,7 @@ class ModuleSanick : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for SANICK command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for SANICK command", VF_OPTCOMMON | VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 255648f85..32a2e16fc 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -109,7 +109,7 @@ class ModuleSapart : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for unreal-style SAPART command", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style SAPART command", VF_OPTCOMMON | VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 0d181aa65..d31da8a6b 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -78,7 +78,7 @@ class ModuleSaquit : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for an SAQUIT command, exits user with a reason", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for an SAQUIT command, exits user with a reason", VF_OPTCOMMON | VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 42d908467..b3b8045ae 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -255,7 +255,7 @@ class ModuleSASL : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE.",VF_VENDOR,API_VERSION);
+		return Version("Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE.",VF_VENDOR);
 	}
 
 	void OnEvent(Event &ev)
diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index 7b2c3e5eb..eec13decc 100644
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -67,7 +67,7 @@ class ModuleSATopic : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides a SATOPIC command", VF_VENDOR, API_VERSION);
+		return Version("Provides a SATOPIC command", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index a83e9dc1b..91dc3a0cd 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -33,7 +33,7 @@ class ModuleSecureList : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR,API_VERSION);
+		return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR);
 	}
 
 	void OnRehash(User* user)
diff --git a/src/modules/m_seenicks.cpp b/src/modules/m_seenicks.cpp
index ca30cfef6..fb660273b 100644
--- a/src/modules/m_seenicks.cpp
+++ b/src/modules/m_seenicks.cpp
@@ -34,7 +34,7 @@ class ModuleSeeNicks : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for seeing local and remote nickchanges via snomasks", VF_VENDOR, API_VERSION);
+		return Version("Provides support for seeing local and remote nickchanges via snomasks", VF_VENDOR);
 	}
 
 
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index a040e77e5..58bacb7c8 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -275,7 +275,7 @@ class ModuleServicesAccount : public Module
 
 	Version GetVersion()
 	{
-		return Version("Povides support for ircu-style services accounts, including chmode +R, etc.",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Povides support for ircu-style services accounts, including chmode +R, etc.",VF_COMMON|VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index 94662e3a5..7fd867e9b 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -56,7 +56,7 @@ class ModuleServProtectMode : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides support for Austhex style +k / UnrealIRCD +S services mode", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for Austhex style +k / UnrealIRCD +S services mode", VF_COMMON | VF_VENDOR);
 	}
 
 	void OnWhois(User* src, User* dst)
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index cd9368d3c..e82b5c11c 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -95,7 +95,7 @@ class ModuleSetHost : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for the SETHOST command", VF_VENDOR, API_VERSION);
+		return Version("Provides support for the SETHOST command", VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index a0a4cfe8d..8f0dd4dc0 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -70,7 +70,7 @@ class ModuleSetIdent : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for the SETIDENT command", VF_VENDOR, API_VERSION);
+		return Version("Provides support for the SETIDENT command", VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index 4751d99c1..df58f6562 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -62,7 +62,7 @@ class ModuleSetIdle : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Allows opers to set their idle time", VF_VENDOR, API_VERSION);
+		return Version("Allows opers to set their idle time", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index c0e32da73..bfb8f116f 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -67,7 +67,7 @@ class ModuleSetName : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for the SETNAME command", VF_VENDOR, API_VERSION);
+		return Version("Provides support for the SETNAME command", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_sha256.cpp b/src/modules/m_sha256.cpp
index f1b649f30..1f967207b 100644
--- a/src/modules/m_sha256.cpp
+++ b/src/modules/m_sha256.cpp
@@ -273,7 +273,7 @@ class ModuleSHA256 : public Module
 
 	Version GetVersion()
 	{
-		return Version("Allows for SHA-256 encrypted oper passwords", VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Allows for SHA-256 encrypted oper passwords", VF_VENDOR|VF_SERVICEPROVIDER);
 	}
 };
 
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 24c502ee4..be1871bad 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -102,7 +102,7 @@ class ModuleShowwhois : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_COMMON|VF_VENDOR);
 	}
 
 	virtual void OnWhois(User* source, User* dest)
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 599d665a1..d4053fba0 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -294,7 +294,7 @@ class ModuleShun : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides the /shun command, which stops a user executing all commands except PING and PONG.",VF_VENDOR|VF_COMMON,API_VERSION);
+		return Version("Provides the /shun command, which stops a user executing all commands except PING and PONG.",VF_VENDOR|VF_COMMON);
 	}
 };
 
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index dd7a62726..9e57e3cd7 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -368,7 +368,7 @@ class ModuleSilence : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides support for the /SILENCE command", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the /SILENCE command", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index 12aa0d347..85953f391 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -44,7 +44,7 @@ class ModuleSpy : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides the ability to see the complete names list of channels an oper is not a member of", VF_VENDOR, API_VERSION);
+		return Version("Provides the ability to see the complete names list of channels an oper is not a member of", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index 61f8b8488..6763e8214 100644
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -183,7 +183,7 @@ public:
 
 	Version GetVersion()
 	{
-		return Version("Allow/Deny connections based upon an arbitary SQL table", VF_VENDOR, API_VERSION);
+		return Version("Allow/Deny connections based upon an arbitary SQL table", VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_sqllog.cpp b/src/modules/m_sqllog.cpp
index 9b019f931..6bdcda6cb 100644
--- a/src/modules/m_sqllog.cpp
+++ b/src/modules/m_sqllog.cpp
@@ -265,7 +265,7 @@ class ModuleSQLLog : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Logs network-wide data to an SQL database", VF_VENDOR, API_VERSION);
+		return Version("Logs network-wide data to an SQL database", VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_sqlutils.cpp b/src/modules/m_sqlutils.cpp
index f63cd3eab..269f70ad0 100644
--- a/src/modules/m_sqlutils.cpp
+++ b/src/modules/m_sqlutils.cpp
@@ -218,7 +218,7 @@ public:
 
 	Version GetVersion()
 	{
-		return Version("Provides some utilities to SQL client modules, such as mapping queries to users and channels", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Provides some utilities to SQL client modules, such as mapping queries to users and channels", VF_VENDOR | VF_SERVICEPROVIDER);
 	}
 
 };
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index fd185999a..5a3a5e712 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -124,7 +124,7 @@ class ModuleSSLModes : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides support for unreal-style channel mode +z", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for unreal-style channel mode +z", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 37999b319..5b02309dc 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -134,7 +134,7 @@ class ModuleStripColor : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides channel +S mode (strip ansi colour)", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel +S mode (strip ansi colour)", VF_COMMON | VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 26f9cac1a..1ce3852c2 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -202,7 +202,7 @@ class ModuleSVSHold : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services.", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index a15d81aec..8949c21ef 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -146,7 +146,7 @@ class ModuleSWhois : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides the SWHOIS command which allows setting of arbitary WHOIS lines", VF_OPTCOMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides the SWHOIS command which allows setting of arbitary WHOIS lines", VF_OPTCOMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index c0816419f..02e687b2d 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -187,7 +187,7 @@ class ModuleTimedBans : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Adds timed bans", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Adds timed bans", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index e39064ca7..01aa2e0b3 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -76,7 +76,7 @@ class ModuleTLine : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides /tline command used to test who a mask matches", VF_VENDOR,API_VERSION);
+		return Version("Provides /tline command used to test who a mask matches", VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index f9ede6c12..b34b248fd 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -33,7 +33,7 @@ class ModuleUHNames : public Module
 
 	Version GetVersion()
 	{
-		return Version("Provides the UHNAMES facility.",VF_VENDOR,API_VERSION);
+		return Version("Provides the UHNAMES facility.",VF_VENDOR);
 	}
 
 	void On005Numeric(std::string &output)
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 1d7941b57..1215dd0df 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -98,7 +98,7 @@ class ModuleUninvite : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides the UNINVITE command which lets users un-invite other users from channels (!)", VF_VENDOR | VF_COMMON, API_VERSION);
+		return Version("Provides the UNINVITE command which lets users un-invite other users from channels (!)", VF_VENDOR | VF_COMMON);
 	}
 };
 
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index b229aa39b..90e3ecfd2 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -77,7 +77,7 @@ class ModuleUserIP : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for USERIP command",VF_VENDOR,API_VERSION);
+		return Version("Provides support for USERIP command",VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index f1a074aec..a8f7b98e6 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -72,7 +72,7 @@ class ModuleVHost : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides masking of user hostnames via traditional /VHOST command",VF_VENDOR,API_VERSION);
+		return Version("Provides masking of user hostnames via traditional /VHOST command",VF_VENDOR);
 	}
 
 };
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 1d2073972..15470ebec 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -528,7 +528,7 @@ class Modulewatch : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Provides support for the /WATCH command", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides support for the /WATCH command", VF_COMMON | VF_VENDOR);
 	}
 };
 
diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index c4225d439..bcb4157d6 100644
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -239,7 +239,7 @@ class ModuleXLineDB : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Keeps a dynamic log of all XLines created, and stores them in a seperate conf file (xline.db).", VF_VENDOR, API_VERSION);
+		return Version("Keeps a dynamic log of all XLines created, and stores them in a seperate conf file (xline.db).", VF_VENDOR);
 	}
 };