Whitespace and empty destructor removal, minor coding style changes

140 files changed, 61 insertions, 593 deletions

diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index c93479b3c..9dd682118 100644
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -128,4 +128,3 @@ class ModuleGeoIP : public Module
 };
 
 MODULE_INIT(ModuleGeoIP)
-
diff --git a/src/modules/extra/m_ldapauth.cpp b/src/modules/extra/m_ldapauth.cpp
index 5b3f1e7cc..0eb182228 100644
--- a/src/modules/extra/m_ldapauth.cpp
+++ b/src/modules/extra/m_ldapauth.cpp
@@ -430,7 +430,6 @@ public:
 	{
 		return Version("Allow/Deny connections based upon answer from LDAP server", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleLDAPAuth)
diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp
index 598f9aac9..3ba398783 100644
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -88,10 +88,6 @@ class MsSQLResult : public SQLresult
 	{
 	}
 
-	~MsSQLResult()
-	{
-	}
-
 	void AddRow(int colsnum, char **dat, char **colname)
 	{
 		colnames.clear();
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 682f041ad..b71c3543e 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -189,10 +189,6 @@ class MySQLresult : public SQLResult
 
 	}
 
-	~MySQLresult()
-	{
-	}
-
 	virtual int Rows()
 	{
 		return rows;
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 7751f9b82..84f159be1 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -504,10 +504,6 @@ class ModulePgSQL : public Module
 	ConnMap connections;
 	ReconnectTimer* retimer;
 
-	ModulePgSQL()
-	{
-	}
-
 	void init()
 	{
 		ReadConf();
diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index cba234c8c..a23092879 100644
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -33,7 +33,7 @@
 
 class PCREException : public ModuleException
 {
-public:
+ public:
 	PCREException(const std::string& rx, const std::string& error, int erroffset)
 		: ModuleException("Error in regex " + rx + " at offset " + ConvToStr(erroffset) + ": " + error)
 	{
@@ -42,10 +42,9 @@ public:
 
 class PCRERegex : public Regex
 {
-private:
 	pcre* regex;
 
-public:
+ public:
 	PCRERegex(const std::string& rx) : Regex(rx)
 	{
 		const char* error;
@@ -86,9 +85,10 @@ class PCREFactory : public RegexFactory
 
 class ModuleRegexPCRE : public Module
 {
-public:
+ public:
 	PCREFactory ref;
-	ModuleRegexPCRE() : ref(this) {
+	ModuleRegexPCRE() : ref(this)
+	{
 		ServerInstance->Modules->AddService(ref);
 	}
 
diff --git a/src/modules/extra/m_regex_posix.cpp b/src/modules/extra/m_regex_posix.cpp
index b3afd60c8..513f54cfc 100644
--- a/src/modules/extra/m_regex_posix.cpp
+++ b/src/modules/extra/m_regex_posix.cpp
@@ -28,7 +28,7 @@
 
 class POSIXRegexException : public ModuleException
 {
-public:
+ public:
 	POSIXRegexException(const std::string& rx, const std::string& error)
 		: ModuleException("Error in regex " + rx + ": " + error)
 	{
@@ -37,10 +37,9 @@ public:
 
 class POSIXRegex : public Regex
 {
-private:
 	regex_t regbuf;
 
-public:
+ public:
 	POSIXRegex(const std::string& rx, bool extended) : Regex(rx)
 	{
 		int flags = (extended ? REG_EXTENDED : 0) | REG_NOSUB;
@@ -92,8 +91,10 @@ class PosixFactory : public RegexFactory
 class ModuleRegexPOSIX : public Module
 {
 	PosixFactory ref;
-public:
-	ModuleRegexPOSIX() : ref(this) {
+
+ public:
+	ModuleRegexPOSIX() : ref(this)
+	{
 		ServerInstance->Modules->AddService(ref);
 		Implementation eventlist[] = { I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
diff --git a/src/modules/extra/m_regex_stdlib.cpp b/src/modules/extra/m_regex_stdlib.cpp
index 204728b65..64d479cbc 100644
--- a/src/modules/extra/m_regex_stdlib.cpp
+++ b/src/modules/extra/m_regex_stdlib.cpp
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 #include "inspircd.h"
 #include "m_regex.h"
 #include <regex>
@@ -29,7 +29,7 @@
 
 class StdRegexException : public ModuleException
 {
-public:
+ public:
 	StdRegexException(const std::string& rx, const std::string& error)
 		: ModuleException(std::string("Error in regex ") + rx + ": " + error)
 	{
@@ -38,9 +38,9 @@ public:
 
 class StdRegex : public Regex
 {
-private:
 	std::regex regexcl;
-public:
+
+ public:
 	StdRegex(const std::string& rx, std::regex::flag_type fltype) : Regex(rx)
 	{
 		try{
@@ -51,7 +51,7 @@ public:
 			throw StdRegexException(rx, rxerr.what());
 		}
 	}
-	
+
 	virtual bool Matches(const std::string& text)
 	{
 		return std::regex_search(text, regexcl);
@@ -73,7 +73,8 @@ class ModuleRegexStd : public Module
 {
 public:
 	StdRegexFactory ref;
-	ModuleRegexStd() : ref(this) {
+	ModuleRegexStd() : ref(this)
+	{
 		ServerInstance->Modules->AddService(ref);
 		Implementation eventlist[] = { I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
@@ -84,12 +85,12 @@ public:
 	{
 		return Version("Regex Provider Module for std::regex", VF_VENDOR);
 	}
-	
+
 	void OnRehash(User* u)
 	{
 		ConfigTag* Conf = ServerInstance->Config->ConfValue("stdregex");
 		std::string regextype = Conf->getString("type", "ecmascript");
-		
+
 		if(regextype == "bre")
 			ref.regextype = std::regex::basic;
 		else if(regextype == "ere")
diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index 4b9eab472..b5bd7d012 100644
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -30,7 +30,7 @@
 
 class TRERegexException : public ModuleException
 {
-public:
+ public:
 	TRERegexException(const std::string& rx, const std::string& error)
 		: ModuleException("Error in regex " + rx + ": " + error)
 	{
@@ -39,7 +39,6 @@ public:
 
 class TRERegex : public Regex
 {
-private:
 	regex_t regbuf;
 
 public:
@@ -80,7 +79,8 @@ public:
 	}
 };
 
-class TREFactory : public RegexFactory {
+class TREFactory : public RegexFactory
+{
  public:
 	TREFactory(Module* m) : RegexFactory(m, "regex/tre") {}
 	Regex* Create(const std::string& expr)
@@ -92,8 +92,10 @@ class TREFactory : public RegexFactory {
 class ModuleRegexTRE : public Module
 {
 	TREFactory trf;
-public:
-	ModuleRegexTRE() : trf(this) {
+
+ public:
+	ModuleRegexTRE() : trf(this)
+	{
 		ServerInstance->Modules->AddService(trf);
 	}
 
@@ -101,10 +103,6 @@ public:
 	{
 		return Version("Regex Provider Module for TRE Regular Expressions", VF_VENDOR);
 	}
-
-	~ModuleRegexTRE()
-	{
-	}
 };
 
 MODULE_INIT(ModuleRegexTRE)
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 7f6a53359..171c11f03 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -48,10 +48,6 @@ class SQLite3Result : public SQLResult
 	{
 	}
 
-	~SQLite3Result()
-	{
-	}
-
 	virtual int Rows()
 	{
 		return rows;
@@ -80,7 +76,6 @@ class SQLite3Result : public SQLResult
 
 class SQLConn : public SQLProvider
 {
- private:
 	sqlite3* conn;
 	reference<ConfigTag> config;
 
@@ -206,14 +201,9 @@ class SQLConn : public SQLProvider
 
 class ModuleSQLite3 : public Module
 {
- private:
 	ConnMap conns;
 
  public:
-	ModuleSQLite3()
-	{
-	}
-
 	void init()
 	{
 		ReadConf();
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 38b3700b5..39602539f 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -202,7 +202,6 @@ class ModuleSSLGnuTLS : public Module
 	}
 
  public:
-
 	ModuleSSLGnuTLS()
 		: starttls(this), capHandler(this, "tls"), iohook(this, "ssl/gnutls", SERVICE_IOHOOK)
 	{
@@ -472,7 +471,6 @@ class ModuleSSLGnuTLS : public Module
 		return Version("Provides SSL support for clients", VF_VENDOR);
 	}
 
-
 	void On005Numeric(std::string &output)
 	{
 		if (!sslports.empty())
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index b63fcd376..bf4a9b215 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -29,7 +29,7 @@
 # define __AVAILABILITYMACROS__
 # define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
 #endif
- 
+
 #include "inspircd.h"
 #include <openssl/ssl.h>
 #include <openssl/err.h>
diff --git a/src/modules/hash.h b/src/modules/hash.h
index 98a182165..dd7f082b0 100644
--- a/src/modules/hash.h
+++ b/src/modules/hash.h
@@ -59,4 +59,3 @@ class HashProvider : public DataProvider
 };
 
 #endif
-
diff --git a/src/modules/httpd.h b/src/modules/httpd.h
index 56fd22da0..57c60b3b2 100644
--- a/src/modules/httpd.h
+++ b/src/modules/httpd.h
@@ -204,4 +204,3 @@ class HTTPDocumentResponse : public Request
 };
 
 #endif
-
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 97b1612af..88c5ff9ca 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -59,14 +59,12 @@ class Alias
 
 class ModuleAlias : public Module
 {
- private:
-
 	char fprefix;
 
 	/* We cant use a map, there may be multiple aliases with the same name.
 	 * We can, however, use a fancy invention: the multimap. Maps a key to one or more values.
 	 *		-- w00t
-   */
+     */
 	std::multimap<irc::string, Alias> Aliases;
 
 	/* whether or not +B users are allowed to use fantasy commands */
@@ -100,7 +98,6 @@ class ModuleAlias : public Module
 	}
 
  public:
-
 	void init()
 	{
 		ReadAliases();
@@ -108,10 +105,6 @@ class ModuleAlias : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleAlias()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides aliases of commands.", VF_VENDOR);
diff --git a/src/modules/m_allowinvite.cpp b/src/modules/m_allowinvite.cpp
index 08a5f542a..fbfdf9e7c 100644
--- a/src/modules/m_allowinvite.cpp
+++ b/src/modules/m_allowinvite.cpp
@@ -69,10 +69,6 @@ class ModuleAllowInvite : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleAllowInvite()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for channel mode +A, allowing /invite freely on a channel and extban A to deny specific users it",VF_VENDOR);
diff --git a/src/modules/m_alltime.cpp b/src/modules/m_alltime.cpp
index 38ae4b254..00bf7dcc1 100644
--- a/src/modules/m_alltime.cpp
+++ b/src/modules/m_alltime.cpp
@@ -52,7 +52,6 @@ class CommandAlltime : public Command
 	}
 };
 
-
 class Modulealltime : public Module
 {
 	CommandAlltime mycommand;
@@ -67,10 +66,6 @@ class Modulealltime : public Module
 		ServerInstance->Modules->AddService(mycommand);
 	}
 
-	virtual ~Modulealltime()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Display timestamps from all servers connected to the network", VF_OPTCOMMON | VF_VENDOR);
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index c3e31c583..1b10396fa 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -43,11 +43,11 @@ class AuditoriumMode : public ModeHandler
 
 class ModuleAuditorium : public Module
 {
- private:
 	AuditoriumMode aum;
 	bool OpsVisible;
 	bool OpsCanSee;
 	bool OperCanSee;
+
  public:
 	ModuleAuditorium() : aum(this)
 	{
@@ -66,10 +66,6 @@ class ModuleAuditorium : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	~ModuleAuditorium()
-	{
-	}
-
 	void OnRehash(User* user)
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("auditorium");
diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp
index 07dca6929..a8f6f8d1e 100644
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -82,7 +82,7 @@ class ModuleAutoOp : public Module
 {
 	AutoOpList mh;
 
-public:
+ public:
 	ModuleAutoOp() : mh(this)
 	{
 	}
diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 1811f743d..ab195a68e 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -49,7 +49,7 @@ class ModuleBanException : public Module
 {
 	BanException be;
 
-public:
+ public:
 	ModuleBanException() : be(this)
 	{
 	}
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index be861447f..736c16529 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -37,7 +37,7 @@ enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOP
  */
 class BlockedMessage
 {
-public:
+ public:
 	std::string message;
 	irc::string target;
 	time_t sent;
@@ -67,10 +67,6 @@ class ModuleBlockAmsg : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleBlockAmsg()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR);
@@ -169,5 +165,4 @@ class ModuleBlockAmsg : public Module
 	}
 };
 
-
 MODULE_INIT(ModuleBlockAmsg)
diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 200693699..eb48da243 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -39,8 +39,8 @@ class ModuleBlockCAPS : public Module
 	int percent;
 	unsigned int minlen;
 	char capsmap[256];
-public:
 
+public:
 	ModuleBlockCAPS() : bc(this)
 	{
 	}
@@ -131,10 +131,6 @@ public:
 		}
 	}
 
-	virtual ~ModuleBlockCAPS()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support to block all-CAPS channel messages and notices", VF_VENDOR);
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 3cc01b4c0..6a0d486fd 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -91,10 +91,6 @@ class ModuleBlockColor : public Module
 		return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 
-	virtual ~ModuleBlockColor()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides channel mode +c to block color",VF_VENDOR);
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index b29c58240..71f327dd3 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -47,10 +47,6 @@ class ModuleBotMode : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleBotMode()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides user mode +B to mark the user as a bot",VF_VENDOR);
@@ -63,8 +59,6 @@ class ModuleBotMode : public Module
 			ServerInstance->SendWhoisLine(src, dst, 335, src->nick+" "+dst->nick+" :is a bot on "+ServerInstance->Config->Network);
 		}
 	}
-
 };
 
-
 MODULE_INIT(ModuleBotMode)
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 7f843f252..330b1ec91 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -292,7 +292,6 @@ public:
 
 class ModuleCallerID : public Module
 {
-private:
 	CommandAccept cmd;
 	User_g myumode;
 
@@ -343,10 +342,6 @@ public:
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleCallerID()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Implementation of callerid, usermode +g, /accept", VF_COMMON | VF_VENDOR);
@@ -423,5 +418,3 @@ public:
 };
 
 MODULE_INIT(ModuleCallerID)
-
-
diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index e9f4dae90..59b92eb27 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -150,10 +150,6 @@ class ModuleCAP : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	~ModuleCAP()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Client CAP extension support", VF_VENDOR);
@@ -161,4 +157,3 @@ class ModuleCAP : public Module
 };
 
 MODULE_INIT(ModuleCAP)
-
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 6f7d576ea..a3c0130b9 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -38,10 +38,6 @@ public:
 		this->matchtext = ch.c_str();
 	}
 
-	~CBan()
-	{
-	}
-
 	// XXX I shouldn't have to define this
 	bool Matches(User *u)
 	{
@@ -211,4 +207,3 @@ class ModuleCBan : public Module
 };
 
 MODULE_INIT(ModuleCBan)
-
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 50c8e22a7..6867bdba0 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -66,11 +66,6 @@ class ModuleCensor : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-
-	virtual ~ModuleCensor()
-	{
-	}
-
 	// format of a config entry is <badword text="shit" replace="poo">
 	virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 	{
diff --git a/src/modules/m_chancreate.cpp b/src/modules/m_chancreate.cpp
index 997a92648..5f04b4563 100644
--- a/src/modules/m_chancreate.cpp
+++ b/src/modules/m_chancreate.cpp
@@ -25,7 +25,6 @@
 
 class ModuleChanCreate : public Module
 {
- private:
  public:
 	void init()
 	{
@@ -39,7 +38,6 @@ class ModuleChanCreate : public Module
 		return Version("Provides snomasks 'j' and 'J', to which notices about newly created channels are sent",VF_VENDOR);
 	}
 
-
 	void OnUserJoin(Membership* memb, bool sync, bool created, CUList& except)
 	{
 		if ((created) && (IS_LOCAL(memb->user)))
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 651e659b5..db406dd87 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -145,10 +145,6 @@ class ModuleChanFilter : public Module
 	{
 		return Version("Provides channel-specific censor lists (like mode +G but varies from channel to channel)", VF_VENDOR);
 	}
-
-	virtual ~ModuleChanFilter()
-	{
-	}
 };
 
 MODULE_INIT(ModuleChanFilter)
diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index 6dbc0e7a8..418175da3 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -24,7 +24,6 @@
 
 class ModuleChanLog : public Module
 {
- private:
 	/*
 	 * Multimap so people can redirect a snomask to multiple channels.
 	 */
@@ -40,10 +39,6 @@ class ModuleChanLog : public Module
 		OnRehash(NULL);
 	}
 
-	virtual ~ModuleChanLog()
-	{
-	}
-
 	virtual void OnRehash(User *user)
 	{
 		std::string snomasks;
@@ -155,4 +150,3 @@ class ChannelLogStream : public LogStream
 	}
 };
 #endif
-
diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index e9e5ba305..c2bf9feec 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -48,7 +48,6 @@ bool NewIsChannelHandler::Call(const std::string& channame, size_t max)
 
 class ModuleChannelNames : public Module
 {
- private:
 	NewIsChannelHandler myhandler;
 	caller2<bool, const std::string&, size_t> rememberer;
 	bool badchan;
diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index 6eec486ea..034a06e29 100644
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -24,7 +24,6 @@
 
 class ModuleBadChannelExtban : public Module
 {
- private:
  public:
 	void init()
 	{
@@ -32,10 +31,6 @@ class ModuleBadChannelExtban : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	~ModuleBadChannelExtban()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Extban 'j' - channel status/join ban", VF_OPTCOMMON|VF_VENDOR);
@@ -77,6 +72,4 @@ class ModuleBadChannelExtban : public Module
 	}
 };
 
-
 MODULE_INIT(ModuleBadChannelExtban)
-
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 2c46401ae..a19b20477 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -250,10 +250,8 @@ class CommandCheck : public Command
 	}
 };
 
-
 class ModuleCheck : public Module
 {
- private:
 	CommandCheck mycommand;
  public:
 	ModuleCheck() : mycommand(this)
@@ -265,10 +263,6 @@ class ModuleCheck : public Module
 		ServerInstance->Modules->AddService(mycommand);
 	}
 
-	~ModuleCheck()
-	{
-	}
-
 	void ProtoSendMode(void* uv, TargetTypeFlags, void*, const std::vector<std::string>& result, const std::vector<TranslateType>&)
 	{
 		User* user = (User*)uv;
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 08f7f76fa..15e360b1a 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -27,7 +27,6 @@
  */
 class CommandChghost : public Command
 {
- private:
 	char* hostmap;
  public:
 	CommandChghost(Module* Creator, char* hmap) : Command(Creator,"CHGHOST", 2), hostmap(hmap)
@@ -91,6 +90,7 @@ class ModuleChgHost : public Module
 {
 	CommandChghost cmd;
 	char hostmap[256];
+
  public:
 	ModuleChgHost() : cmd(this, hostmap)
 	{
@@ -113,15 +113,10 @@ class ModuleChgHost : public Module
 			hostmap[(unsigned char)*n] = 1;
 	}
 
-	~ModuleChgHost()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides support for the CHGHOST command", VF_OPTCOMMON | VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleChgHost)
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 2112e45a3..2ef44c684 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -79,7 +79,6 @@ class CommandChgident : public Command
 	}
 };
 
-
 class ModuleChgIdent : public Module
 {
 	CommandChgident cmd;
@@ -94,10 +93,6 @@ public:
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleChgIdent()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for the CHGIDENT command", VF_OPTCOMMON | VF_VENDOR);
@@ -106,4 +101,3 @@ public:
 };
 
 MODULE_INIT(ModuleChgIdent)
-
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index 73ae3d487..b336e97cf 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -75,7 +75,6 @@ class CommandChgname : public Command
 	}
 };
 
-
 class ModuleChgName : public Module
 {
 	CommandChgname cmd;
@@ -90,10 +89,6 @@ public:
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleChgName()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		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 3ad0c7ab3..5bec93f03 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -45,7 +45,6 @@ class CloakUser : public ModeHandler
 {
  public:
 	LocalStringExt ext;
-
 	std::string debounce_uid;
 	time_t debounce_ts;
 	int debounce_count;
@@ -119,7 +118,6 @@ class CloakUser : public ModeHandler
 			return MODEACTION_ALLOW;
 		}
 	}
-
 };
 
 class CommandCloak : public Command
@@ -322,10 +320,6 @@ class ModuleCloaking : public Module
 		}
 	}
 
-	~ModuleCloaking()
-	{
-	}
-
 	Version GetVersion()
 	{
 		std::string testcloak = "broken";
diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 92b1bda78..830d92232 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -63,10 +63,8 @@ class CommandClones : public Command
 	}
 };
 
-
 class ModuleClones : public Module
 {
- private:
 	CommandClones cmd;
  public:
 	ModuleClones() : cmd(this)
@@ -78,16 +76,10 @@ class ModuleClones : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleClones()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides the /CLONES command to retrieve information on clones.", VF_VENDOR);
 	}
-
-
 };
 
 MODULE_INIT(ModuleClones)
diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index 8b0ea3417..62b94e3c1 100644
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -76,10 +76,6 @@ class ModuleClose : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleClose()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides /CLOSE functionality", VF_VENDOR);
diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index afa17add4..b7aa683e2 100644
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -44,10 +44,6 @@ class ModulePrivacyMode : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModulePrivacyMode()
-	{
-	}
-
 	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_VENDOR);
@@ -73,5 +69,4 @@ class ModulePrivacyMode : public Module
 	}
 };
 
-
 MODULE_INIT(ModulePrivacyMode)
diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index 6f9679eb7..7ba2b0c7d 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -62,5 +62,4 @@ class ModuleConnJoin : public Module
 		}
 };
 
-
 MODULE_INIT(ModuleConnJoin)
diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index a21462ddf..932814a44 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -38,10 +38,6 @@ class ModuleModesOnConnect : public Module
 		ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
 	}
 
-	virtual ~ModuleModesOnConnect()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Sets (and unsets) modes on users when they connect", VF_VENDOR);
diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index 1d48220a6..d9341c79f 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -95,15 +95,10 @@ class ModuleWaitPong : public Module
 		return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 	}
 
-	~ModuleWaitPong()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Require pong prior to registration", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleWaitPong)
diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index dc2bc3f18..2a00b36df 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -24,12 +24,12 @@
 
 class ModuleConnectBan : public Module
 {
- private:
 	clonemap connects;
 	unsigned int threshold;
 	unsigned int banduration;
 	unsigned int ipv4_cidr;
 	unsigned int ipv6_cidr;
+
  public:
 	void init()
 	{
@@ -38,10 +38,6 @@ class ModuleConnectBan : public Module
 		OnRehash(NULL);
 	}
 
-	virtual ~ModuleConnectBan()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Throttles the connections of IP ranges who try to connect flood.", VF_VENDOR);
diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index f77691e32..9bc8277ee 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -25,7 +25,6 @@
 
 class ModuleConnFlood : public Module
 {
-private:
 	int seconds, timeout, boot_wait;
 	unsigned int conns;
 	unsigned int maxconns;
diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp
index 9bf65b3e8..97c2e697d 100644
--- a/src/modules/m_customprefix.cpp
+++ b/src/modules/m_customprefix.cpp
@@ -97,10 +97,6 @@ class ModuleCustomPrefix : public Module
 {
 	std::vector<CustomPrefixMode*> modes;
  public:
-	ModuleCustomPrefix()
-	{
-	}
-
 	void init()
 	{
 		ConfigTagList tags = ServerInstance->Config->ConfTags("customprefix");
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 4cd84c4cc..613de5938 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -121,10 +121,6 @@ class ModuleCustomTitle : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	~ModuleCustomTitle()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Custom Title for users", VF_OPTCOMMON | VF_VENDOR);
diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 4aa8e9c20..b23bf5b92 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -84,6 +84,7 @@ class CommandCycle : public Command
 class ModuleCycle : public Module
 {
 	CommandCycle cmd;
+
  public:
 	ModuleCycle()
 		: cmd(this)
@@ -95,15 +96,10 @@ class ModuleCycle : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleCycle()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides command CYCLE, acts as a server-side HOP command to part and rejoin a channel.", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleCycle)
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 712dd91b8..e08b5d3d1 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -247,8 +247,8 @@ class CommandDccallow : public Command
 class ModuleDCCAllow : public Module
 {
 	CommandDccallow cmd;
- public:
 
+ public:
 	ModuleDCCAllow()
 		: cmd(this)
 	{
diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 43b24cfae..a315a89f1 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -56,7 +56,6 @@ class User_d : public ModeHandler
 class ModuleDeaf : public Module
 {
 	User_d m1;
-
 	std::string deaf_bypasschars;
 	std::string deaf_bypasschars_uline;
 
@@ -159,15 +158,10 @@ class ModuleDeaf : public Module
 		}
 	}
 
-	virtual ~ModuleDeaf()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides usermode +d to block channel messages and channel notices", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleDeaf)
diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index a9a92e67a..bf699cf7e 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -27,7 +27,6 @@
 
 class DelayJoinMode : public ModeHandler
 {
- private:
 	CUList empty;
  public:
 	DelayJoinMode(Module* Parent) : ModeHandler(Parent, "delayjoin", 'D', PARAM_NONE, MODETYPE_CHANNEL)
@@ -54,7 +53,6 @@ class ModuleDelayJoin : public Module
 		Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnText, I_OnRawMode };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
-	~ModuleDelayJoin();
 	Version GetVersion();
 	void OnNamesListItem(User* issuer, Membership*, std::string &prefixes, std::string &nick);
 	void OnUserJoin(Membership*, bool, bool, CUList&);
@@ -86,10 +84,6 @@ ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channe
 	return MODEACTION_ALLOW;
 }
 
-ModuleDelayJoin::~ModuleDelayJoin()
-{
-}
-
 Version ModuleDelayJoin::GetVersion()
 {
 	return Version("Allows for delay-join channels (+D) where users don't appear to join until they speak", VF_VENDOR);
diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index cfc06866a..dd54ea362 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -41,7 +41,6 @@ class DelayMsgMode : public ModeHandler
 
 class ModuleDelayMsg : public Module
 {
- private:
 	DelayMsgMode djm;
  public:
 	ModuleDelayMsg() : djm(this)
@@ -145,4 +144,3 @@ ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_ty
 }
 
 MODULE_INIT(ModuleDelayMsg)
-
diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index a96597ace..50c70999d 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -77,10 +77,6 @@ class ModuleDenyChannels : public Module
 		}
 	}
 
-	virtual ~ModuleDenyChannels()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		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 2b5de2bd6..81b319f3c 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -70,10 +70,6 @@ class ModuleDeVoice : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleDeVoice()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		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 f95bfd921..dcaea4ac3 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -40,7 +40,6 @@ class DNSBLConfEntry
 		unsigned char records[256];
 		unsigned long stats_hits, stats_misses;
 		DNSBLConfEntry(): type(A_BITMASK),duration(86400),bitmask(0),stats_hits(0), stats_misses(0) {}
-		~DNSBLConfEntry() { }
 };
 
 
@@ -201,10 +200,6 @@ class DNSBLResolver : public Resolver
 				countExt.set(them, i - 1);
 		}
 	}
-
-	virtual ~DNSBLResolver()
-	{
-	}
 };
 
 class ModuleDNSBL : public Module
diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp
index 9fac8e7ad..eec452df1 100644
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -63,7 +63,7 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
  public:
 	ExemptChanOps ec;
 	ExemptHandler(Module* me) : ec(me) {}
-	
+
 	ModeHandler* FindMode(const std::string& mid)
 	{
 		if (mid.length() == 1)
@@ -112,7 +112,6 @@ class ModuleExemptChanOps : public Module
 	ExemptHandler eh;
 
  public:
-
 	ModuleExemptChanOps() : eh(this)
 	{
 	}
diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index 1497c1b87..4b1fb59e0 100644
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -30,10 +30,6 @@ class ModuleGecosBan : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	~ModuleGecosBan()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Extban 'r' - realname (gecos) ban", VF_OPTCOMMON|VF_VENDOR);
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 22286b950..d623ed262 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -187,10 +187,6 @@ class ModuleGlobalLoad : public Module
 		ServerInstance->Modules->AddService(cmd3);
 	}
 
-	~ModuleGlobalLoad()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Allows global loading of a module.", VF_COMMON | VF_VENDOR);
@@ -198,4 +194,3 @@ class ModuleGlobalLoad : public Module
 };
 
 MODULE_INIT(ModuleGlobalLoad)
-
diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 85d84252b..e22bad758 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -59,7 +59,6 @@ class ModuleGlobops : public Module
 	{
 		return Version("Provides support for GLOBOPS and snomask +g", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleGlobops)
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 92abcd76f..7bd49f84b 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -98,7 +98,6 @@ class CommandHelpop : public Command
 
 class ModuleHelpop : public Module
 {
-	private:
 		std::string  h_file;
 		CommandHelpop cmd;
 		Helpop ho;
diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index 008c62208..1669fe2f2 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -47,10 +47,6 @@ class ModuleHideChans : public Module
 		OnRehash(NULL);
 	}
 
-	virtual ~ModuleHideChans()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for hiding channels with user mode +I", VF_VENDOR);
@@ -88,5 +84,4 @@ class ModuleHideChans : public Module
 	}
 };
 
-
 MODULE_INIT(ModuleHideChans)
diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index fbab9685f..58887ba96 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -50,11 +50,6 @@ class ModuleHideOper : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-
-	virtual ~ModuleHideOper()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
@@ -92,5 +87,4 @@ class ModuleHideOper : public Module
 	}
 };
 
-
 MODULE_INIT(ModuleHideOper)
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index 7433fccd3..01c11443c 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -47,7 +47,6 @@ typedef std::vector<std::pair<std::string, Host> > hostchanges_t;
 
 class ModuleHostChange : public Module
 {
- private:
 	hostchanges_t hostchanges;
 	std::string MySuffix;
 	std::string MyPrefix;
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 37f715a8d..6462ee1f4 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -58,7 +58,6 @@ class HttpServerSocket : public BufferedSocket
 	std::string http_version;
 
  public:
-
 	HttpServerSocket(int newfd, const std::string& IP, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 		: BufferedSocket(newfd), ip(IP), postsize(0)
 	{
@@ -334,8 +333,8 @@ class HttpServerSocket : public BufferedSocket
 class ModuleHttpServer : public Module
 {
 	std::vector<HttpServerSocket *> httpsocks;
- public:
 
+ public:
 	void init()
 	{
 		HttpModule = this;
@@ -362,7 +361,6 @@ class ModuleHttpServer : public Module
 		return MOD_RES_ALLOW;
 	}
 
-
 	virtual ~ModuleHttpServer()
 	{
 		for (size_t i = 0; i < httpsocks.size(); i++)
diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index 2694402bd..cddbce2f6 100644
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -37,18 +37,14 @@ class HTTPACL
 		const std::string &set_whitelist, const std::string &set_blacklist)
 		: path(set_path), username(set_username), password(set_password), whitelist(set_whitelist),
 		blacklist(set_blacklist) { }
-
-	~HTTPACL() { }
 };
 
 class ModuleHTTPAccessList : public Module
 {
-
 	std::string stylesheet;
 	std::vector<HTTPACL> acl_list;
 
  public:
-
 	void ReadConfig()
 	{
 		acl_list.clear();
@@ -222,10 +218,6 @@ class ModuleHTTPAccessList : public Module
 		}
 	}
 
-	virtual ~ModuleHTTPAccessList()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		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 62314cd7e..a28db34ab 100644
--- a/src/modules/m_httpd_config.cpp
+++ b/src/modules/m_httpd_config.cpp
@@ -102,10 +102,6 @@ class ModuleHttpConfig : public Module
 		}
 	}
 
-	virtual ~ModuleHttpConfig()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Allows for the server configuration to be viewed 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 9115fedaf..b3a13ada6 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -232,10 +232,6 @@ class ModuleHttpStats : public Module
 		}
 	}
 
-	virtual ~ModuleHttpStats()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		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 f1c3b81fd..6653cf6c3 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -289,10 +289,6 @@ class ModuleIdent : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	~ModuleIdent()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for RFC1413 ident lookups", VF_VENDOR);
@@ -407,4 +403,3 @@ class ModuleIdent : public Module
 };
 
 MODULE_INIT(ModuleIdent)
-
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 8fcb2dd12..1a30b7479 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -86,7 +86,6 @@ class joinfloodsettings
 		locked = true;
 		unlocktime = ServerInstance->Time() + 60;
 	}
-
 };
 
 /** Handles channel mode +j
@@ -190,11 +189,9 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-
 	JoinFlood jf;
 
  public:
-
 	ModuleJoinFlood()
 		: jf(this)
 	{
@@ -243,10 +240,6 @@ class ModuleJoinFlood : public Module
 		}
 	}
 
-	~ModuleJoinFlood()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides channel mode +j (join flood protection)", VF_VENDOR);
diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index dce8f0bd5..361a28c9f 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -134,7 +134,6 @@ class CommandJumpserver : public Command
 	}
 };
 
-
 class ModuleJumpServer : public Module
 {
 	CommandJumpserver js;
@@ -150,10 +149,6 @@ class ModuleJumpServer : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleJumpServer()
-	{
-	}
-
 	virtual ModResult OnUserRegister(LocalUser* user)
 	{
 		if (js.port && js.redirect_new_users)
@@ -176,7 +171,6 @@ class ModuleJumpServer : public Module
 	{
 		return Version("Provides support for the RPL_REDIR numeric and the /JUMPSERVER command.", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleJumpServer)
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 8ed472d31..9163be7f6 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -60,7 +60,6 @@ class ModuleKickNoRejoin : public Module
 	KickRejoin kr;
 
 public:
-
 	ModuleKickNoRejoin()
 		: kr(this)
 	{
@@ -126,15 +125,10 @@ public:
 		}
 	}
 
-	~ModuleKickNoRejoin()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Channel mode to delay rejoin after kick", VF_VENDOR);
 	}
 };
 
-
 MODULE_INIT(ModuleKickNoRejoin)
diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 4983ae16a..0db02a781 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -25,13 +25,13 @@
 /** Adds numerics
  * 988 <nick> <servername> :Closed for new connections
  * 989 <nick> <servername> :Open for new connections
-*/
-
+ */
 
 class CommandLockserv : public Command
 {
 	bool& locked;
-public:
+
+ public:
 	CommandLockserv(Module* Creator, bool& lock) : Command(Creator, "LOCKSERV", 0), locked(lock)
 	{
 		flags_needed = 'o';
@@ -54,10 +54,9 @@ public:
 
 class CommandUnlockserv : public Command
 {
-private:
 	bool& locked;
 
-public:
+ public:
 	CommandUnlockserv(Module* Creator, bool &lock) : Command(Creator, "UNLOCKSERV", 0), locked(lock)
 	{
 		flags_needed = 'o';
@@ -80,12 +79,11 @@ public:
 
 class ModuleLockserv : public Module
 {
-private:
 	bool locked;
 	CommandLockserv lockcommand;
 	CommandUnlockserv unlockcommand;
 
-public:
+ public:
 	ModuleLockserv() : lockcommand(this, locked), unlockcommand(this, locked)
 	{
 	}
@@ -99,11 +97,6 @@ public:
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleLockserv()
-	{
-	}
-
-
 	virtual void OnRehash(User* user)
 	{
 		// Emergency way to unlock
diff --git a/src/modules/m_maphide.cpp b/src/modules/m_maphide.cpp
index 546e342ae..ca48cf4e2 100644
--- a/src/modules/m_maphide.cpp
+++ b/src/modules/m_maphide.cpp
@@ -48,10 +48,6 @@ class ModuleMapHide : public Module
 			return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleMapHide()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Hide /MAP and /LINKS in the same form as ircu (mostly useless)", VF_VENDOR);
@@ -59,4 +55,3 @@ class ModuleMapHide : public Module
 };
 
 MODULE_INIT(ModuleMapHide)
-
diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index 719701d02..4890d3661 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -23,7 +23,6 @@
 
 class ModuleMLock : public Module
 {
-private:
 	StringExtItem mlock;
 
 public:
@@ -67,7 +66,6 @@ public:
 
 		return MOD_RES_PASSTHRU;
 	}
-
 };
 
 MODULE_INIT(ModuleMLock)
diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index 767af2901..2b6bedc1c 100644
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -24,7 +24,6 @@
 
 class ModuleQuietBan : public Module
 {
- private:
  public:
 	void init()
 	{
@@ -32,10 +31,6 @@ class ModuleQuietBan : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleQuietBan()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Implements extban +b m: - mute bans",VF_OPTCOMMON|VF_VENDOR);
@@ -67,6 +62,4 @@ class ModuleQuietBan : public Module
 	}
 };
 
-
 MODULE_INIT(ModuleQuietBan)
-
diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 82d311773..b9d05024e 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -27,8 +27,8 @@
 
 class ModuleNamesX : public Module
 {
- public:
 	GenericCap cap;
+ public:
 	ModuleNamesX() : cap(this, "multi-prefix")
 	{
 	}
@@ -39,11 +39,6 @@ class ModuleNamesX : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-
-	~ModuleNamesX()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 59277bb9e..cf60194d1 100644
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -222,7 +222,6 @@ bool lwbNickHandler::Call(const std::string& nick, size_t max)
 
 class ModuleNationalChars : public Module
 {
- private:
 	lwbNickHandler myhandler;
 	std::string charset, casemapping;
 	unsigned char m_additional[256], m_additionalUp[256], m_lower[256], m_upper[256];
diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index 04d7c8b5e..f8593c26f 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -135,7 +135,6 @@ class ModuleNickFlood : public Module
 	NickFlood nf;
 
  public:
-
 	ModuleNickFlood()
 		: nf(this)
 	{
@@ -214,10 +213,6 @@ class ModuleNickFlood : public Module
 		}
 	}
 
-	~ModuleNickFlood()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Channel mode F - nick flood protection", VF_VENDOR);
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index b5564f215..892702f02 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -139,7 +139,6 @@ class CommandNickunlock : public Command
 	}
 };
 
-
 class ModuleNickLock : public Module
 {
 	LocalIntExt locked;
@@ -159,10 +158,6 @@ class ModuleNickLock : public Module
 		ServerInstance->Modules->Attach(I_OnUserPreNick, this);
 	}
 
-	~ModuleNickLock()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides the NICKLOCK command, allows an oper to change a users nick and lock them to it until they quit", VF_OPTCOMMON | VF_VENDOR);
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 1dd6fe34a..2a684e3a8 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -31,11 +31,9 @@ class NoCTCP : public SimpleChannelModeHandler
 
 class ModuleNoCTCP : public Module
 {
-
 	NoCTCP nc;
 
  public:
-
 	ModuleNoCTCP()
 		: nc(this)
 	{
@@ -48,10 +46,6 @@ class ModuleNoCTCP : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleNoCTCP()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides channel mode +C to block CTCPs", VF_VENDOR);
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 1f58a2e08..22f5664ed 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -63,15 +63,10 @@ class ModuleNoKicks : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	~ModuleNoKicks()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides channel mode +Q to prevent kicks on the channel.", VF_VENDOR);
 	}
 };
 
-
 MODULE_INIT(ModuleNoKicks)
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 672a48f8d..ba60afc80 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -46,16 +46,11 @@ class ModuleNoNickChange : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleNoNickChange()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for channel mode +N & extban +b N: which prevents nick changes on channel", VF_VENDOR);
 	}
 
-
 	virtual void On005Numeric(std::string &output)
 	{
 		ServerInstance->AddExtBanChar('N');
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index d95ea8b8a..9216531bb 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -77,10 +77,6 @@ class ModuleNoNotice : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleNoNotice()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides channel mode +T to block notices to the channel", VF_VENDOR);
diff --git a/src/modules/m_nopartmsg.cpp b/src/modules/m_nopartmsg.cpp
index ad3413101..0daf48c10 100644
--- a/src/modules/m_nopartmsg.cpp
+++ b/src/modules/m_nopartmsg.cpp
@@ -23,7 +23,6 @@
 
 class ModulePartMsgBan : public Module
 {
- private:
  public:
 	void init()
 	{
@@ -31,16 +30,11 @@ class ModulePartMsgBan : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModulePartMsgBan()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Implements extban +b p: - part message bans", VF_OPTCOMMON|VF_VENDOR);
 	}
 
-
 	virtual void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts)
 	{
 		if (!IS_LOCAL(memb->user))
@@ -48,8 +42,6 @@ class ModulePartMsgBan : public Module
 
 		if (memb->chan->GetExtBanStatus(memb->user, 'p') == MOD_RES_DENY)
 			partmessage.clear();
-
-		return;
 	}
 
 	virtual void On005Numeric(std::string &output)
@@ -58,6 +50,4 @@ class ModulePartMsgBan : public Module
 	}
 };
 
-
 MODULE_INIT(ModulePartMsgBan)
-
diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index e2019e302..f630f827c 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -255,4 +255,3 @@ class ModuleOjoin : public Module
 };
 
 MODULE_INIT(ModuleOjoin)
-
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index e0423886f..508b0ff0c 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -75,10 +75,6 @@ class ModuleOperChans : public Module
 		ServerInstance->AddExtBanChar('O');
 	}
 
-	~ModuleOperChans()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides support for oper-only chans via the +O channel mode and 'O' extban", VF_VENDOR);
diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index bd77384a6..ea70e51dc 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -28,7 +28,6 @@
 
 class ModuleOperjoin : public Module
 {
-	private:
 		std::string operChan;
 		std::vector<std::string> operChans;
 		bool override;
@@ -72,10 +71,6 @@ class ModuleOperjoin : public Module
 				tokenize(operChan,operChans);
 		}
 
-		virtual ~ModuleOperjoin()
-		{
-		}
-
 		virtual Version GetVersion()
 		{
 			return Version("Forces opers to join the specified channel(s) on oper-up", VF_VENDOR);
diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 569defd49..793fa070a 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -60,4 +60,3 @@ class ModuleOperLevels : public Module
 };
 
 MODULE_INIT(ModuleOperLevels)
-
diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index edb9109e8..023ff9419 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -36,10 +36,6 @@ class ModuleOperLog : public Module
 		OnRehash(NULL);
 	}
 
-	virtual ~ModuleOperLog()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("A module which logs all oper commands to the ircd log at default loglevel.", VF_VENDOR);
@@ -81,5 +77,4 @@ class ModuleOperLog : public Module
 
 };
 
-
 MODULE_INIT(ModuleOperLog)
diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 8b49f685e..c649af0ff 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -32,10 +32,6 @@ class ModuleModesOnOper : public Module
 		ServerInstance->Modules->Attach(I_OnPostOper, this);
 	}
 
-	virtual ~ModuleModesOnOper()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Sets (and unsets) modes on opers when they oper up", VF_VENDOR);
diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index b0ca38555..c7f8b8fe6 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -71,7 +71,6 @@ class HideOperWatcher : public ModeWatcher
 
 class ModuleOperPrefixMode : public Module
 {
- private:
 	OperPrefixMode opm;
 	bool mw_added;
 	HideOperWatcher hideoperwatcher;
diff --git a/src/modules/m_passforward.cpp b/src/modules/m_passforward.cpp
index 84389fb22..5b1eeab9b 100644
--- a/src/modules/m_passforward.cpp
+++ b/src/modules/m_passforward.cpp
@@ -23,7 +23,6 @@
 
 class ModulePassForward : public Module
 {
- private:
 	std::string nickrequired, forwardmsg, forwardcmd;
 
  public:
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index dab3c93cd..d8a2b8431 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -54,7 +54,6 @@ class CommandRandquote : public Command
 
 class ModuleRandQuote : public Module
 {
- private:
 	CommandRandquote cmd;
  public:
 	ModuleRandQuote()
@@ -80,7 +79,6 @@ class ModuleRandQuote : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-
 	virtual ~ModuleRandQuote()
 	{
 		delete quotes;
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 8076bb2a1..318d26d2e 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -168,10 +168,6 @@ class ModuleRedirect : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleRedirect()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides channel mode +L (limit redirection) and user mode +L (no forced redirection)", VF_VENDOR);
diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index 44d1a5898..a3088cabd 100644
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -30,10 +30,6 @@ public:
 	{
 	}
 
-	virtual ~GlobRegex()
-	{
-	}
-
 	virtual bool Matches(const std::string& text)
 	{
 		return InspIRCd::Match(text, this->regex_string);
diff --git a/src/modules/m_regonlycreate.cpp b/src/modules/m_regonlycreate.cpp
index 93f88fe30..22bf42a61 100644
--- a/src/modules/m_regonlycreate.cpp
+++ b/src/modules/m_regonlycreate.cpp
@@ -54,10 +54,6 @@ class ModuleRegOnlyCreate : public Module
 		return MOD_RES_DENY;
 	}
 
-	~ModuleRegOnlyCreate()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Prevents users whose nicks are not registered from creating new channels", VF_VENDOR);
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 86f50ad62..d95c0c6c6 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -36,7 +36,6 @@
  */
 class RemoveBase : public Command
 {
- private:
 	bool& supportnokicks;
 
  public:
@@ -198,7 +197,6 @@ class ModuleRemove : public Module
 	CommandFpart cmd2;
 	bool supportnokicks;
 
-
  public:
 	ModuleRemove() : cmd1(this, supportnokicks), cmd2(this, supportnokicks)
 	{
@@ -223,15 +221,10 @@ class ModuleRemove : public Module
 		supportnokicks = ServerInstance->Config->ConfValue("remove")->getBool("supportnokicks");
 	}
 
-	virtual ~ModuleRemove()
-	{
-	}
-
 	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);
 	}
-
 };
 
 MODULE_INIT(ModuleRemove)
diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index d720c7b5f..09333bbc1 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -72,10 +72,6 @@ class ModuleRestrictChans : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleRestrictChans()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		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 e814f3b16..33a7fb18a 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -63,10 +63,6 @@ class ModuleRestrictMsg : public Module
 		return this->OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
 	}
 
-	virtual ~ModuleRestrictMsg()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		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 3c76ed1d6..9cbd0c69b 100644
--- a/src/modules/m_ripemd160.cpp
+++ b/src/modules/m_ripemd160.cpp
@@ -467,8 +467,6 @@ class ModuleRIPEMD160 : public Module
 	{
 		return Version("Provides RIPEMD-160 hashing", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleRIPEMD160)
-
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 68e3594a5..5548d2baa 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -131,10 +131,6 @@ class RLineFactory : public XLineFactory
 
 		return new RLine(set_time, duration, source, reason, xline_specific_mask, rxfactory);
 	}
-
-	~RLineFactory()
-	{
-	}
 };
 
 /** Handle /RLINE
@@ -220,7 +216,6 @@ class CommandRLine : public Command
 
 class ModuleRLine : public Module
 {
- private:
 	dynamic_reference<RegexFactory> rxfactory;
 	RLineFactory f;
 	CommandRLine r;
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 32ebf96ac..2d6bb0f97 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -116,15 +116,10 @@ class ModuleSajoin : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleSajoin()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides command SAJOIN to allow opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleSajoin)
diff --git a/src/modules/m_sakick.cpp b/src/modules/m_sakick.cpp
index 7dfcd8904..197b4b271 100644
--- a/src/modules/m_sakick.cpp
+++ b/src/modules/m_sakick.cpp
@@ -112,16 +112,10 @@ class ModuleSakick : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleSakick()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides a SAKICK command", VF_OPTCOMMON|VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleSakick)
-
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index a7453c233..08cdea4af 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -69,10 +69,6 @@ class ModuleSaMode : public Module
 		ServerInstance->Modules->Attach(I_OnPreMode, this);
 	}
 
-	~ModuleSaMode()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides command SAMODE to allow opers to change modes on channels and users", VF_VENDOR);
diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index ba4fdc033..6b870ba05 100644
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -103,15 +103,11 @@ class ModuleSanick : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleSanick()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for SANICK command", VF_OPTCOMMON | VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleSanick)
+
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 89256e0e4..02c2f02b6 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -114,16 +114,10 @@ class ModuleSapart : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleSapart()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides command SAPART to force-part users from a channel.", VF_OPTCOMMON | VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleSapart)
-
diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 3b7bdc824..88b840b34 100644
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -48,7 +48,7 @@ class CommandSaquit : public Command
 			// Pass the command on, so the client's server can quit it properly.
 			if (!IS_LOCAL(dest))
 				return CMD_SUCCESS;
-			
+
 			ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAQUIT to make "+dest->nick+" quit with a reason of "+parameters[1]);
 
 			ServerInstance->Users->QuitUser(dest, parameters[1]);
@@ -84,15 +84,11 @@ class ModuleSaquit : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleSaquit()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for an SAQUIT command, exits user with a reason", VF_OPTCOMMON | VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleSaquit)
+
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index f8d8c5322..0f2f9022e 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -249,6 +249,7 @@ class ModuleSASL : public Module
 	GenericCap cap;
 	CommandAuthenticate auth;
 	CommandSASL sasl;
+
  public:
 	ModuleSASL()
 		: authExt("sasl_auth", this), cap(this, "sasl"), auth(this, authExt, cap), sasl(this, authExt)
diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index ae1c19d91..61b7b03f4 100644
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -70,10 +70,6 @@ class ModuleSATopic : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleSATopic()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides a SATOPIC command", VF_VENDOR);
diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 6013d1fd7..61e884314 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -25,9 +25,9 @@
 
 class ModuleSecureList : public Module
 {
- private:
 	std::vector<std::string> allowlist;
 	time_t WaitTime;
+
  public:
 	void init()
 	{
@@ -36,10 +36,6 @@ class ModuleSecureList : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleSecureList()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR);
diff --git a/src/modules/m_serverban.cpp b/src/modules/m_serverban.cpp
index cf77ae9ba..cd9db395a 100644
--- a/src/modules/m_serverban.cpp
+++ b/src/modules/m_serverban.cpp
@@ -23,7 +23,6 @@
 
 class ModuleServerBan : public Module
 {
- private:
  public:
 	void init()
 	{
@@ -31,10 +30,6 @@ class ModuleServerBan : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	~ModuleServerBan()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Extban 's' - server ban",VF_OPTCOMMON|VF_VENDOR);
@@ -56,6 +51,4 @@ class ModuleServerBan : public Module
 	}
 };
 
-
 MODULE_INIT(ModuleServerBan)
-
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 6dd042ea6..62e96ca7c 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -319,3 +319,4 @@ class ModuleServicesAccount : public Module
 };
 
 MODULE_INIT(ModuleServicesAccount)
+
diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index b4f2b5bbd..3e3a7643e 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -60,11 +60,6 @@ class ModuleServProtectMode : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-
-	~ModuleServProtectMode()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides usermode +k to protect services from kicks, kills, and mode changes.", VF_VENDOR);
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 2ef0c0548..f3c7786e2 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -27,8 +27,8 @@
  */
 class CommandSethost : public Command
 {
- private:
 	char* hostmap;
+
  public:
 	CommandSethost(Module* Creator, char* hmap) : Command(Creator,"SETHOST", 1), hostmap(hmap)
 	{
@@ -70,6 +70,7 @@ class ModuleSetHost : public Module
 {
 	CommandSethost cmd;
 	char hostmap[256];
+
  public:
 	ModuleSetHost()
 		: cmd(this, hostmap)
@@ -93,15 +94,10 @@ class ModuleSetHost : public Module
 			hostmap[(unsigned char)*n] = 1;
 	}
 
-	virtual ~ModuleSetHost()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for the SETHOST command", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleSetHost)
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index f63be1381..f3592ae46 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -57,7 +57,6 @@ class CommandSetident : public Command
 	}
 };
 
-
 class ModuleSetIdent : public Module
 {
 	CommandSetident cmd;
@@ -72,16 +71,10 @@ class ModuleSetIdent : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleSetIdent()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for the SETIDENT command", VF_VENDOR);
 	}
-
 };
 
-
 MODULE_INIT(ModuleSetIdent)
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index 7423e2672..a74f4abf7 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -68,10 +68,6 @@ class ModuleSetIdle : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleSetIdle()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		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 d0610853b..28fd27f95 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -67,10 +67,6 @@ class ModuleSetName : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleSetName()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for the SETNAME command", VF_VENDOR);
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 434d1b07f..93c3a7e60 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -125,7 +125,7 @@ class ModuleShowwhois : public Module
 			ServerInstance->PI->SendEncapsulatedData(params);
 		}
 	}
-
 };
 
 MODULE_INIT(ModuleShowwhois)
+
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index c858e62ec..baeb6215f 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -36,10 +36,6 @@ public:
 		this->matchtext = shunmask;
 	}
 
-	~Shun()
-	{
-	}
-
 	bool Matches(User *u)
 	{
 		// E: overrides shun
@@ -291,4 +287,3 @@ class ModuleShun : public Module
 };
 
 MODULE_INIT(ModuleShun)
-
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 817c8ffcf..55403a9b0 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -393,10 +393,6 @@ class ModuleSilence : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	~ModuleSilence()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides support for the /SILENCE command", VF_OPTCOMMON | VF_VENDOR);
diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index dabfc086b..f1a130b60 100644
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -35,7 +35,7 @@ void TreeSocket::Encap(User* who, parameterlist &params)
 			ServerInstance->Parser->CallHandler(params[1], plist, who);
 			// discard return value, ENCAP shall succeed even if the command does not exist
 		}
-		
+
 		params[params.size() - 1] = ":" + params[params.size() - 1];
 
 		if (params[0].find_first_of("*?") != std::string::npos)
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 04ca9edb1..bcf4cee12 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -47,7 +47,7 @@ void TreeSocket::Split(const std::string& line, std::string& prefix, std::string
 
 	if (!tokens.GetToken(prefix))
 		return;
-	
+
 	if (prefix[0] == ':')
 	{
 		prefix = prefix.substr(1);
@@ -455,7 +455,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 	else
 	{
 		Command* cmd = ServerInstance->Parser->GetHandler(command);
-		
+
 		if (!cmd)
 		{
 			irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index df97145be..8647e3e9e 100644
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -39,7 +39,7 @@ class AuthQuery : public SQLQuery
 		: SQLQuery(me), uid(u), pendingExt(e), verbose(v)
 	{
 	}
-	
+
 	void OnResult(SQLResult& res)
 	{
 		User* user = ServerInstance->FindNick(uid);
diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp
index 7097cd8e2..4e8126dbf 100644
--- a/src/modules/m_sqloper.cpp
+++ b/src/modules/m_sqloper.cpp
@@ -180,7 +180,6 @@ public:
 	{
 		return Version("Allows storage of oper credentials in an SQL table", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleSQLOper)
diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 2bfe0e1c4..bb30b76b5 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -255,4 +255,3 @@ class ModuleSSLInfo : public Module
 };
 
 MODULE_INIT(ModuleSSLInfo)
-
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 880d40097..be215924b 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -126,10 +126,6 @@ class ModuleSSLModes : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	~ModuleSSLModes()
-	{
-	}
-
 	void On005Numeric(std::string &output)
 	{
 		ServerInstance->AddExtBanChar('z');
@@ -141,6 +137,4 @@ class ModuleSSLModes : public Module
 	}
 };
 
-
 MODULE_INIT(ModuleSSLModes)
-
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index f1504edaf..de7b754c5 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -58,10 +58,6 @@ class ModuleStripColor : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleStripColor()
-	{
-	}
-
 	virtual void On005Numeric(std::string &output)
 	{
 		ServerInstance->AddExtBanChar('S');
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index d2269839d..128d610ca 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -38,10 +38,6 @@ public:
 		this->nickname = nick.c_str();
 	}
 
-	~SVSHold()
-	{
-	}
-
 	bool Matches(User *u)
 	{
 		if (u->nick == nickname)
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 742781747..41721ea40 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -130,10 +130,6 @@ class ModuleSWhois : public Module
 		ServerInstance->PI->SendMetaData(user, "swhois", swhois);
 	}
 
-	~ModuleSWhois()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides the SWHOIS command which allows setting of arbitrary WHOIS lines", VF_OPTCOMMON | VF_VENDOR);
diff --git a/src/modules/m_testnet.cpp b/src/modules/m_testnet.cpp
index 401766d8a..843ecd4b7 100644
--- a/src/modules/m_testnet.cpp
+++ b/src/modules/m_testnet.cpp
@@ -230,4 +230,3 @@ class ModuleTest : public Module
 };
 
 MODULE_INIT(ModuleTest)
-
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 497ac2569..421398a44 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -62,7 +62,7 @@ class CommandTban : public Command
 			user->WriteNumeric(482, "%s %s :You do not have permission to set bans on this channel",
 				user->nick.c_str(), channel->name.c_str());
 			return CMD_FAILURE;
-		}		
+		}
 
 		TimedBan T;
 		std::string channelname = parameters[0];
@@ -190,4 +190,3 @@ class ModuleTimedBans : public Module
 };
 
 MODULE_INIT(ModuleTimedBans)
-
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index b4e7e5a99..bf3bd59c6 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -80,10 +80,6 @@ class ModuleTLine : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleTLine()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides /tline command used to test who a mask matches", VF_VENDOR);
@@ -91,4 +87,3 @@ class ModuleTLine : public Module
 };
 
 MODULE_INIT(ModuleTLine)
-
diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp
index 2cd090f97..67ed560ca 100644
--- a/src/modules/m_uhnames.cpp
+++ b/src/modules/m_uhnames.cpp
@@ -39,10 +39,6 @@ class ModuleUHNames : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	~ModuleUHNames()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Provides the UHNAMES facility.",VF_VENDOR);
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 10fd7c7b6..683976885 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -111,10 +111,6 @@ class ModuleUninvite : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleUninvite()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides the UNINVITE command which lets users un-invite other users from channels", VF_VENDOR | VF_OPTCOMMON);
@@ -122,4 +118,3 @@ class ModuleUninvite : public Module
 };
 
 MODULE_INIT(ModuleUninvite)
-
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index a28c12444..57e6eaaad 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -82,16 +82,10 @@ class ModuleUserIP : public Module
 		output = output + " USERIP";
 	}
 
-	virtual ~ModuleUserIP()
-	{
-	}
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides support for USERIP command",VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleUserIP)
-
diff --git a/src/modules/m_vhost.cpp b/src/modules/m_vhost.cpp
index 31c504af8..623c2662d 100644
--- a/src/modules/m_vhost.cpp
+++ b/src/modules/m_vhost.cpp
@@ -63,7 +63,6 @@ class CommandVhost : public Command
 
 class ModuleVHost : public Module
 {
- private:
 	CommandVhost cmd;
 
  public:
@@ -76,17 +75,10 @@ class ModuleVHost : public Module
 		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual ~ModuleVHost()
-	{
-	}
-
-
 	virtual Version GetVersion()
 	{
 		return Version("Provides masking of user hostnames via traditional /VHOST command",VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleVHost)
-
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 3b87ed4c3..66570ae94 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -545,4 +545,3 @@ class Modulewatch : public Module
 };
 
 MODULE_INIT(Modulewatch)
-
diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index 5e83478c3..ced9bfd93 100644
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -49,10 +49,6 @@ class ModuleXLineDB : public Module
 		dirty = false;
 	}
 
-	virtual ~ModuleXLineDB()
-	{
-	}
-
 	/** Called whenever an xline is added by a local user.
 	 * This method is triggered after the line is added.
 	 * @param source The sender of the line or NULL for local server
@@ -256,8 +252,6 @@ class ModuleXLineDB : public Module
 		return true;
 	}
 
-
-
 	virtual Version GetVersion()
 	{
 		return Version("Keeps a dynamic log of all XLines created, and stores them in a separate conf file (xline.db).", VF_VENDOR);
@@ -265,4 +259,3 @@ class ModuleXLineDB : public Module
 };
 
 MODULE_INIT(ModuleXLineDB)
-
diff --git a/src/modules/u_listmode.h b/src/modules/u_listmode.h
index b0a8f2505..31ef8a185 100644
--- a/src/modules/u_listmode.h
+++ b/src/modules/u_listmode.h
@@ -95,7 +95,7 @@ class ListModeBase : public ModeHandler
 	 * @param ctag Configuration tag to get limits from
 	 */
 	ListModeBase(Module* Creator, const std::string& Name, char modechar, const std::string &eolstr, unsigned int lnum, unsigned int eolnum, bool autotidy, const std::string &ctag = "banlist")
-		: ModeHandler(Creator, Name, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL), 
+		: ModeHandler(Creator, Name, modechar, PARAM_ALWAYS, MODETYPE_CHANNEL),
 		listnumeric(lnum), endoflistnumeric(eolnum), endofliststring(eolstr), tidy(autotidy),
 		configtag(ctag), extItem("listbase_mode_" + name + "_list", Creator)
 	{