diff --git a/Modules.cpp b/Modules.cpp
index 7b1729d2..7994e42b 100644
--- a/Modules.cpp
+++ b/Modules.cpp
@@ -725,7 +725,6 @@ bool CModules::LoadModule(const CString& sModule, const CString& sArgs, CUser* p
 	pModule->SetDescription(sDesc);
 	pModule->SetGlobal(bIsGlobal);
 	pModule->SetArgs(sArgs);
-	DEBUG("********************************* [" + CZNC::Get().GetCurPath() + "] [" + sModPath + "] [" + CDir::ChangeDir(CZNC::Get().GetCurPath(), sModPath) + "]");
 	pModule->SetModPath(CDir::ChangeDir(CZNC::Get().GetCurPath(), sModPath));
 	push_back(pModule);
 
diff --git a/Template.cpp b/Template.cpp
index 8ed8b52e..80a0c855 100644
--- a/Template.cpp
+++ b/Template.cpp
@@ -115,13 +115,11 @@ CString CTemplate::ExpandFile(const CString& sFilename, bool bFromInc) {
 
 		if (CFile::Exists(sFilePath)) {
 			if (sRoot.empty() || sFilePath.Left(sRoot.length()) == sRoot) {
-				DEBUG("\t\tFound  [" + sFilePath + "]\n");
+				DEBUG("    Found  [" + sFilePath + "]");
 				return sFilePath;
 			} else {
 				DEBUG("\t\tOutside of root [" + sFilePath + "] !~ [" + sRoot + "]");
 			}
-		} else {
-			DEBUG("\t\tNo such file [" + sFilePath + "]");
 		}
 	}
 
@@ -253,7 +251,6 @@ bool CTemplate::PrintString(CString& sRet) {
 }
 
 bool CTemplate::Print(ostream& oOut) {
-	DEBUG("==     Print(o) m_sFileName = [" + m_sFileName + "]");
 	return Print(m_sFileName, oOut);
 }
 
diff --git a/WebModules.cpp b/WebModules.cpp
index 206e71a7..2a96f258 100644
--- a/WebModules.cpp
+++ b/WebModules.cpp
@@ -196,7 +196,7 @@ CModule* CWebSock::ResolveModule() {
 		if (pUser) {
 			pModRet = pUser->GetModules().FindModule(m_sModName);
 		} else {
-			DEBUG("User not found while trying to handle web requrest for [" + m_sPage + "]");
+			DEBUG("User not found while trying to handle web request for [" + m_sPage + "]");
 		}
 	} else {
 		// This could be user level or global level, check both
@@ -265,8 +265,6 @@ void CWebSock::SetPaths(CModule* pModule, bool bIsTemplate) {
 	CString sHomeSkinsDir(CZNC::Get().GetZNCPath() + "/webskins/");
 	CString sSkinName(GetSkinName());
 
-	DEBUG("---- sHomeSkinsDir=[" + sHomeSkinsDir + "] sSkinName=[" + sSkinName + "]");
-
 	// Module specific paths
 
 	if (pModule) {
@@ -346,8 +344,6 @@ void CWebSock::SetVars() {
 bool CWebSock::AddModLoop(const CString& sLoopName, CModule& Module) {
 	CString sTitle(Module.GetWebMenuTitle());
 
-	DEBUG("===   ===   ===   ===   === [" + Module.GetModName() + "] [" + CString(IsLoggedIn()) + "]");
-
 	if (!sTitle.empty() && (IsLoggedIn() || (!Module.WebRequiresLogin() && !Module.WebRequiresAdmin())) && (m_spSession->IsAdmin() || !Module.WebRequiresAdmin())) {
 		CTemplate& Row = m_Template.AddRow(sLoopName);
 
@@ -520,7 +516,6 @@ void CWebSock::OnPageRequest(const CString& sURI) {
 }
 
 CWebSock::EPageReqResult CWebSock::OnPageRequestInternal(const CString& sURI, CString& sPageRet) {
-	DEBUG("CWebSock::OnPageRequest(" + sURI + ")");
 	m_spSession = GetSession();
 	SetCookie("SessionId", m_spSession->GetId());