diff --git a/html/class_passwordRecovery.inc b/html/class_passwordRecovery.inc
index 1b8c818d6975615428fe22976bea6de2734d095e..2cae64e1539ee61aa19e1ea6d91fde2cb8732673 100644
--- a/html/class_passwordRecovery.inc
+++ b/html/class_passwordRecovery.inc
@@ -98,7 +98,7 @@ class standAlonePage {
       Language::init();
 
       if (session::is_set('plist')) {
-        session::global_un_set('plist');
+        session::un_set('plist');
       }
       $ui = new fake_userinfo();
       load_plist();
diff --git a/html/index.php b/html/index.php
index 16d9fdeb410d547ba2f2b9093cfb13ed82c151d8..5a53e3d530b3fe1ae7510ecd8637a7777959c17f 100644
--- a/html/index.php
+++ b/html/index.php
@@ -328,7 +328,7 @@ class Index {
 
     /* We need a fully loaded plist and config to test account expiration */
     if (!$plistReloaded) {
-      session::global_un_set('plist');
+      session::un_set('plist');
     }
     $plist = load_plist();
 
diff --git a/include/class_Language.inc b/include/class_Language.inc
index 69c8e7155ca1b253a5907cef432efd1ec09e8d33..bd99cb24306f3cd623fa2292184c9ab228579705 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -72,7 +72,7 @@ class Language
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
           @DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, session::get('lang'), 'Plist already loaded with language');
         }
-        session::global_un_set('plist');
+        session::un_set('plist');
         session::set('lang', $lang);
         load_plist();
       }
diff --git a/include/class_config.inc b/include/class_config.inc
index 921532a76236518557b4a329411ed9ce8e2ef562..1585daca94fc19de1da19e25d7dc70f6386bf33a 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -98,7 +98,7 @@ class config
     $tmp = stat(CACHE_DIR.'/'.CLASS_CACHE);
     if (session::is_set('class_location.inc:timestamp')) {
       if ($tmp['mtime'] != session::get('class_location.inc:timestamp')) {
-        session::global_un_set('plist');
+        session::un_set('plist');
       }
     }
     session::set('class_location.inc:timestamp', $tmp['mtime']);
diff --git a/include/class_session.inc b/include/class_session.inc
index ca01b13e297780bf9ba071bfde2aee548ce64d28..58896ffdf10ffcf3e0ee9f84f8aa3b4cf4f2d34c 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -102,15 +102,11 @@ class session {
   }
 
   /*!
-   * \brief Delete a session
-   *
-   * \param string $name Name of the session to delete
+   * \brief Deprecated
    */
   public static function delete($name)
   {
-    if (isset($_SESSION[$name])) {
-      unset($_SESSION[$name]);
-    }
+    return static::un_set($name);
   }
 
   /*!
@@ -118,7 +114,7 @@ class session {
    */
   public static function global_delete($name)
   {
-    static::delete($name);
+    return static::un_set($name);
   }
 
   /*!
@@ -128,17 +124,17 @@ class session {
    */
   public static function un_set($name)
   {
-    return static::delete($name);
+    if (isset($_SESSION[$name])) {
+      unset($_SESSION[$name]);
+    }
   }
 
   /*!
-   * \brief Unset a session
-   *
-   * \param string $name Name of the session to delete
+   * \brief Deprecated
    */
   public static function global_un_set($name)
   {
-    return static::global_delete($name);
+    return static::un_set($name);
   }
 
   /*!
diff --git a/plugins/config/tabs_configInLdap.inc b/plugins/config/tabs_configInLdap.inc
index 6c2f009633bfba6a1727369257e12f62e31a0269..0df3024dc8f2eacd739dbf01b09d7cfce16372a8 100644
--- a/plugins/config/tabs_configInLdap.inc
+++ b/plugins/config/tabs_configInLdap.inc
@@ -28,7 +28,7 @@ class tabs_configInLdap extends simpleTabs
     /* check_and_reload */
     $config->check_and_reload(TRUE);
     /* reload plist as well as some plInfo might use $config or get_ou */
-    session::global_un_set('plist');
+    session::un_set('plist');
     load_plist();
     session::un_set('passwordMethod::get_available_methods');
 
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index fa5ce22466bf027cedd7456e5e2c38d8419e66a9..6d90d8a69ff91630520299eba53b5f07493ff195 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -293,7 +293,7 @@ class setup
     $xml = $smarty->fetch(CONFIG_TEMPLATE_DIR.CONFIG_FILE);
     $config->parse_data($xml);
     $config->set_current($config->data['MAIN']['DEFAULT']);
-    session::global_un_set('plist');
+    session::un_set('plist');
     load_plist();
     $this->reBuildConfigStep();
   }
@@ -311,4 +311,3 @@ class setup
     }
   }
 }
-?>
diff --git a/setup/class_setupStepConfig.inc b/setup/class_setupStepConfig.inc
index d5b4dda35b5fdde071ce90516835474c3ab69548..a62e80c6e194c7ddf365a9059c4c9e7cd9dde5ef 100644
--- a/setup/class_setupStepConfig.inc
+++ b/setup/class_setupStepConfig.inc
@@ -119,7 +119,7 @@ class setupStepConfig extends configInLdap
       }
       /* Reload config from LDAP */
       $config->set_current($config->current['NAME']);
-      session::global_un_set('plist');
+      session::un_set('plist');
       load_plist();
       $this->is_completed = TRUE;
       $this->parent->reBuildConfigStep(TRUE);