diff --git a/main/admin/add_users_to_group.php b/main/admin/add_users_to_group.php
index 8a6562c79e..4dfda5c87f 100644
--- a/main/admin/add_users_to_group.php
+++ b/main/admin/add_users_to_group.php
@@ -13,8 +13,6 @@ $cidReset=true;
 // including some necessary files
 require_once '../inc/global.inc.php';
 require_once '../inc/lib/xajax/xajax.inc.php';
-require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
-require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
 
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
diff --git a/main/inc/lib/internationalization.lib.php b/main/inc/lib/internationalization.lib.php
index 063d4ac167..d76b96e0b2 100644
--- a/main/inc/lib/internationalization.lib.php
+++ b/main/inc/lib/internationalization.lib.php
@@ -548,8 +548,7 @@ function _api_get_timezone() {
     // If allowed by the administrator
     $use_users_timezone = api_get_setting('use_users_timezone', 'timezones');
     if ($use_users_timezone == 'true') {
-        // Get the timezone based on user preference, if it exists
-        require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
+        // Get the timezone based on user preference, if it exists        
         $timezone_user = UserManager::get_extra_user_data_by_field($_user['user_id'],'timezone');
         if ($timezone_user['timezone'] != null) {
             $to_timezone = $timezone_user['timezone'];
diff --git a/main/inc/local.inc.php b/main/inc/local.inc.php
index 1894551edc..d379cb6f97 100644
--- a/main/inc/local.inc.php
+++ b/main/inc/local.inc.php
@@ -280,8 +280,7 @@ if (!empty($_SESSION['_user']['user_id']) && ! ($login || $logout)) {
 				}
 
 				// Check the user's password
-				if ( ($password == $uData['password']  OR $cas_login) AND (trim($login) == $uData['username'])) {
-                    //require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php'); moved to autoload
+				if ( ($password == $uData['password']  OR $cas_login) AND (trim($login) == $uData['username'])) {                    
                     $update_type = UserManager::get_extra_user_data_by_field($uData['user_id'], 'update_type');
                     $update_type= $update_type['update_type'];
                     if (!empty($extAuthSource[$update_type]['updateUser']) && file_exists($extAuthSource[$update_type]['updateUser'])) {