Honking huge commit. Removal of DELETE() template that never worked right anyway

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

57 files changed, 102 insertions, 110 deletions

diff --git a/include/inspircd.h b/include/inspircd.h
index 008179bab..12030677c 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -56,14 +56,6 @@
  */
 #define ETIREDHAMSTERS EAGAIN
 
-/** Delete a pointer, and NULL its value
- */
-template<typename T> inline void DELETE(T* x)
-{
-	delete x;
-	x = NULL;
-}
-
 /** Template function to convert any input type to std::string
  */
 template<typename T> inline std::string ConvNumeric(const T &in)
diff --git a/src/dns.cpp b/src/dns.cpp
index 28ceac689..53224ba86 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -147,7 +147,7 @@ class RequestTimeout : public Timer
 				ServerInstance->Res->Classes[watchid] = NULL;
 			}
 			ServerInstance->Res->requests[watchid] = NULL;
-			DELETE(watch);
+			delete watch;
 			return;
 		}
 	}
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index a033d13e7..25b54c258 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -512,7 +512,7 @@ void ClearOldConnections(ConfigReader* conf)
 	{
 		if (!HostInConf(conf, i->second->GetConfHost()))
 		{
-			DELETE(i->second);
+			delete i->second;
 			safei = i;
 			--i;
 			Connections.erase(safei);
@@ -526,7 +526,7 @@ void ClearAllConnections()
 	while ((i = Connections.begin()) != Connections.end())
 	{
 		Connections.erase(i);
-		DELETE(i->second);
+		delete i->second;
 	}
 }
 
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 434f30539..17dc4e12f 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -143,10 +143,10 @@ public:
 	{
 		/* If we allocated these, free them... */
 		if(fieldlist)
-			DELETE(fieldlist);
+			delete fieldlist;
 
 		if(fieldmap)
-			DELETE(fieldmap);
+			delete fieldmap;
 
 		PQclear(res);
 	}
@@ -301,12 +301,12 @@ public:
 
 	virtual void Free(SQLfieldMap* fm)
 	{
-		DELETE(fm);
+		delete fm;
 	}
 
 	virtual void Free(SQLfieldList* fl)
 	{
-		DELETE(fl);
+		delete fl;
 	}
 };
 
@@ -862,7 +862,7 @@ class ModulePgSQL : public Module
 		{
 			if (!HostInConf(iter->second->GetConfHost()))
 			{
-				DELETE(iter->second);
+				delete iter->second;
 				safei = iter;
 				--iter;
 				connections.erase(safei);
@@ -876,7 +876,7 @@ class ModulePgSQL : public Module
 		while ((i = connections.begin()) != connections.end())
 		{
 			connections.erase(i);
-			DELETE(i->second);
+			delete i->second;
 		}
 	}
 
@@ -902,7 +902,7 @@ class ModulePgSQL : public Module
 		{
 			if (conn == iter->second)
 			{
-				DELETE(iter->second);
+				delete iter->second;
 				connections.erase(iter);
 				break;
 			}
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 091340d54..9607cb4dd 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -594,7 +594,7 @@ class ModuleSQLite3 : public Module
 		{
 			if (!HostInConf(iter->second->GetConfHost()))
 			{
-				DELETE(iter->second);
+				delete iter->second;
 				safei = iter;
 				--iter;
 				connections.erase(safei);
@@ -608,7 +608,7 @@ class ModuleSQLite3 : public Module
 		while ((i = connections.begin()) != connections.end())
 		{
 			connections.erase(i);
-			DELETE(i->second);
+			delete i->second;
 		}
 	}
 
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 1c56e9660..3026d6935 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -224,7 +224,7 @@ class ModuleSSLGnuTLS : public Module
 		// This may be on a large (once a day or week) timer eventually.
 		GenerateDHParams();
 
-		DELETE(Conf);
+		delete Conf;
 	}
 
 	void GenerateDHParams()
@@ -688,8 +688,8 @@ class ModuleSSLGnuTLS : public Module
 			metadata->push_back("ON");		// The value to send
 			Event* event = new Event((char*)metadata,(Module*)this,"send_metadata");
 			event->Send(ServerInstance);		// Trigger the event. We don't care what module picks it up.
-			DELETE(event);
-			DELETE(metadata);
+			delete event;
+			delete metadata;
 
 			VerifyCertificate(&sessions[user->GetFd()],user);
 			if (sessions[user->GetFd()].sess)
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 2a81aed72..d38b85058 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -787,8 +787,8 @@ class ModuleSSLOpenSSL : public Module
 			metadata->push_back("ON");		// The value to send
 			Event* event = new Event((char*)metadata,(Module*)this,"send_metadata");
 			event->Send(ServerInstance);		// Trigger the event. We don't care what module picks it up.
-			DELETE(event);
-			DELETE(metadata);
+			delete event;
+			delete metadata;
 
 			VerifyCertificate(&sessions[user->GetFd()], user);
 			if (sessions[user->GetFd()].sess)
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 5798ecb2c..6a8a57b2b 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -67,7 +67,7 @@ class ModuleAuditorium : public Module
 	virtual ~ModuleAuditorium()
 	{
 		ServerInstance->Modes->DelMode(aum);
-		DELETE(aum);
+		delete aum;
 	}
 
 	void Prioritize()
diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index f74c75623..4a46a7264 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -154,7 +154,7 @@ class BanRedirect : public ModeWatcher
 										
 										if(redirects->empty())
 										{
-											DELETE(redirects);
+											delete redirects;
 											channel->Shrink("banredirects");
 										}
 										
@@ -244,7 +244,7 @@ class ModuleBanRedirect : public Module
 					ServerInstance->SendMode(mode_junk, stackresult.size() + 1, ServerInstance->FakeClient);
 				}
 				
-				DELETE(redirects);
+				delete redirects;
 				chan->Shrink("banredirects");
 			}
 		}
@@ -318,7 +318,7 @@ class ModuleBanRedirect : public Module
 	virtual ~ModuleBanRedirect()
 	{
 		ServerInstance->Modes->DelModeWatcher(re);
-		DELETE(re);
+		delete re;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 9a6d6e34a..1284f0f57 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -178,7 +178,7 @@ class ModuleBlockAmsg : public Module
 			user->GetExt("amsgblock", m);
 			if(m)
 			{
-				DELETE(m);
+				delete m;
 				user->Shrink("amsgblock");
 			}
 		}
diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 4b28f35d0..b59db166c 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -129,7 +129,7 @@ public:
 	virtual ~ModuleBlockCAPS()
 	{
 		ServerInstance->Modes->DelMode(bc);
-		DELETE(bc);
+		delete bc;
 	}
 
 	virtual Version GetVersion()
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index ae364725c..6e92813c3 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -105,7 +105,7 @@ class ModuleBlockColour : public Module
 	virtual ~ModuleBlockColour()
 	{
 		ServerInstance->Modes->DelMode(bc);
-		DELETE(bc);
+		delete bc;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 5b56ceabe..1e7fc4bfe 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -69,7 +69,7 @@ class ModuleBotMode : public Module
 	virtual ~ModuleBotMode()
 	{
 		ServerInstance->Modes->DelMode(bm);
-		DELETE(bm);
+		delete bm;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index c5786b6f7..bef20a365 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -146,7 +146,7 @@ class ModuleChanFilter : public Module
 	virtual ~ModuleChanFilter()
 	{
 		ServerInstance->Modes->DelMode(cf);
-		DELETE(cf);
+		delete cf;
 	}
 };
 
diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 67ccfccd6..b90765ec1 100644
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -358,8 +358,8 @@ class ModuleChanProtect : public Module
 		{
 			ServerInstance->Modes->DelMode(cp);
 			ServerInstance->Modes->DelMode(cf);
-			DELETE(cp);
-			DELETE(cf);
+			delete cp;
+			delete cf;
 			cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
 			cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
 			/* These wont fail, we already owned the mode characters before */
@@ -481,8 +481,8 @@ class ModuleChanProtect : public Module
 	{
 		ServerInstance->Modes->DelMode(cp);
 		ServerInstance->Modes->DelMode(cf);
-		DELETE(cp);
-		DELETE(cf);
+		delete cp;
+		delete cf;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 976ad7d4f..d8dae202b 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -341,7 +341,7 @@ class ModuleCloaking : public Module
 	virtual ~ModuleCloaking()
 	{
 		ServerInstance->Modes->DelMode(cu);
-		DELETE(cu);
+		delete cu;
 		ServerInstance->Modules->DoneWithInterface("HashRequest");
 	}
 	
diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index 631fd2b2b..95642729d 100644
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -66,7 +66,7 @@ class ModulePrivacyMode : public Module
 	virtual ~ModulePrivacyMode()
 	{
 		ServerInstance->Modes->DelMode(pm);
-		DELETE(pm);
+		delete pm;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index f9c942375..c8c361a30 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -67,7 +67,7 @@ class ModuleConnJoin : public Module
 			Joinchans.clear();
 			if (!JoinChan.empty())
 				tokenize(JoinChan,Joinchans);
-			DELETE(conf);
+			delete conf;
 		}
 
 		virtual ~ModuleConnJoin()
diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 2a15df0ea..2970b7241 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -39,13 +39,13 @@ class ModuleModesOnConnect : public Module
 
 	virtual void OnRehash(User* user, const std::string &parameter)
 	{
-		DELETE(Conf);
+		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
 	
 	virtual ~ModuleModesOnConnect()
 	{
-		DELETE(Conf);
+		delete Conf;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 55cbd2830..8e4378ef3 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -79,7 +79,7 @@ class ModuleDeaf : public Module
 		deaf_bypasschars = conf->ReadValue("deaf", "bypasschars", 0);
 		deaf_bypasschars_uline = conf->ReadValue("deaf", "bypasscharsuline", 0);
 
-		DELETE(conf);
+		delete conf;
 	}
 
 	virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
@@ -180,7 +180,7 @@ class ModuleDeaf : public Module
 	virtual ~ModuleDeaf()
 	{
 		ServerInstance->Modes->DelMode(m1);
-		DELETE(m1);
+		delete m1;
 	}
 
 	virtual Version GetVersion()
diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 18ae5c289..f90893871 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -74,7 +74,7 @@ class ModuleDelayJoin : public Module
 	virtual ~ModuleDelayJoin()
 	{
 		ServerInstance->Modes->DelMode(djm);
-		DELETE(djm);
+		delete djm;
 	}
 
 	void Prioritize()
diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index e0b3829bd..1c57cfdd1 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -34,13 +34,13 @@ class ModuleDenyChannels : public Module
 	
 	virtual void OnRehash(User* user, const std::string &param)
 	{
-		DELETE(Conf);
+		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
 
 	virtual ~ModuleDenyChannels()
 	{
-		DELETE(Conf);
+		delete Conf;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index abf4e0ddd..58edcbff0 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -112,7 +112,7 @@ class ModuleFilter : public FilterBase
 			FilterResult* x = new FilterResult(pattern, reason, do_action, gline_time, flags);
 			filters[pattern] = x;
 		}
-		DELETE(MyConf);
+		delete MyConf;
 	}
 
 	virtual int OnStats(char symbol, User* user, string_list &results)
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 633dc5399..b7a9ec3ce 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -176,7 +176,7 @@ class ModuleHelpop : public Module
 		virtual ~ModuleHelpop()
 		{
 			ServerInstance->Modes->DelMode(ho);
-			DELETE(ho);
+			delete ho;
 		}
 	
 		virtual Version GetVersion()
diff --git a/src/modules/m_hidechans.cpp b/src/modules/m_hidechans.cpp
index cb910aa4b..64dfff438 100644
--- a/src/modules/m_hidechans.cpp
+++ b/src/modules/m_hidechans.cpp
@@ -73,7 +73,7 @@ class ModuleHideChans : public Module
 	virtual ~ModuleHideChans()
 	{
 		ServerInstance->Modes->DelMode(hm);
-		DELETE(hm);
+		delete hm;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp
index 33732481a..db097d14c 100644
--- a/src/modules/m_hideoper.cpp
+++ b/src/modules/m_hideoper.cpp
@@ -72,7 +72,7 @@ class ModuleHideOper : public Module
 	virtual ~ModuleHideOper()
 	{
 		ServerInstance->Modes->DelMode(hm);
-		DELETE(hm);
+		delete hm;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index cd89d7cfd..dc9da3799 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -49,7 +49,7 @@ class ModuleHostChange : public Module
 	{
 		for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
 		{
-			DELETE(i->second);
+			delete i->second;
 		}
 		hostchanges.clear();
 	}
@@ -73,7 +73,7 @@ class ModuleHostChange : public Module
 		MySeparator = Conf.ReadValue("host","separator",".",0);
 		for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
 		{
-			DELETE(i->second);
+			delete i->second;
 		}
 		hostchanges.clear();
 		for (int index = 0; index < Conf.Enumerate("hostchange"); index++)
diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp
index 55a973f2e..2986f43c6 100644
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -175,9 +175,9 @@ class ModuleInvisible : public Module
 	{
 		ServerInstance->Modes->DelMode(qm);
 		ServerInstance->Modes->DelModeWatcher(ido);
-		DELETE(qm);
-		DELETE(ido);
-		DELETE(conf);
+		delete qm;
+		delete ido;
+		delete conf;
 	}
 
 	virtual Version GetVersion()
@@ -203,7 +203,7 @@ class ModuleInvisible : public Module
 
 	virtual void OnRehash(User* user, const std::string &parameter)
 	{
-		DELETE(conf);
+		delete conf;
 		conf = new ConfigReader(ServerInstance);
 	}
 
diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index f89b4f1a3..a38f7ed8a 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -140,7 +140,7 @@ public:
 	~ModuleInviteException()
 	{
 		ServerInstance->Modes->DelMode(ie);
-		DELETE(ie);
+		delete ie;
 		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
 };
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 6b0b97bd5..798193659 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -194,7 +194,7 @@ class JoinFlood : public ModeHandler
 			{
 				joinfloodsettings *f;
 				channel->GetExt("joinflood", f);
-				DELETE(f);
+				delete f;
 				channel->Shrink("joinflood");
 				channel->SetMode('j', false);
 				return MODEACTION_ALLOW;
@@ -259,7 +259,7 @@ class ModuleJoinFlood : public Module
 		joinfloodsettings *f;
 		if (chan->GetExt("joinflood",f))
 		{
-			DELETE(f);
+			delete f;
 			chan->Shrink("joinflood");
 		}
 	}
@@ -272,7 +272,7 @@ class ModuleJoinFlood : public Module
 	virtual ~ModuleJoinFlood()
 	{
 		ServerInstance->Modes->DelMode(jf);
-		DELETE(jf);
+		delete jf;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 6378ea773..2cb8668d2 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -55,7 +55,7 @@ class KickRejoin : public ModeHandler
 			
 			if (channel->GetExt("norejoinusers", dl))
 			{
-				DELETE(dl);
+				delete dl;
 				channel->Shrink("norejoinusers");
 			}
 			
@@ -162,7 +162,7 @@ public:
 				if (!dl->size())
 				{
 					// Now it's empty..
-					DELETE(dl);
+					delete dl;
 					chan->Shrink("norejoinusers");
 				}
 			}
@@ -190,7 +190,7 @@ public:
 			
 		if (chan->GetExt("norejoinusers", dl))
 		{
-			DELETE(dl);
+			delete dl;
 			chan->Shrink("norejoinusers");
 		}
 	}
@@ -209,7 +209,7 @@ public:
 	virtual ~ModuleKickNoRejoin()
 	{
 		ServerInstance->Modes->DelMode(kr);
-		DELETE(kr);
+		delete kr;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 0e5ce84f9..a2029427d 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -186,7 +186,7 @@ class MsgFlood : public ModeHandler
 		{
 			if (channel->GetExt("flood", f))
 			{
-				DELETE(f);
+				delete f;
 				channel->Shrink("flood");
 				channel->SetMode('f', false);
 				return MODEACTION_ALLOW;
@@ -284,7 +284,7 @@ class ModuleMsgFlood : public Module
 		floodsettings* f;
 		if (chan->GetExt("flood", f))
 		{
-			DELETE(f);
+			delete f;
 			chan->Shrink("flood");
 		}
 	}
@@ -297,7 +297,7 @@ class ModuleMsgFlood : public Module
 	virtual ~ModuleMsgFlood()
 	{
 		ServerInstance->Modes->DelMode(mf);
-		DELETE(mf);
+		delete mf;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index 7e5e6b2c5..bf255e281 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -194,7 +194,7 @@ class NickFlood : public ModeHandler
 			{
 				nickfloodsettings *f;
 				channel->GetExt("nickflood", f);
-				DELETE(f);
+				delete f;
 				channel->Shrink("nickflood");
 				channel->SetMode('F', false);
 				return MODEACTION_ALLOW;
@@ -261,7 +261,7 @@ class ModuleNickFlood : public Module
 		nickfloodsettings *f;
 		if (chan->GetExt("nickflood",f))
 		{
-			DELETE(f);
+			delete f;
 			chan->Shrink("nickflood");
 		}
 	}
@@ -274,7 +274,7 @@ class ModuleNickFlood : public Module
 	virtual ~ModuleNickFlood()
 	{
 		ServerInstance->Modes->DelMode(jf);
-		DELETE(jf);
+		delete jf;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index 1d970f110..1955057dd 100644
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -75,7 +75,7 @@ class ModuleNoInvite : public Module
 	virtual ~ModuleNoInvite()
 	{
 		ServerInstance->Modes->DelMode(ni);
-		DELETE(ni);
+		delete ni;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 48ed9041f..e3da7f713 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -91,7 +91,7 @@ class ModuleNoKicks : public Module
 	virtual ~ModuleNoKicks()
 	{
 		ServerInstance->Modes->DelMode(nk);
-		DELETE(nk);
+		delete nk;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 05b07c44f..ac6cf2697 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -60,7 +60,7 @@ class ModuleNoNickChange : public Module
 	virtual ~ModuleNoNickChange()
 	{
 		ServerInstance->Modes->DelMode(nn);
-		DELETE(nn);
+		delete nn;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 76ead18c3..e96fbc79a 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -84,7 +84,7 @@ class ModuleOperChans : public Module
 	virtual ~ModuleOperChans()
 	{
 		ServerInstance->Modes->DelMode(oc);
-		DELETE(oc);
+		delete oc;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 8cebe2a7c..29eafe3a1 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -39,7 +39,7 @@ class ModuleOperLevels : public Module
 
 		virtual ~ModuleOperLevels()
 		{
-			DELETE(conf);
+			delete conf;
 		}
 
 		void Implements(char* List)
@@ -49,7 +49,7 @@ class ModuleOperLevels : public Module
 
 		virtual void OnRehash(User* user, const std::string &parameter)
 		{
-			DELETE(conf);
+			delete conf;
 			conf = new ConfigReader(ServerInstance);
 		}
 
diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 5841f36fd..4acacf669 100644
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -39,13 +39,13 @@ class ModuleModesOnOper : public Module
 
 	virtual void OnRehash(User* user, const std::string &parameter)
 	{
-		DELETE(Conf);
+		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
 	
 	virtual ~ModuleModesOnOper()
 	{
-		DELETE(Conf);
+		delete Conf;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 86d928cb7..ec22d1de6 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -72,7 +72,7 @@ class ModuleOpermotd : public Module
 			opermotd = NULL;
 		}
 		opermotd = new FileReader(ServerInstance, filename);
-		DELETE(conf);
+		delete conf;
 	}
 	
 	ModuleOpermotd(InspIRCd* Me)
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 224a18ae4..ac871229f 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -55,7 +55,7 @@ class ModuleOverride : public Module
 			overrides[typen] = tokenlist;
 		}
 		
-		DELETE(Conf);
+		delete Conf;
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 7dabb45e9..71380685a 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -118,8 +118,8 @@ class ModuleRandQuote : public Module
 	
 	virtual ~ModuleRandQuote()
 	{
-		DELETE(conf);
-		DELETE(quotes);
+		delete conf;
+		delete quotes;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 9d259604d..025cf8b66 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -147,7 +147,7 @@ class ModuleRedirect : public Module
 	virtual ~ModuleRedirect()
 	{
 		ServerInstance->Modes->DelMode(re);
-		DELETE(re);
+		delete re;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 015025c03..3344fb26e 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -32,7 +32,7 @@ class ModuleRestrictChans : public Module
 			irc::string channel = txt.c_str();
 			allowchans[channel] = 1;
 		}
-		DELETE(MyConf);
+		delete MyConf;
 	}
 
  public:
diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index a33b05c38..deeddcf5d 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -60,7 +60,7 @@ class ModuleServProtectMode : public Module
 	virtual ~ModuleServProtectMode()
 	{
 		ServerInstance->Modes->DelMode(bm);
-		DELETE(bm);
+		delete bm;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 322fc4a62..6729c3323 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -69,7 +69,7 @@ class ModuleShowwhois : public Module
 	~ModuleShowwhois()
 	{
 		ServerInstance->Modes->DelMode(sw);
-		DELETE(sw);
+		delete sw;
 	}
 
 	void Implements(char* List)
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 703a17b43..651d705a1 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -83,7 +83,7 @@ class CommandSilence : public Command
 						{
 							// tidy up -- if a user's list is empty, theres no use having it
 							// hanging around in the user record.
-							DELETE(sl);
+							delete sl;
 							user->Shrink("silence_list");
 						}
 					}
@@ -160,7 +160,7 @@ class ModuleSilence : public Module
 		user->GetExt("silence_list", sl);
 		if (sl)
 		{
-			DELETE(sl);
+			delete sl;
 			user->Shrink("silence_list");
 		}
 	}
diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp
index c2a32c706..011bd84a6 100644
--- a/src/modules/m_silence_ext.cpp
+++ b/src/modules/m_silence_ext.cpp
@@ -121,7 +121,7 @@ class CommandSilence : public Command
 							user->WriteServ("950 %s %s :Removed %s %s from silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str());
 							if (!sl->size())
 							{
-								DELETE(sl);
+								delete sl;
 								user->Shrink("silence_list");
 							}
 							return CMD_SUCCESS;
@@ -265,7 +265,7 @@ class ModuleSilence : public Module
 		user->GetExt("silence_list", sl);
 		if (sl)
 		{
-			DELETE(sl);
+			delete sl;
 			user->Shrink("silence_list");
 		}
 	}
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 635d2cc18..3e13526aa 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -330,7 +330,7 @@ bool TreeServer::Tidy()
 			TreeServer* s = (TreeServer*)*a;
 			s->Tidy();
 			Children.erase(a);
-			DELETE(s);
+			delete s;
 			stillchildren = true;
 			break;
 		}
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 488607c96..5fbb8ee2b 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -597,7 +597,7 @@ void TreeSocket::Squit(TreeServer* Current, const std::string &reason)
 		SquitServer(from, Current);
 		Current->Tidy();
 		Current->GetParent()->DelChild(Current);
-		DELETE(Current);
+		delete Current;
 		this->Instance->SNO->WriteToSnoMask('l',"Netsplit complete, lost \002%d\002 users on \002%d\002 servers.", num_lost_users, num_lost_servers);
 	}
 	else
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index adeacb5bd..afd029c16 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -633,7 +633,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
 			throw CoreException("Invalid configuration for server '"+assign(L.Name)+"', link tag has the same server name as the local server!");
 		}
 	}
-	DELETE(Conf);
+	delete Conf;
 }
 
 void SpanningTreeUtilities::DoFailOver(Link* x)
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 2d770aafc..9120b2736 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -109,7 +109,7 @@ class ModuleSSLModes : public Module
 	virtual ~ModuleSSLModes()
 	{
 		ServerInstance->Modes->DelMode(sslm);
-		DELETE(sslm);
+		delete sslm;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 7bbeaa8b6..8cb939534 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -107,8 +107,8 @@ class ModuleStripColor : public Module
 	{
 		ServerInstance->Modes->DelMode(usc);
 		ServerInstance->Modes->DelMode(csc);
-		DELETE(usc);
-		DELETE(csc);
+		delete usc;
+		delete csc;
 	}
 	
 	virtual void ReplaceLine(std::string &sentence)
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index ff7c9d783..5125fbf54 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -65,7 +65,7 @@ class CommandSwhois : public Command
 				ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
 			
 			dest->Shrink("swhois");
-			DELETE(text);
+			delete text;
 		}
 		else if (!ServerInstance->ULine(user->server))
 		{
@@ -114,7 +114,7 @@ class ModuleSWhois : public Module
 
 	void OnRehash(User* user, const std::string &parameter)
 	{
-		DELETE(Conf);
+		delete Conf;
 		Conf = new ConfigReader(ServerInstance);
 	}
 
@@ -171,7 +171,7 @@ class ModuleSWhois : public Module
 		if (swhois)
 		{
 			user->Shrink("swhois");
-			DELETE(swhois);
+			delete swhois;
 		}
 	}
 
@@ -186,7 +186,7 @@ class ModuleSWhois : public Module
 			if (swhois)
 			{
 				user->Shrink("swhois");
-				DELETE(swhois);
+				delete swhois;
 			}
 		}
 	}
@@ -250,7 +250,7 @@ class ModuleSWhois : public Module
 		if (user->GetExt("swhois", old))
 		{
 			user->Shrink("swhois");
-			DELETE(old);
+			delete old;
 		}
 		
 		if (!swhois.length())
@@ -269,7 +269,7 @@ class ModuleSWhois : public Module
 
 	virtual ~ModuleSWhois()
 	{
-		DELETE(Conf);
+		delete Conf;
 	}
 	
 	virtual Version GetVersion()
diff --git a/src/modules/m_xmlsocket.cpp b/src/modules/m_xmlsocket.cpp
index 1fc9d337f..e51e2fd4d 100644
--- a/src/modules/m_xmlsocket.cpp
+++ b/src/modules/m_xmlsocket.cpp
@@ -76,7 +76,7 @@ class ModuleXMLSocket : public Module
 			}
 		}
 
-		DELETE(Conf);
+		delete Conf;
 	}
 
 	virtual ~ModuleXMLSocket()
diff --git a/src/timer.cpp b/src/timer.cpp
index f9abf8114..9bc37012d 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -43,12 +43,12 @@ void TimerManager::TickTimers(time_t TIME)
 			}
 			else
 			{
-				DELETE(n);
+				delete n;
 			}
 		}
 
 		Timers.erase(found);
-		DELETE(x);
+		delete x;
 	}
 
 	this->CantDeleteHere = false;
@@ -84,12 +84,12 @@ void TimerManager::DelTimer(Timer* T)
 			Timer* n = *y;
 			if (n == T)
 			{
-				DELETE(n);
+				delete n;
 				x->erase(y);
 				if (!x->size())
 				{
 					Timers.erase(found);
-					DELETE(x);
+					delete x;
 				}
 				return;
 			}
diff --git a/src/users.cpp b/src/users.cpp
index e66ac7fd9..e21b0d222 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -1841,7 +1841,7 @@ void User::PurgeEmptyChannels()
 		if (i2 != ServerInstance->chanlist->end())
 		{
 			FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
-			DELETE(i2->second);
+			delete i2->second;
 			ServerInstance->chanlist->erase(i2);
 			this->chans.erase(*n);
 		}