7 files changed, 7 insertions, 30 deletions
diff --git a/include/logger.h b/include/logger.h
index e3b7ee0a5..f0cbe14d3 100644
--- a/include/logger.h
+++ b/include/logger.h
@@ -26,7 +26,7 @@
  * I/O (linux seems to, as does freebsd) this will default to
  * blocking behaviour.
  */
-class CoreExport FileWriter : public EventHandler
+class CoreExport FileWriter
 {
  protected:
 	/** The log file (fd is inside this somewhere,
@@ -43,14 +43,6 @@ class CoreExport FileWriter : public EventHandler
 	 */
 	FileWriter(FILE* logfile);
 
-	/** Handle pending write events.
-	 * This will flush any waiting data to disk.
-	 * If any data remains after the fprintf call,
-	 * another write event is scheduled to write
-	 * the rest of the data when possible.
-	 */
-	virtual void HandleEvent(EventType et, int errornum = 0);
-
 	/** Write one or more preformatted log lines.
 	 * If the data cannot be written immediately,
 	 * this class will insert itself into the
@@ -62,10 +54,6 @@ class CoreExport FileWriter : public EventHandler
 
 	/** Close the log file and cancel any events.
 	 */
-	virtual void Close();
-
-	/** Close the log file and cancel any events.
-	 */
 	virtual ~FileWriter();
 };
 
diff --git a/include/mode.h b/include/mode.h
index 76eeaba17..2fca1204d 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -425,7 +425,7 @@ typedef std::vector<ModeWatcher*>::iterator ModeWatchIter;
  * parses client to server MODE strings for user and channel modes, and performs
  * processing for the 004 mode list numeric, amongst other things.
  */
-class CoreExport ModeParser : public classbase
+class CoreExport ModeParser
 {
  private:
 	/** Mode handlers for each mode, to access a handler subtract
diff --git a/src/logger.cpp b/src/logger.cpp
index 19e07e78f..f1bbaa7ea 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -352,10 +352,6 @@ FileWriter::FileWriter(FILE* logfile)
 {
 }
 
-void FileWriter::HandleEvent(EventType ev, int)
-{
-}
-
 void FileWriter::WriteLogLine(const std::string &line)
 {
 	if (log == NULL)
@@ -370,7 +366,7 @@ void FileWriter::WriteLogLine(const std::string &line)
 	}
 }
 
-void FileWriter::Close()
+FileWriter::~FileWriter()
 {
 	if (log)
 	{
@@ -379,8 +375,3 @@ void FileWriter::Close()
 		log = NULL;
 	}
 }
-
-FileWriter::~FileWriter()
-{
-	this->Close();
-}
diff --git a/src/modules/extra/m_ziplink.cpp b/src/modules/extra/m_ziplink.cpp
index 4b53cf389..2aeb4b9e6 100644
--- a/src/modules/extra/m_ziplink.cpp
+++ b/src/modules/extra/m_ziplink.cpp
@@ -29,7 +29,7 @@ enum izip_status { IZIP_CLOSED = 0, IZIP_OPEN };
 
 /** Represents an zipped connections extra data
  */
-class izip_session : public classbase
+class izip_session
 {
  public:
 	z_stream c_stream;	/* compression stream */
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index d2f3f2cdb..8891e306d 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -25,7 +25,7 @@ enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOP
 
 /** Holds a blocked message's details
  */
-class BlockedMessage : public classbase
+class BlockedMessage
 {
 public:
 	std::string message;
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index 32f0d257a..75260d325 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -17,7 +17,7 @@
 
 /** Holds information on a host set by m_hostchange
  */
-class Host : public classbase
+class Host
 {
  public:
 	std::string action;
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 9bc0f362f..b2f82777f 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -17,10 +17,8 @@
 
 /** Holds flood settings and state for mode +f
  */
-class floodsettings : public classbase
+class floodsettings
 {
- private:
-	InspIRCd *ServerInstance;
  public:
 	bool ban;
 	int secs;