diff --git a/contact.php b/contact.php
index cf715fcda..6d9e6a8d5 100644
--- a/contact.php
+++ b/contact.php
@@ -144,7 +144,6 @@ if(isset($_POST['send-contactus']))
     }
 	else
 	{
-		require_once(e_HANDLER."message_handler.php"); //FIXME needs removing
 		message_handler("P_ALERT", $error);
 	}
 
diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index c52e3ccc7..7f0ed1656 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -2,14 +2,10 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2012 e107 Inc (e107.org)
+ * 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)
  *
- *
- *
- * $URL$
- * $Id$
  */
 
 if(isset($_GET['configure']))
@@ -89,15 +85,12 @@ if(strpos(e_QUERY, 'configure') !== FALSE )
 $e_sub_cat = 'menus';
 
 require_once(e_HANDLER."file_class.php");
-require_once(e_HANDLER."form_handler.php");
-require_once (e_HANDLER.'message_handler.php');
 require_once(e_HANDLER."menumanager_class.php");
 
-
-	$rs = new form;
-	$frm = new e_form();
-	$men = new e_menuManager(0);   // use 1 for dragdrop.
-
+$rs = new form;
+$frm = e107::getForm();
+$men = new e_menuManager(0);   // use 1 for dragdrop.
+$mes = e107::getMessage();
 
 if(e_AJAX_REQUEST)
 {
@@ -119,13 +112,12 @@ if($_POST)
 }
 
 
-
+		//FIXME still used in e_HANDLER.menumanager_class.php
 		if (vartrue($message) != "")
 		{
 			echo $ns -> tablerender('Updated', "<div style='text-align:center'><b>".$message."</b></div><br /><br />");
 		}
 
-
 		//BC - configure and dot delimiter deprecated
 		if (!isset($_GET['configure']))
 		{
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 8e6b071bc..c61640940 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -2,13 +2,10 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2012 e107 Inc (e107.org)
+ * 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)
  *
- * $URL$
- * $Id$
- * 
  * Plugin administration area
  *
  */
@@ -97,11 +94,9 @@ define('PLUGIN_SHOW_REFRESH', FALSE);
 
 global $user_pref;
 
-
 require_once(e_HANDLER.'plugin_class.php');
 require_once(e_HANDLER.'file_class.php');
-require_once(e_HANDLER."form_handler.php");
-require_once (e_HANDLER.'message_handler.php');
+
 
 if(isset($_POST['uninstall_cancel']))
 {
@@ -115,9 +110,8 @@ $pman = new pluginManager;
 define("e_PAGETITLE",ADLAN_98." - ".$pman->pagetitle);
 require_once("auth.php");
 $pman->pluginObserver();
-
-
-
+$mes = e107::getMessage();
+$frm = e107::getForm();
 
 require_once("footer.php");
 exit;
diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php
index 6affc6db3..485b35686 100644
--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -2,23 +2,18 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2012 e107 Inc (e107.org)
+ * 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)
  *
- *
- *
- * $URL$
- * $Id$
  */
 
 if (!defined('e107_INIT')) { exit; }
 
-
+require_once(e_HANDLER."form_handler.php");
 
 class e_menuManager {
 
-
         var $menu_areas = array();
         var $curLayout;
         var $menuId;
@@ -32,8 +27,8 @@ class e_menuManager {
 
 		function __construct($dragdrop=FALSE)
 		{
-        		global $pref, $HEADER,$FOOTER, $NEWSHEADER;
-
+        		global $HEADER,$FOOTER, $NEWSHEADER;
+        		$pref = e107::getPref();
 
                 $this->debug = FALSE;
 
@@ -138,8 +133,10 @@ class e_menuManager {
 // -------------------------------------------------------------------------
 
 	function menuRenderIframe($url='')
-	{
-        global $ns,$sql;
+	{ 
+		$ns = e107::getRender();
+		$sql = e107::getDb();
+
         if(!$url)
 		{
         	$url = e_SELF."?configure=".$this->curLayout;
@@ -156,8 +153,7 @@ class e_menuManager {
 	function menuRenderMessage()
 	{
 	  //	return $this->menuMessage;
-	  	$emessage = eMessage::getInstance();
-		$text = $emessage->render('menuUi');
+		$text = e107::getMessage()->render('menuUi');
 	  //	$text .= "ID = ".$this->menuId;
 		return $text;
 		
@@ -166,8 +162,7 @@ class e_menuManager {
 
 	function menuAddMessage($message, $type = E_MESSAGE_INFO, $session = false)
 	{
-		$emessage = eMessage::getInstance();
- 		$emessage->add(array($message, 'menuUi'), $type, $session);
+ 		e107::getMessage()->add(array($message, 'menuUi'), $type, $session);
 	}
 
     // -------------------------------------------------------------------------
@@ -235,7 +230,10 @@ class e_menuManager {
 
 	    function menuModify()
 		{
-			global $pref,$sql,$admin_log,$ns;
+			global $admin_log;
+			$pref = e107::getPref();
+			$sql = e107::getDb();
+			$ns = e107::getRender();
 
 			$menu_act = "";
 
@@ -303,7 +301,9 @@ class e_menuManager {
 
 	function menuSetPreset()
 	{
-		global $pref,$sql,$location,$admin_log;
+		global $location,$admin_log;
+		$pref = e107::getPref();
+		$sql = e107::getDb();
 
 	    if(!$menuAreas = $this->getMenuPreset())
 		{
@@ -349,7 +349,8 @@ class e_menuManager {
 
 	function menuScanMenus()
 	{
-		global $sql, $sql2;
+		global $sql2;
+		$sql = e107::getDb();
 
 			$efile = new e_file;
 			$efile->dirFilter = array('/', 'CVS', '.svn', 'languages');
@@ -396,7 +397,7 @@ class e_menuManager {
    						if($sql->db_Insert("menus",$insert))
 						{
 					  		// Could do admin logging here - but probably not needed
-							$message .= MENLAN_10." - ".$file['fname']."<br />";
+							$message .= MENLAN_10." - ".$file['fname']."<br />"; //FIXME
 						}
 					}
 				}
@@ -423,11 +424,11 @@ class e_menuManager {
 				if (stristr($menustr, $menu_name) === FALSE)
 				{
 					$sql2->db_Delete("menus", "menu_name='$menu_name'");
-					$message .= MENLAN_11." - ".$menu_name."<br />";
+					$message .= MENLAN_11." - ".$menu_name."<br />"; // FIXME
 				}
 			}
 
-			$this->menuAddMessage(vartrue($message), E_MESSAGE_INFO);
+			$this->menuAddMessage(vartrue($message), E_MESSAGE_INFO); //FIXME
 
 	}
 
@@ -529,7 +530,6 @@ class e_menuManager {
 		$text .= "</td></tr>
 		</table>
 		<div class='buttons-bar center'>";
-		//	<input class='button' type='submit' name='class_submit' value='".MENLAN_6."' />
         $text .= $frm->admin_button('class_submit', MENLAN_6, 'update');
 
 		$text .= "<input type='hidden' name='menu_id' value='".intval($_GET['vis'])."' />
@@ -549,7 +549,9 @@ class e_menuManager {
 
 	function menuActivate()    // Activate Multiple Menus.
 	{
-		global $sql, $admin_log, $pref;
+		global $admin_log;
+		$pref = e107::getPref();
+		$sql = e107::getDb();
 
 		$location = $this->menuActivateLoc;
 
@@ -594,7 +596,7 @@ class e_menuManager {
 
 	function menuSetCustomPages($array)
 	{
-		global $pref;
+		$pref = e107::getPref();
 		$key = key($array);
 		$pref['sitetheme_custompages'][$key] = array_filter(explode(" ",$array[$key]));
 		save_prefs();
@@ -605,7 +607,7 @@ class e_menuManager {
 
 	function getMenuPreset()
 	{
-		global $pref;
+		$pref = e107::getPref();
 
 		$layout = $this->curLayout;
 
@@ -694,7 +696,9 @@ class e_menuManager {
 
 	function menuSaveVisibility()
 	{
-		global $sql, $admin_log;
+		global $admin_log;
+		$sql = e107::getDb();
+
 		$pagelist = explode("\r\n", $_POST['pagelist']);
 		for ($i = 0 ; $i < count($pagelist) ; $i++)
 		{
@@ -790,8 +794,12 @@ class e_menuManager {
 
 	function menuRenderPage()
 	{
-		global $sql, $ns, $HEADER, $FOOTER, $rs, $pref, $tp;
-
+		global $HEADER, $FOOTER, $rs;
+		$pref   = e107::getPref();  
+		$sql    = e107::getDb();     
+		$tp     = e107::getParser(); 
+		$ns     = e107::getRender(); 
+		
 		//FIXME - XHTML cleanup, front-end standards (elist, forms etc)
 		echo "<div id='portal'>";
 		$this->parseheader($HEADER);  // $layouts_str;
@@ -987,7 +995,11 @@ class e_menuManager {
 
 	function checklayout($str)
 	{ // Displays a basic representation of the theme
-		global $pref, $ns, $PLUGINS_DIRECTORY, $rs, $sc_style, $tp, $menu_order;
+		global $PLUGINS_DIRECTORY, $rs, $sc_style, $menu_order;
+		$pref   = e107::getPref();  
+		$tp     = e107::getParser(); 
+		$ns     = e107::getRender();  
+
 		
 		$menuLayout = ($this->curLayout != $pref['sitetheme_deflayout']) ? $this->curLayout : "";
 		
@@ -1137,8 +1149,9 @@ class e_menuManager {
 
 	function menuRenderMenu($row,$menu_count,$rep = FALSE)
 	{
-		global $ns,$rs,$menu,$menu_info,$menu_act;
-		global $style;
+		global $rs,$menu,$menu_info,$menu_act, $style;
+		$ns = e107::getRender();
+
 		$style = $this->style;
 		//      $menu_count is empty in here
 		//FIXME extract
@@ -1335,7 +1348,8 @@ class e_menuManager {
 
     function menuSetConfigList()
 	{
-        	global $sql,$pref;
+        	$sql = e107::getDb();
+        	$pref = e107::getPref();
 
 			$sql -> db_Select("menus", "*", "menu_location != 0 ORDER BY menu_path,menu_name");
 			while($row = $sql-> db_Fetch())
diff --git a/e107_plugins/download/includes/admin.php b/e107_plugins/download/includes/admin.php
index 787162c5a..d792c453b 100644
--- a/e107_plugins/download/includes/admin.php
+++ b/e107_plugins/download/includes/admin.php
@@ -1673,7 +1673,6 @@ $columnInfo = array(
 	         	// Process triggers before calling admin_update so trigger messages can be shown
 	         	$data = array('method'=>'update', 'table'=>'download', 'id'=>$id, 'plugin'=>'download', 'function'=>'update_download');
 	         	$hooks = $e107->e_event->triggerHook($data);
-	         	require_once(e_HANDLER."message_handler.php");
 	        
 	   			$mes->add($hooks, E_MESSAGE_SUCCESS);
 		
diff --git a/e107_plugins/poll/admin_config.php b/e107_plugins/poll/admin_config.php
index 1050dd778..ebfa91b5b 100644
--- a/e107_plugins/poll/admin_config.php
+++ b/e107_plugins/poll/admin_config.php
@@ -6,8 +6,6 @@
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- * $URL$
- * $Id$
  */
 
 require_once("../../class2.php");
@@ -22,9 +20,8 @@ $e_sub_cat = 'poll';
 include_lan(e_PLUGIN.'poll/languages/'.e_LANGUAGE.'_admin_poll.php');
 require_once(e_ADMIN."auth.php");
 require_once(e_PLUGIN."poll/poll_class.php");
-require_once(e_HANDLER."form_handler.php");
-require_once(e_HANDLER."message_handler.php");
 require_once(e_HANDLER."userclass_class.php");
+require_once(e_HANDLER."form_handler.php"); // FIXME using 'form' instead of 'e_form'
 
 if(isset($_POST)) 
 {
@@ -36,17 +33,15 @@ $poll = new poll;
 $frm = e107::getForm();
 $mes = e107::getMessage();
 
+
 if (isset($_POST['reset']))
 {
 	unset($poll_id, $_POST['poll_title'], $_POST['poll_option'], $_POST['activate'], $_POST['multipleChoice'], $_POST['showResults'], $_POST['startday'], $_POST['startmonth'], $_POST['startyear'], $_POST['endday'], $_POST['endmonth'], $_POST['endyear']);
 	define("RESET", TRUE);
 } 
 
-//$emessage = eMessage::getInstance();
-	
 if (varset($_POST['delete'])) 
 {
-	//$message = $poll->delete_poll(key($_POST['delete']));
 	$poll->delete_poll(key($_POST['delete'])); // TODO check security?
 	$mes->addSuccess(LAN_DELETED);
 	unset($poll_id, $_POST['poll_title'], $_POST['poll_option'], $_POST['activate']);
@@ -59,14 +54,12 @@ if (isset($_POST['submit']))
 	if($_POST['poll_title'])
 	{
 		define("POLLID",$_POST['poll_id']);
-		//$emessage->add($poll -> submit_poll(), E_MESSAGE_SUCCESS);
 		$poll -> submit_poll();
 		$mes->addSuccess(LAN_CREATED);
 		unset($_POST['poll_title'], $_POST['poll_option'], $_POST['activate'], $_POST['poll_comment']);
 	}
 	else
 	{
-		//$emessage->add(POLLAN_46, E_MESSAGE_SUCCESS);
 		$mes->addError(LAN_REQUIRED_BLANK);
 	}
 	$_GET['mode']='list';
@@ -95,14 +88,6 @@ if (varset($_POST['edit']) || varset($_GET['mode'])=='create' && !varset($_POST[
 }
 
 
-/*
-if (isset($message))
-{
-	$emessage->add($message, E_MESSAGE_SUCCESS);
-
-}
-*/
-
 if(!varset($_POST['edit']) && ($_GET['mode']=="list" || !$_GET['mode']))
 {
 	poll_list();
@@ -186,11 +171,7 @@ function poll_list()
 			
 			'options' 				=> array('title'=> LAN_OPTIONS, 'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last')
 	);
-	
-	
-	
-	
-	
+		
 	
 	
 	$text = "
@@ -226,20 +207,14 @@ function poll_list()
 	}
 	else 
 	{
-		//$text .= "<div style='text-align:center'>".POLLAN_7."</div>";
 		$mes->addInfo(POLLAN_7);
 	}
 	$text .= "</form>";
 	
-	//$emessage = eMessage::getInstance();
-	
 	$ns->tablerender(POLLAN_MENU_CAPTION." - ".POLLAN_1, $mes->render(). $text);
 }
 
 
-
-
-
 function admin_config_adminmenu() 
 {
 	$action = varset($_GET['mode']) ? $_GET['mode'] : "list";
diff --git a/e107_plugins/tagwords/admin_tagwords_config.php b/e107_plugins/tagwords/admin_tagwords_config.php
index 105aef20c..1fecfdd1f 100644
--- a/e107_plugins/tagwords/admin_tagwords_config.php
+++ b/e107_plugins/tagwords/admin_tagwords_config.php
@@ -2,15 +2,12 @@
 /*
  * e107 website system
  *
- * Copyright (C) e107 Inc (e107.org)
+ * 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)
  *
  * Tagwords Admin
  *
- * $URL$
- * $Id$
- *
 */
 
 require_once("../../class2.php");
@@ -21,7 +18,6 @@ if (!getperms("P"))
 }
 require_once(e_ADMIN."auth.php");
 require_once(e_HANDLER."userclass_class.php");
-require_once(e_HANDLER."message_handler.php");
 $mes = e107::getMessage();
 
 require_once(e_PLUGIN."tagwords/tagwords_class.php");
@@ -34,12 +30,6 @@ if(isset($_POST['updatesettings']))
 	$mes->addSuccess(LAN_UPDATED);
 }
 
-/*
-if(isset($message))
-{
-	$tag->show_message($message, $caption='', $type='ns');
-}
-*/
 $ns->tablerender($caption, $mes->render() . $text);
 
 $tag->tagwords_options();
diff --git a/signup.php b/signup.php
index f6f977ab2..e43e9ef3d 100644
--- a/signup.php
+++ b/signup.php
@@ -2,14 +2,11 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2012 e107 Inc (e107.org)
+ * 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)
  *
  * User signup
- *
- * $URL$
- * $Id$
  * 
  */
 
@@ -17,8 +14,6 @@
 require_once("class2.php");
 
 
-
-
 $qs = explode(".", e_QUERY);
 
 if($qs[0] != 'activate')
@@ -90,7 +85,6 @@ if((e_QUERY == 'resend') && !USER && ($pref['user_reg_veri'] == 1))
 		// Start by looking up the user
 		if(!$sql->db_Select("user", "*", "(`user_loginname` = '".$clean_email."' OR `user_name` = '".$clean_email."' OR `user_email` = '".$clean_email."' ) AND `user_ban`=".USER_REGISTERED_NOT_VALIDATED." AND `user_sess` !='' LIMIT 1"))
 		{
-			require_once(e_HANDLER."message_handler.php");
 			message_handler("ALERT",LAN_SIGNUP_64.': '.$clean_email); // email (or other info) not valid.
 			require_once(FOOTERF);
 			exit();
@@ -104,7 +98,6 @@ if((e_QUERY == 'resend') && !USER && ($pref['user_reg_veri'] == 1))
 			{
 				if ($sql->db_select('user', 'user_id, user_email', "user_email='".$new_email."'"))
 				{	// Email address already used by someone
-					require_once(e_HANDLER."message_handler.php");
 					message_handler("ALERT",LAN_SIGNUP_106); 	// Duplicate email
 					require_once(FOOTERF);
 					exit();
@@ -116,7 +109,6 @@ if((e_QUERY == 'resend') && !USER && ($pref['user_reg_veri'] == 1))
 			}
 			else
 			{
-				require_once(e_HANDLER."message_handler.php");
 				message_handler("ALERT",LAN_SIGNUP_52); // Incorrect Password.
 				require_once(FOOTERF);
 				exit();
@@ -381,7 +373,6 @@ if (e_QUERY)
 if (isset($_POST['register']) && $pref['user_reg'] == 1) 
 {	
 	$e107cache->clear("online_menu_totals");
-	require_once(e_HANDLER."message_handler.php");
 	if (isset($_POST['rand_num']) && $signup_imagecode)
 	{	
 		if ($badCodeMsg = e107::getSecureImg()->invalidCode($_POST['rand_num'], $_POST['code_verify'])) // better: allows class to return the error. 
@@ -492,7 +483,6 @@ if (isset($_POST['register']) && $pref['user_reg'] == 1)
 		// All validated here - handle any errors
 		if ($error) //FIXME - this ignores the errors caused by invalid image-code. 
 		{
-			require_once(e_HANDLER."message_handler.php");
 			$temp = array();
 			if (count($extraErrors))
 			{
diff --git a/submitnews.php b/submitnews.php
index 647b0d067..f65b95273 100644
--- a/submitnews.php
+++ b/submitnews.php
@@ -1,21 +1,12 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     Copyright (C) 2008-2009 e107 Inc 
-|     http://e107.org
-|
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/submitnews.php,v $
-|     $Revision$
-|     $Date$
-|     $Author$
-+----------------------------------------------------------------------------+
-*/
+ * 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)
+ *
+ */
 
 require_once("class2.php");
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
@@ -127,7 +118,6 @@ if (isset($_POST['submitnews_submit']) && $_POST['submitnews_title'] && $_POST['
 	}
 	else
 	{
-		require_once(e_HANDLER."message_handler.php");
 		message_handler("P_ALERT", $message);
 	}
 }
diff --git a/upload.php b/upload.php
index a937dcdf1..b2405a398 100644
--- a/upload.php
+++ b/upload.php
@@ -1,21 +1,13 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     Copyright (C) 2008-2009 e107 Inc
-|     http://e107.org
-|
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/upload.php,v $
-|     $Revision$
-|     $Date$
-|     $Author$
-+----------------------------------------------------------------------------+
-*/
+ * 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)
+ *
+ */
+
 require_once("class2.php");
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
@@ -138,7 +130,6 @@ if (isset($_POST['upload']))
   }
   else
   {	// Error - missing data
-	require_once(e_HANDLER."message_handler.php");
 	message_handler("ALERT", 5);
   }
 }