diff --git a/e107_handlers/emote.php b/e107_handlers/emote.php
deleted file mode 100644
index bfd38e792..000000000
--- a/e107_handlers/emote.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * e107 website system
- *
- * Copyright (C) 2008-2013 e107 Inc (e107.org)
- * Released under the terms and conditions of the
- * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
- *
- * @DEPRECATED FILE
- */
-
-if (!defined('e107_INIT')) { exit; }
-/*
-function r_emote()
-{
-	global $sysprefs, $pref, $tp;
-
-	if (!is_object($tp->e_emote))
-	{
-		require_once(e_HANDLER.'emote_filter.php');
-		$tp->e_emote = new e_emoteFilter;
-	}
-	
-	$str = '';
-	foreach($tp->e_emote->emotes as $key => $value)		// filename => text code
-	{
-		$key = str_replace("!", ".", $key);					// Usually '.' was replaced by '!' when saving
-		$key = preg_replace("#_(\w{3})$#", ".\\1", $key);	// '_' followed by exactly 3 chars is file extension
-		$key = e_IMAGE."emotes/" . $pref['emotepack'] . "/" .$key;		// Add in the file path
-
-		$value2 = substr($value, 0, strpos($value, " "));
-		$value = ($value2 ? $value2 : $value);
-		$value = ($value == '&|') ? ':((' : $value;
-		$value = " ".$value." ";
-		//TODO CSS class
-		$str .= "\n<a href=\"javascript:addtext('$value',true)\"><img src='$key' alt='' /></a> ";
-	}
-
-	return "<div class='spacer'>".$str."</div>";
-}
-*/
-?>
\ No newline at end of file
diff --git a/e107_handlers/emote_filter.php b/e107_handlers/emote_filter.php
deleted file mode 100644
index 2aeebbd89..000000000
--- a/e107_handlers/emote_filter.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/**
- * e107 website system
- *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
- * Released under the terms and conditions of the
- * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
- *
- * @DEPRECATED FILE
- */
-
-if (!defined('e107_INIT')) { exit; }
-/*
-
-class e_emotefilter {
-	var $search;
-	var $replace;
-	var $emotes;
-	 
-	function e_emotefilter() 
-	{		
-		$pref = e107::getPref();
-		
-		if(!$pref['emotepack'])	
-		{	
-			$pref['emotepack'] = "default";
-			save_prefs();
-		}
-			
-		$this->emotes = e107::getConfig("emote")->getPref();
-		
-		if(!vartrue($this->emotes))
-		{
-			return;
-		}
-
-		foreach($this->emotes as $key => $value)
-		{
-		  $value = trim($value);
-
-		  if ($value)
-		  {	// Only 'activate' emote if there's a substitution string set
-			$key = preg_replace("#!(\w{3,}?)$#si", ".\\1", $key);
-			// Next two probably to sort out legacy issues - may not be required any more
-			$key = preg_replace("#_(\w{3})$#", ".\\1", $key);
-			$key = str_replace("!", "_", $key);
-
-			  $filename = e_IMAGE."emotes/" . $pref['emotepack'] . "/" . $key;
-			  
-			  $fileloc = SITEURLBASE.e_IMAGE_ABS."emotes/" . $pref['emotepack'] . "/" . $key;
-
-			  if(file_exists($filename))
-			  {
-				if(strstr($value, " "))
-				{
-					$tmp = explode(" ", $value);
-					foreach($tmp as $code)
-					{
-						$this->search[] = " ".$code;
-						$this->search[] = "\n".$code;
-						//TODO CSS class?
-						$this->replace[] = " <img src='".$fileloc."' alt='' style='vertical-align:middle; border:0' /> ";
-						$this->replace[] = "\n <img src='".$fileloc."' alt='' style='vertical-align:middle; border:0' /> ";
-					}
-					unset($tmp);
-				}
-				else
-				{
-					if($value)
-					{
-						$this->search[] = " ".$value;
-						$this->search[] = "\n".$value;
-						//TODO CSS class?
-						$this->replace[] = " <img src='".$filename."' alt='' style='vertical-align:middle; border:0' /> ";
-						$this->replace[] = "\n <img src='".$filename."' alt='' style='vertical-align:middle; border:0' /> ";
-					}
-				}
-			  }
-		  }
-		  else
-		  {
-			unset($this->emotes[$key]);
-		  }
-		}
-	}
-	 
-	function filterEmotes($text)
-	{	 
-		$text = str_replace($this->search, $this->replace, $text);
-		return $text;
-	}
-	 
-	function filterEmotesRev($text)
-	{
-		$text = str_replace($this->replace, $this->search, $text);
-		return $text;
-	}
-}
-
-*/
-
-	
-	
-	
-	
-	
-?>
\ No newline at end of file
diff --git a/e107_handlers/profanity_filter.php b/e107_handlers/profanity_filter.php
deleted file mode 100644
index 7be9b548f..000000000
--- a/e107_handlers/profanity_filter.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * e107 website system
- *
- * Copyright (C) 2008-2011 e107 Inc (e107.org)
- * Released under the terms and conditions of the
- * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
- *
- * @DEPRECATED FILE
- */
-
-if (!defined('e107_INIT')) { exit; }
-
-/*
-class e_profanityFilter 
-{
-	var $profanityList;
-
-	function e_profanityFilter() 
-	{
-		global $pref;
-
-		$words = explode(",", $pref['profanity_words']);
-        $word_array = array();
-		foreach($words as $word) 
-		{
-			$word = trim($word);
-			if($word != "")
-			{
-				$word_array[] = $word;
-				if (strpos($word, '&#036;') !== FALSE)
-				{
-					$word_array[] = str_replace('&#036;', '\$', $word);		// Special case - '$' may be 'in clear' or as entity
-				}
-			}
-		}
-		if(count($word_array))
-		{
-			$this->profanityList = str_replace('#','\#',implode("\b|\b", $word_array));		// We can get entities in the string - confuse the regex delimiters
-		}
-		unset($words);
-		return TRUE;
-	}
-
-	function filterProfanities($text) 
-	{
-		global $pref;
-		if (!$this->profanityList) 
-		{
-			return $text;
-		}
-		if ($pref['profanity_replace']) 
-		{
-			return preg_replace("#\b".$this->profanityList."\b#is", $pref['profanity_replace'], $text);
-		} 
-		else 
-		{
-			return preg_replace_callback("#\b".$this->profanityList."\b#is", array($this, 'replaceProfanities'), $text);
-		}
-	}
- * 
- * 
-	// @function replaceProfanities callback
-		@abstract replaces vowels in profanity words with stars
-		@param text string - text string to be filtered
-		@result filtered text
-	
-	function replaceProfanities($matches) 
-	{
-
-
-		return preg_replace("#a|e|i|o|u#i", "*" , $matches[0]);
-	}
-}
-*/
-
-
-