diff --git a/e107_plugins/clock_menu/config.php b/e107_plugins/clock_menu/config.php
index 1d06fab8b..3bc239474 100644
--- a/e107_plugins/clock_menu/config.php
+++ b/e107_plugins/clock_menu/config.php
@@ -8,9 +8,6 @@
  *
  * Plugin Administration - Clock menu
  *
- *
- * $URL$
- * $Id$
  */
 
 
@@ -24,9 +21,6 @@ if (!getperms('1'))
 require_once(e_ADMIN.'auth.php');
 include_lan(e_PLUGIN.'clock_menu/languages/admin/'.e_LANGUAGE.'.php');
 
-require_once(e_HANDLER.'form_handler.php');
-require_once(e_HANDLER.'message_handler.php');
-$rs = new form;
 $frm = e107::getForm();
 $mes = e107::getMessage();
 $menu_pref = e107::getConfig('menu')->getPref('');
@@ -72,8 +66,7 @@ $text = "
 	
 	<tr>
 		<td>".CLOCK_AD_L5.": </td>
-		<td>".($menu_pref['clock_format'] == 1 ? $rs->form_checkbox("clock_format", 1, 1) : $rs->form_checkbox("clock_format", 1, 0) )."
-		<span class='field-help'>".CLOCK_AD_L6."</span></td>
+		<td>".$frm->checkbox('clock_format', 1, varset($menu_pref['clock_format'], 0))."<span class='field-help'>".CLOCK_AD_L6."</span></td>
 	</tr>
 
 	<tr>
diff --git a/e107_plugins/clock_menu/languages/admin/English.php b/e107_plugins/clock_menu/languages/admin/English.php
index ff3e368f0..326c5adc6 100644
--- a/e107_plugins/clock_menu/languages/admin/English.php
+++ b/e107_plugins/clock_menu/languages/admin/English.php
@@ -13,7 +13,7 @@ define("CLOCK_AD_L2", "Caption");
 //define("CLOCK_AD_L3", "Update Menu Settings");
 define("CLOCK_AD_L4", "Clock Menu Config");
 define("CLOCK_AD_L5", "AM/PM");
-define("CLOCK_AD_L6", "If checked, you will display time with US format (0-12 AM/PM format). Unchecked you will display a 'military' format 0-24 format");
+define("CLOCK_AD_L6", "If checked, it will display time with US format (0-12 AM/PM format). Unchecked it will display a 'military' format 0-24 format");
 define("CLOCK_AD_L7", "Date Prefix");
 define("CLOCK_AD_L8", "If your language requires a short word before the date (e.g. 'le' for French or 'den' for German...), use this field. If not required, leave blank.");
 define("CLOCK_AD_L9", "Suffix 1");
@@ -21,15 +21,4 @@ define("CLOCK_AD_L10", "Suffix 2");
 define("CLOCK_AD_L11", "Suffix 3");
 define("CLOCK_AD_L12", "Suffix 4 and more");
 define("CLOCK_AD_L13", "If your language requires to display a suffix just after numbers for date, fill these fields with suffix only (Example: 'st' for 1, 'nd' for 2, 'rd' for 3 and 'th' for 4 and more - for English users). If not required leave blank.");
-define("CLOCK_AD_L14", "");
-define("CLOCK_AD_L15", "");
-define("CLOCK_AD_L16", "");
-define("CLOCK_AD_L17", "");
-define("CLOCK_AD_L18", "");
-define("CLOCK_AD_L19", "");
-define("CLOCK_AD_L20", "");
-define("CLOCK_AD_L21", "");
-define("CLOCK_AD_L22", "");
-define("CLOCK_AD_L23", "");
-define("CLOCK_AD_L24", "");
 ?>
diff --git a/e107_plugins/comment_menu/config.php b/e107_plugins/comment_menu/config.php
index af3792afa..f30dac3d2 100644
--- a/e107_plugins/comment_menu/config.php
+++ b/e107_plugins/comment_menu/config.php
@@ -8,9 +8,6 @@
  *
  * Plugin Administration - Comment menu
  *
- *
- * $URL$
- * $Id$
  */
 
 $eplug_admin = TRUE;
@@ -24,8 +21,6 @@ if (!getperms("1"))
 	exit() ;
 }
 require_once(e_ADMIN."auth.php");
-require_once(e_HANDLER.'form_handler.php');
-require_once(e_HANDLER.'message_handler.php');
 $frm = e107::getForm();
 $mes = e107::getMessage();
 $menu_config = e107::getConfig('menu'); 
diff --git a/e107_plugins/forum/forum_admin.php b/e107_plugins/forum/forum_admin.php
index 05b523c3e..c4383a0eb 100644
--- a/e107_plugins/forum/forum_admin.php
+++ b/e107_plugins/forum/forum_admin.php
@@ -6,10 +6,6 @@
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- *
- *
- * $URL$
- * $Id$
  */
 
 $eplug_admin = true;
@@ -29,9 +25,9 @@ require_once(e_HANDLER.'form_handler.php');
 require_once(e_HANDLER.'ren_help.php'); // FIXME
 require_once(e_PLUGIN.'forum/forum_class.php');
 require_once(e_PLUGIN.'forum/forum_admin_class.php');
-//$emessage = eMessage::getInstance();
+
 $mes = e107::getMessage();
-$rs = new form; // FIX TODO needs $frm
+//$rs = new form; // FIX TODO needs $frm
 $for = new e107forum;
 $forum = new forumAdmin;
 $sql = e107::getDb();
@@ -218,7 +214,7 @@ if(isset($_POST['update_parent']))
 	$tmp['data']['forum_postclass'] = $_POST['forum_postclass'];
 	$tmp['data']['forum_threadclass'] = $_POST['forum_threadclass'];
 	$sql->db_Update('forum', $tmp);
-	//$forum->show_message(FORLAN_14);
+
 	$mes->addSuccess(LAN_UPDATED);
 	$action = 'main';
 }
@@ -238,12 +234,10 @@ if(isset($_POST['submit_forum']))
 	$tmp['forum_parent'] = (int)$_POST['forum_parent'];
 	if($sql->db_Insert('forum', $tmp))
 	{
-		//$forum->show_message(FORLAN_36.' - '.LAN_CREATED);
 		$mes->addSuccess(LAN_CREATED);
 	}
 	else
 	{
-		//$forum->show_message(FORLAN_36.' - '.LAN_CREATED_FAILED);
 		$mes->addError(LAN_CREATED_FAILED);
 	}
 }
@@ -265,7 +259,6 @@ if(isset($_POST['update_forum']))
 	$sql->db_Update('forum', $tmp);
 	$sql->db_Update('forum', $tmp2);
 
-	//$forum->show_message(FORLAN_12);
 	$mes->addSuccess(LAN_UPDATED);
 	$action = 'main';
 }
@@ -279,7 +272,6 @@ if (isset($_POST['update_order']))
 		$tmp = explode('.', $id);
 		$sql->db_Update('forum', "forum_order=".$tmp[1]." WHERE forum_id=".$tmp[0]);
 	}
-	//$forum->show_message(FORLAN_73);
 	$mes->addSuccess(LAN_UPDATED);
 }
 
@@ -307,10 +299,8 @@ if (isset($_POST['updateoptions']))
 	$fPref->set('maxwidth', $_POST['forum_maxwidth']);
 	$fPref->set('linkimg', $_POST['forum_linkimg']);
 	$fPref->save(true, true);
-	//$emessage->add(FORLAN_10, E_MESSAGE_SUCCESS);
-	$mes->addSuccess();
 
-//	$forum->show_message(FORLAN_10);
+	$mes->addSuccess();
 }
 
 $ns->tablerender($caption, $mes->render() . $text);
@@ -318,7 +308,6 @@ $ns->tablerender($caption, $mes->render() . $text);
 if (isset($_POST['do_prune']))
 {
 	$msg = $for->forumPrune($_POST['prune_type'], $_POST['prune_days'], $_POST['pruneForum']);
-	//$forum->show_message($msg);
 	$mes->addSuccess($msg);
 	$action = 'main';
 }
@@ -348,7 +337,6 @@ $ns->tablerender($caption, $mes->render() . $text);
 
 if (vartrue($delete) == 'main') {
 	if ($sql->db_Delete('forum', "forum_id='$del_id' ")) {
-		//$forum->show_message(FORLAN_96);
 		$mes->addSuccess(LAN_DELETED);
 	}
 	else 
@@ -473,6 +461,4 @@ function forum_admin_adminmenu()
 	global $action;
 	$forum->show_options($action);
 }
-
-
 ?>
\ No newline at end of file
diff --git a/e107_plugins/forum/forum_admin_class.php b/e107_plugins/forum/forum_admin_class.php
index c78060eaf..cf26a553b 100755
--- a/e107_plugins/forum/forum_admin_class.php
+++ b/e107_plugins/forum/forum_admin_class.php
@@ -8,9 +8,6 @@
 *
 * Forum admin functions
 *
-* $URL$
-* $Id$
-*
 */
 
 /* TODO
diff --git a/e107_plugins/online/config.php b/e107_plugins/online/config.php
index 2c1daa601..9463d0292 100644
--- a/e107_plugins/online/config.php
+++ b/e107_plugins/online/config.php
@@ -2,14 +2,11 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 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)
  *
  * Plugin Administration - Online menu
-
- * $URL$
- * $Id$
  *
 */
 
@@ -23,8 +20,7 @@ if (!getperms('1'))
 	exit ;
 }
 require_once(e_ADMIN.'auth.php');
-require_once(e_HANDLER.'message_handler.php');
-require_once(e_HANDLER.'form_handler.php');
+
 $mes = e107::getMessage();
 $frm = e107::getForm();
 
diff --git a/e107_plugins/pm/pm_conf.php b/e107_plugins/pm/pm_conf.php
index e3a917280..103d79d0c 100755
--- a/e107_plugins/pm/pm_conf.php
+++ b/e107_plugins/pm/pm_conf.php
@@ -2,16 +2,12 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 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)
  *
  * PM Plugin - administration
  *
- * $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_conf.php,v $
- * $Revision$
- * $Date$
- * $Author$
  */
 
 
@@ -20,7 +16,6 @@
  *
  *	@package	e107_plugins
  *	@subpackage	pm
- *	@version 	$Id$;
  */
 
 
@@ -48,9 +43,7 @@ if (!e107::isInstalled('pm') || !getperms('P'))
 
 require_once(e_PLUGIN.'pm/pm_class.php');
 //require_once(e_HANDLER.'userclass_class.php');		Should already be loaded
-require_once(e_HANDLER.'form_handler.php');
-require_once (e_HANDLER.'message_handler.php');
-//$emessage = &eMessage :: getInstance();
+require_once(e_HANDLER."form_handler.php"); // FIXME form options below need rewriting to $frm->
 $mes = e107::getMessage();
 
 $action = e_QUERY;
@@ -134,17 +127,14 @@ if (isset($_POST['update_prefs']))
 	//	$sysprefs->setArray('pm_prefs');
 	//print_a($temp);
 		e107::getPlugConfig('pm')->setPref($temp)->save();
-	//	$emessage->add(ADLAN_PM_4, E_MESSAGE_SUCCESS);
 	}
 	else
 	{
-		//$emessage->add(ADLAN_PM_76, E_MESSAGE_INFO);
 		$mes->addInfo(LAN_NO_CHANGE);
 	}
 }
 
 
-
 // Mantenance options
 if (isset($_POST['pm_maint_execute']))
 {
@@ -183,13 +173,11 @@ if (isset($_POST['pm_maint_execute']))
 }
 
 
-
 if(isset($_POST['addlimit']))
 {
 	$id = intval($_POST['newlimit_class']);
 	if($sql->db_Select('generic','gen_id',"gen_type = 'pm_limit' AND gen_datestamp = ".$id))
 	{
-		//$emessage->add(ADLAN_PM_5, E_MESSAGE_INFO);		// 'Limit for selected user class already exists'
 		$mes->addInfo(ADLAN_PM_5); // 'Limit for selected user class already exists'
 	}
 	else
@@ -205,13 +193,11 @@ if(isset($_POST['addlimit']))
 		if($sql->db_Insert('generic', $limArray))
 		{
 			$e107->admin_log->logArrayAll('PM_ADM_05', $limArray);
-			//$emessage->add(ADLAN_PM_6, E_MESSAGE_SUCCESS);
 			$mes->addSuccess(ADLAN_PM_6);
 		}
 		else
 		{
 			$e107->admin_log->log_event('PM_ADM_08', '');
-			//$emessage->add(ADLAN_PM_7, E_MESSAGE_ERROR);
 			$mes->addError(ADLAN_PM_7); 
 		}
 	}
@@ -224,7 +210,6 @@ if(isset($_POST['updatelimits']))
 	{
 		$pm_prefs['pm_limits'] = $limitVal;
 		//$sysprefs->setArray('pm_prefs');
-		//$emessage->add(ADLAN_PM_8, E_MESSAGE_SUCCESS);
 		$mes->addSuccess(ADLAN_PM_8);
 	}
 	foreach(array_keys($_POST['inbox_count']) as $id)
@@ -236,13 +221,11 @@ if(isset($_POST['updatelimits']))
 			if($sql->db_Delete('generic','gen_id = '.$id))
 			{
 				$e107->admin_log->log_event('PM_ADM_07', 'ID: '.$id);
-				//$emessage->add($id.ADLAN_PM_9, E_MESSAGE_SUCCESS);
 				$mes->addSuccess($id.ADLAN_PM_9);
 			}
 			else
 			{
 				$e107->admin_log->log_event('PM_ADM_10', '');
-				//$emessage->add($id.ADLAN_PM_10, E_MESSAGE_ERROR);
 				$mes->addError($id.ADLAN_PM_10);
 			}
 		}
@@ -257,13 +240,11 @@ if(isset($_POST['updatelimits']))
 			if ($sql->db_Update('generic',array('data' => $limArray, 'WHERE' => 'gen_id = '.$id)))
 			{
 				$e107->admin_log->logArrayAll('PM_ADM_06', $limArray);
-				//$emessage->add($id.ADLAN_PM_11, E_MESSAGE_SUCCESS);
 				$mes->addSuccess($id.ADLAN_PM_11);
 			}
 			else
 			{
 				$e107->admin_log->log_event('PM_ADM_09', '');
-				//$emessage->add($id.ADLAN_PM_7, E_MESSAGE_ERROR);
 				$mes->addError($id.ADLAN_PM_7);
 			}
 		}
@@ -271,12 +252,6 @@ if(isset($_POST['updatelimits']))
 }
 
 
-/*
-if ($emessage->hasMessage())
-{
-	$e107->ns->tablerender(ADLAN_PM_58, $emessage->render());
-}
-*/
 $ns->tablerender($caption, $mes->render() . $text);
 
 
@@ -298,7 +273,6 @@ require_once(e_ADMIN.'footer.php');
 
 
 
-
 function yes_no($fname, $curval = '')
 {
 		$ret =