diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php
index 82a2321fa..7d376f7b7 100644
--- a/e107_admin/admin_log.php
+++ b/e107_admin/admin_log.php
@@ -10,14 +10,6 @@
  *
 */
 
-/**
- *
- *	@package     e107
- *	@subpackage	admin
- *
- *	Handle display of the various system logs
- */
-
 /*
  * Preferences:
  * 	'sys_log_perpage' - number of events per page
@@ -37,11 +29,8 @@ if(! getperms('S'))
 	exit();
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
-// Main language file should automatically be loaded
-// Load language files for log messages
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_log_messages.php'); //... for core functions
-
+e107::coreLan('admin_log', true);
+e107::coreLan('log_messages', true); 
 
 if(is_array($pref['lan_log_list'])) //... and for any plugins which support it
 {
diff --git a/e107_admin/administrator.php b/e107_admin/administrator.php
index b173771c6..4e9434cde 100644
--- a/e107_admin/administrator.php
+++ b/e107_admin/administrator.php
@@ -23,7 +23,7 @@ if(isset($_POST['go_back']))
 	exit;
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('administrator', true);
 
 $e_sub_cat = 'admin';
 require_once('auth.php');
diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php
index f9b1e81df..9bebd3067 100644
--- a/e107_admin/banlist.php
+++ b/e107_admin/banlist.php
@@ -8,29 +8,10 @@
  *
  * Ban List Management
  *
- * $URL$
- * $Id$
  *
 */
 
-/**
- *	e107 Banlist administration
- *
- *	@package	e107
- *	@subpackage	admin
- *	@version 	$Id$;
- */
-
-
 require_once('../class2.php');
-/*
-@todo should this be here?
-if(count($_POST) && !varset($_POST['e-token']))
-{
-	die('Access denied - bl');
-}
-*/
-
 
 if (!getperms('4'))
 {
@@ -38,11 +19,9 @@ if (!getperms('4'))
 	exit();
 }
 
-
-
 require_once(e_HANDLER.'iphandler_class.php');		// This is probably already loaded in class2.php
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('banlist', true);
 
 e107::js('footer-inline', "
 
@@ -53,11 +32,9 @@ e107::js('footer-inline', "
 			event.preventDefault();
 		});
 
-
 ");
 
 
-
 class banlist_admin extends e_admin_dispatcher
 {
 
diff --git a/e107_admin/banlist_export.php b/e107_admin/banlist_export.php
index f92912e1c..c6259d0f6 100644
--- a/e107_admin/banlist_export.php
+++ b/e107_admin/banlist_export.php
@@ -8,16 +8,6 @@
  *
  * Banlist export
  *
- * $URL$
- * $Id$
- */
-
-/**
- *	e107 Banlist administration
- *
- *	@package	e107
- *	@subpackage	admin
- *	@version 	$Id$;
  */
 
 require_once('../class2.php');
diff --git a/e107_admin/boot.php b/e107_admin/boot.php
index d9ca9b4ce..dd80ebf17 100644
--- a/e107_admin/boot.php
+++ b/e107_admin/boot.php
@@ -8,8 +8,6 @@
  *
  * Admin BootLoader
  *
- * $URL$
- * $Id$
 */
 
 if (!defined('e107_INIT'))
@@ -165,16 +163,10 @@ e107::coreLan('footer', true);
 }
 
 
-
-
-
 // Get Icon constants, theme override (theme/templates/admin_icons_template.php) is allowed
 include_once(e107::coreTemplatePath('admin_icons'));
 
 
-
-
-
 if(!defset('e_ADMIN_UI') && !defset('e_PAGETITLE'))
 {
 	$array_functions = e107::getNav()->adminLinks('legacy'); // replacement see e107_handlers/sitelinks.php
@@ -478,4 +470,4 @@ if (!function_exists("parse_admin"))
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/e107_admin/cache.php b/e107_admin/cache.php
index d8d983aff..c5589928e 100644
--- a/e107_admin/cache.php
+++ b/e107_admin/cache.php
@@ -8,28 +8,17 @@
  *
  * Cache Administration Area
  *
- * $URL$
- * $Id$
- *
 */
 
-/**
- *	Admin page - cache management
- *
- *	@package	e107
- *	@subpackage	admin
- *	@version 	$Id$;
- *  @author 	e107 Inc
- */
-
 require_once("../class2.php");
+
 if (!getperms("C"))
 {
 	e107::redirect('admin');
 	exit;
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('cache', true);
 
 $e_sub_cat = 'cache';
 
diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index 4d8066a06..ee024510f 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -19,12 +19,11 @@ e107::css('inline',"
 .e-wysiwyg { height: 400px }
 ");
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('cpage', true);
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_page.php');
 
 $e_sub_cat = 'custom';
 
-
 class page_admin extends e_admin_dispatcher
 {
 
diff --git a/e107_admin/credits.php b/e107_admin/credits.php
index 0c6549a79..5462eef29 100644
--- a/e107_admin/credits.php
+++ b/e107_admin/credits.php
@@ -50,7 +50,7 @@ require_once(e_ADMIN."auth.php");
 	                        Nuvolo Icons, PHPMailer, TCPDF, PHP UTF8
 	                    </p>
                    
-                    	<div class="copyright">Copyright <a href="http://e107.org/content/About-Us:The-Team" title="e107 Team">e107 Inc.</a> 2008-2013</div>
+                    	<div class="copyright">Copyright <a href="http://e107.org/content/About-Us:The-Team" title="e107 Team">e107 Inc.</a> 2008-2017</div>
                		 </div>
 			    </div>
             </div>
diff --git a/e107_admin/cron.php b/e107_admin/cron.php
index b21be360b..d7c1f1f87 100644
--- a/e107_admin/cron.php
+++ b/e107_admin/cron.php
@@ -17,9 +17,7 @@ if (!getperms('U'))
 	exit;
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
-
-
+e107::coreLan('cron', true);
 
 class cron_admin extends e_admin_dispatcher
 {
@@ -269,7 +267,7 @@ class cron_admin_ui extends e_admin_ui
 			
 			if(!$sql->insert('cron',$insert))
 			{
-				e107::getMessage()->add(LAN_CRON_6, E_MESSAGE_ERROR);
+				e107::getMessage()->addDebug(LAN_CRON_6);
 			}
 			else
 			{
diff --git a/e107_admin/db.php b/e107_admin/db.php
index 6513fd5bc..7bba0a173 100644
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -26,9 +26,7 @@ if(isset($_POST['back']))
 	exit();
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);		
-
-
+e107::coreLan('db', true);
 
 $e_sub_cat = 'database';
 
diff --git a/e107_admin/docs.php b/e107_admin/docs.php
index 821588ccd..81cef9468 100644
--- a/e107_admin/docs.php
+++ b/e107_admin/docs.php
@@ -8,10 +8,6 @@
  *
  * Docs
  *
- * $Source: /cvs_backup/e107_0.8/e107_admin/docs.php,v $
- * $Revision$
- * $Date$
- * $Author$
  *
 */
 require_once("../class2.php");
@@ -20,7 +16,7 @@ if (!ADMIN) {
 	exit;
 }
 
-e107::lan('core','docs',true);
+e107::coreLan('docs', true);
 
 define('DOC_PATH',      e_DOCS.e_LANGUAGE.'/');
 define('DOC_PATH_ALT',  e_DOCS.'English/');
diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php
index 9e21b980b..31d8cebbd 100644
--- a/e107_admin/emoticon.php
+++ b/e107_admin/emoticon.php
@@ -18,7 +18,7 @@ if (!getperms("F"))
 	exit;
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('emoticon', true);
 
 $e_sub_cat = 'emoticon';
 
diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php
index b890cb6ef..b95c3253a 100644
--- a/e107_admin/eurl.php
+++ b/e107_admin/eurl.php
@@ -8,8 +8,6 @@
  *
  * URL and front controller Management
  *
- * $URL$
- * $Id$
 */
 
 require_once('../class2.php');
diff --git a/e107_admin/fileinspector.php b/e107_admin/fileinspector.php
index b543f3485..15a40f1af 100644
--- a/e107_admin/fileinspector.php
+++ b/e107_admin/fileinspector.php
@@ -14,11 +14,9 @@ header('Content-Encoding: none'); // turn off gzip.
 ob_implicit_flush(true);
 ob_end_flush();
 
-
-
 require_once('../class2.php');
 
-e107::lan('core','fileinspector', true);
+e107::coreLan('fileinspector', true);
 
 if (!getperms('Y'))
 {
diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php
index d927f47e7..628593c3a 100644
--- a/e107_admin/frontpage.php
+++ b/e107_admin/frontpage.php
@@ -25,7 +25,7 @@ if(! getperms('G'))
 	exit();
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('frontpage', true);
 
 $e_sub_cat = 'frontpage';
 require_once ('auth.php');
diff --git a/e107_admin/image.php b/e107_admin/image.php
index d78e73227..1db05fd6a 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -8,8 +8,6 @@
  *
  * Image Administration Area
  *
- * $URL$
- * $Id$
  *
 */
 
@@ -53,7 +51,7 @@ if(isset($_POST['submit_cancel_show']))
 	exit();
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('image', true);
 
 if($_GET['action'] == 'dialog')
 {
diff --git a/e107_admin/index.php b/e107_admin/index.php
index 26ce2dd65..c6e1ea995 100644
--- a/e107_admin/index.php
+++ b/e107_admin/index.php
@@ -6,12 +6,6 @@
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- *
- *
- * $Source: /cvs_backup/e107_0.8/e107_admin/index.php,v $
- * $Revision$
- * $Date$
- * $Author$
  */
 
 header('Location: admin.php');
diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php
index e331f49b1..5997039c9 100644
--- a/e107_admin/lancheck.php
+++ b/e107_admin/lancheck.php
@@ -22,7 +22,7 @@ if (!getperms("L"))
 	exit;
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_lancheck.php');
+e107::coreLan('lancheck', true);
 
 $e_sub_cat = 'language';
 // require_once("auth.php");
diff --git a/e107_admin/language.php b/e107_admin/language.php
index a76f1af13..2859733f1 100644
--- a/e107_admin/language.php
+++ b/e107_admin/language.php
@@ -15,7 +15,7 @@ if (!getperms('L'))
 	e107::redirect('admin');
 	exit;
 }
-//include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+
 e107::coreLan('language', true);
 
 $e_sub_cat = 'language';
@@ -25,11 +25,6 @@ if(!empty($_GET['iframe']))
 	define('e_IFRAME', true);
 }
 
-
-
-
-
-
 	class language_admin extends e_admin_dispatcher
 	{
 
diff --git a/e107_admin/links.php b/e107_admin/links.php
index 07f062d0f..c846458bd 100644
--- a/e107_admin/links.php
+++ b/e107_admin/links.php
@@ -10,15 +10,8 @@
  *
  */
 
-/**
- * @package e107
- * @subpackage	admin
- * @version $Id$
- *
- * Manage site navigation links
- */
-
 require_once("../class2.php");
+
 if (!getperms("I"))
 {
 	e107::redirect('admin');
diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 1fb6cee1f..7641b7b65 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -10,14 +10,6 @@
  *
 */
 
-
-/**
- *	e107 Mail handling - Admin
- *
- *	@package	e107
- *	@subpackage	admin
- */
-
 /*
 Features:
 1. Additional sources of email addresses for mailouts can be provided via plugins, and can be enabled via the mailout preferences page
@@ -74,9 +66,9 @@ if (!getperms('W'))
 	e107::redirect('admin');
 	exit;
 }
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_users.php');
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_mailout.php');
-//	e107::lan('core','signup');
+
+e107::coreLan('users', true); 
+e107::coreLan('mailout', true); 
 
 require_once(e_HANDLER.'ren_help.php');
 
diff --git a/e107_admin/menus.php b/e107_admin/menus.php
index 0d7f79766..dfb34c0e2 100644
--- a/e107_admin/menus.php
+++ b/e107_admin/menus.php
@@ -49,10 +49,6 @@ if(e_MENUMANAGER_ACTIVE === false )
 		body { overflow:hidden }
 
 
-
-
-
-
 		');
 	}
 	else
@@ -124,12 +120,9 @@ if(e_MENUMANAGER_ACTIVE === false )
 			ul.dropdown-menu.e-mm-selector { padding: 10px; margin-top: -2px; margin-right:-2px; }
 
 		");
-
 }
 
 
-
-
 if (!getperms("2"))
 {
 	e107::redirect('admin');
@@ -137,17 +130,10 @@ if (!getperms("2"))
 }
 
 
-
-
 e107::coreLan('menus', true);
 e107::coreLan('admin', true);
 
 
-
-
-
-
-
 if(e_MENUMANAGER_ACTIVE === true || vartrue($_GET['enc']))
 {
 
diff --git a/e107_admin/message.php b/e107_admin/message.php
index 009cd3455..bdc99aa9c 100644
--- a/e107_admin/message.php
+++ b/e107_admin/message.php
@@ -6,17 +6,11 @@
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- *
- *
- * $Source: /cvs_backup/e107_0.8/e107_admin/message.php,v $
- * $Revision$
- * $Date$
- * $Author$
  */
 
 require_once("../class2.php");
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('message', true);
 
 $e_sub_cat = 'message';
 require_once("auth.php");
diff --git a/e107_admin/meta.php b/e107_admin/meta.php
index 1b5a5ea61..ba9687f13 100644
--- a/e107_admin/meta.php
+++ b/e107_admin/meta.php
@@ -11,12 +11,14 @@
  *
 */
 require_once("../class2.php");
-if (!getperms("T")) {
+
+if (!getperms("T")) 
+{
 	e107::redirect('admin');
 	exit;
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('meta', true);
 
 $e_sub_cat = 'meta';
 require_once("auth.php");
diff --git a/e107_admin/modcomment.php b/e107_admin/modcomment.php
index 23ab9295d..eeacdfbb9 100644
--- a/e107_admin/modcomment.php
+++ b/e107_admin/modcomment.php
@@ -9,13 +9,14 @@
  */
 
 require_once("../class2.php");
-if (!getperms("B")) {
+
+if (!getperms("B")) 
+{
 	e107::redirect('admin');
 	exit;
 }
 
 
-
 $tmp	= explode(".", e_QUERY);
 $table	= $tmp[0];
 $id		= intval($tmp[1]);
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index 5115b8aeb..8a33c0854 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -27,9 +27,6 @@ e107::css('inline', "
 
 ");
 
-
-
-
 class news_admin extends e_admin_dispatcher
 {
 
diff --git a/e107_admin/notify.php b/e107_admin/notify.php
index d23fd8033..019964b93 100644
--- a/e107_admin/notify.php
+++ b/e107_admin/notify.php
@@ -8,23 +8,15 @@
  *
  */
 
-/**
- *	@package    e107
- *	@subpackage	admin
- *
- *	'Notify' admin page - selects action on various events 
- */
-
 require_once('../class2.php');
+
 if (!getperms('O')) 
 {
 	e107::redirect('admin');
 	exit;
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
-
-
+e107::coreLan('notify', true);
 
 class plugin_notify_admin extends e_admin_dispatcher
 {
diff --git a/e107_admin/phpinfo.php b/e107_admin/phpinfo.php
index b8326c945..cc6e5eade 100644
--- a/e107_admin/phpinfo.php
+++ b/e107_admin/phpinfo.php
@@ -6,16 +6,11 @@
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- *
- *
- * $Source: /cvs_backup/e107_0.8/e107_admin/phpinfo.php,v $
- * $Revision$
- * $Date$
- * $Author$
  */
 
 require_once("../class2.php");
-if (!getperms("0"))
+
+if(!getperms("0"))
 {
 	e107::redirect('admin');
     exit;
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 54c73e7df..4bb54a84f 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -11,7 +11,8 @@
  */
 
 require_once("../class2.php");
-if (!getperms("Z"))
+
+if(!getperms("Z"))
 {
 	e107::redirect('admin');
 	exit;
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index b341c5239..a116f6f90 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -9,6 +9,7 @@
  * Administration - Site Preferences
  *
  */
+
 require_once ("../class2.php");
 
 if(isset($_POST['newver']))
@@ -17,17 +18,17 @@ if(isset($_POST['newver']))
 	exit();
 }
 
-if(! getperms("1"))
+if(!getperms("1"))
 {
 	e107::redirect('admin');
 	exit();
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('prefs', true);
+
 $e_sub_cat = 'prefs';
-e107::lan('core','mailout','admin');
-
-
+//e107::lan('core','mailout','admin');
+e107::coreLan('mailout', true);
 
 
 require_once (e_ADMIN."auth.php");
diff --git a/e107_admin/search.php b/e107_admin/search.php
index a75e647d9..a78f55659 100644
--- a/e107_admin/search.php
+++ b/e107_admin/search.php
@@ -17,15 +17,13 @@ if (!getperms('X'))
 	exit;
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('search', true);
 
 $e_sub_cat = 'search';
 require_once('auth.php');
 require_once(e_HANDLER.'userclass_class.php');
 require_once(e_HANDLER.'search_class.php');
 
-
-
 $frm = e107::getForm();
 $mes = e107::getMessage();
 $e_userclass = new user_class();
diff --git a/e107_admin/theme.php b/e107_admin/theme.php
index 9ec2f1ee5..ab238b1c4 100644
--- a/e107_admin/theme.php
+++ b/e107_admin/theme.php
@@ -6,22 +6,17 @@
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- *
- *
- * $Source: /cvs_backup/e107_0.8/e107_admin/theme.php,v $
- * $Revision$
- * $Date$
- * $Author$
  */
 
 require_once("../class2.php");
+
 if (!getperms("1"))
 {
 	e107::redirect('admin');
 	exit;
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('theme', true);
 
 $e_sub_cat = 'theme_manage';
 
diff --git a/e107_admin/ugflag.php b/e107_admin/ugflag.php
index 4cd1458dd..04370c59e 100644
--- a/e107_admin/ugflag.php
+++ b/e107_admin/ugflag.php
@@ -10,6 +10,7 @@
  *
  */
 require_once ('../class2.php');
+
 if(!getperms('9'))
 {
 	e107::redirect('admin');
@@ -18,7 +19,7 @@ if(!getperms('9'))
 
 $e_sub_cat = 'maintain';
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
+e107::coreLan('ugflag', true);
 
 $mes = e107::getMessage();
 $frm = e107::getForm();
diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php
index bb54550b9..25ab1ec90 100644
--- a/e107_admin/update_routines.php
+++ b/e107_admin/update_routines.php
@@ -1,26 +1,14 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     Copyright (C) 2008-2010 e107 Inc (e107.org)
-|     http://e107.org
-|
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $URL$
-|     $Revision$
-|     $Id$
-|     $Author$
-+----------------------------------------------------------------------------+
-*/
+ * 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)
+ *
+ */
 
 /**
- *	@package    e107
- *	@subpackage	admin
- *	@version 	$Id$;
  *
  *	Update routines from older e107 versions to current.
  *
diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php
index 02daedf4c..e4538fdb3 100644
--- a/e107_admin/userclass2.php
+++ b/e107_admin/userclass2.php
@@ -10,25 +10,15 @@
  *
 */
 
-
-/**
- *	e107 Userclass handling - Admin
- *
- *	@package	e107
- *	@subpackage	admin
- *	@version 	$Id$;
- */
-
 require_once('../class2.php');
+
 if (!getperms('4'))
 {
   e107::redirect('admin');
   exit;
 }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
-
-
+e107::coreLan('userclass2', true);
 
 
 	class uclass_admin extends e_admin_dispatcher
diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php
index a08d2691d..a53ddad14 100755
--- a/e107_admin/users_extended.php
+++ b/e107_admin/users_extended.php
@@ -16,8 +16,7 @@ if (!getperms('4'))
 	exit;
 }
 
-
-include_lan(e_LANGUAGEDIR . e_LANGUAGE . '/admin/lan_' . e_PAGE);
+e107::coreLan('users_extended', true);
 
 if(varset($_GET['mode']) == "ajax")
 {
diff --git a/e107_admin/ver.php b/e107_admin/ver.php
index edfec51af..8ad5e0054 100644
--- a/e107_admin/ver.php
+++ b/e107_admin/ver.php
@@ -6,12 +6,6 @@
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- *
- *
- * $Source: /cvs_backup/e107_0.8/e107_admin/ver.php,v $
- * $Revision$
- * $Date$
- * $Author$
  */
 
 if (!defined('e107_INIT')) { exit; }
diff --git a/e107_admin/wmessage.php b/e107_admin/wmessage.php
index 612e8b441..058cf2f56 100644
--- a/e107_admin/wmessage.php
+++ b/e107_admin/wmessage.php
@@ -15,7 +15,7 @@ if (!getperms("M"))
 	exit;
 }
 
-e107::lan('core','wmessage',true);
+e107::coreLan('wmessage', true);
 
 
 class wmessage_admin extends e_admin_dispatcher