diff --git a/include/class_Language.inc b/include/class_Language.inc
index f6e7b304b46ce146d628d67c8f8205bad44b1864..773943771892f1ac190294bc6405a3d126661e94 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);
         pluglist::load();
       }
diff --git a/include/class_config.inc b/include/class_config.inc
index 0c9d2d748faf9cbcb76e3bc1816c6142f2373a26..fdf99e775e1e5252afb6121d52bcc05ef9bc04a9 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -97,7 +97,7 @@ class config
     $tmp = stat(CACHE_DIR.'/'.CLASS_CACHE);
     if (session::is_set('class_location.inc:timestamp')
       && ($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 b32c6e59145a05cd7f15092fe36467a1d4c4312f..033da8ed26ebc83ff39d0c569586b6dbdc2b6f76 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/include/login/class_LoginMethod.inc b/include/login/class_LoginMethod.inc
index 1e5b7a04ed60886adb8aa0773c28cd827a46b70e..406c31e4f52f7cdba815ce47f1dc66c4cf945d1c 100644
--- a/include/login/class_LoginMethod.inc
+++ b/include/login/class_LoginMethod.inc
@@ -126,7 +126,7 @@ class LoginMethod
 
     /* We need a fully loaded plist and config to test account expiration */
     if (!$plistReloaded) {
-      session::global_un_set('plist');
+      session::un_set('plist');
     }
     pluglist::load();
 
diff --git a/plugins/config/tabs_configInLdap.inc b/plugins/config/tabs_configInLdap.inc
index 7ba0f1f61127f1a31e87e00c1060fd4c714d1254..19603f69f4570fe4236aadafae95f6e0e0e0fe85 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');
     pluglist::load();
     session::un_set('passwordMethod::get_available_methods');
 
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 142141c28597105462d2c9141edec2577544ce6a..a65d218320cea1ae1c2177ff6c286f33282e4f6b 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -274,7 +274,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');
     pluglist::load();
     $this->reBuildConfigStep();
   }
diff --git a/setup/class_setupStepConfig.inc b/setup/class_setupStepConfig.inc
index b9db000c2fabb5568c319b0a765a5e0a02a67d1a..c6234de0aeb6b2bb563f621372207c3a04100dc6 100644
--- a/setup/class_setupStepConfig.inc
+++ b/setup/class_setupStepConfig.inc
@@ -121,7 +121,7 @@ class setupStepConfig extends configInLdap
       }
       /* Reload config from LDAP */
       $config->set_current($config->current['NAME']);
-      session::global_un_set('plist');
+      session::un_set('plist');
       pluglist::load();
       $this->is_completed = TRUE;
       $this->parent->reBuildConfigStep(TRUE);