diff --git a/html/main.php b/html/main.php
index aa345adc65b7fbd30d56130760f5cbf60bfdf12a..62d894212265f383566b9265b4509a02d07e0b51 100644
--- a/html/main.php
+++ b/html/main.php
@@ -249,23 +249,6 @@ $focus .= '</script>';
 $smarty->assign('focus',      $focus);
 $smarty->assign('CSRFtoken',  CSRFProtection::getToken());
 
-/* Set channel if needed */
-//TODO: * move all global session calls to global_
-//      * create a new channel where needed (mostly management dialogues)
-//      * remove regulary created channels when not needed anymore
-//      * take a look at external php calls (i.e. get fax, ldif, etc.)
-//      * handle aborted sessions (by pressing anachors i.e. Main, Menu, etc.)
-//      * check lock removals, is "dn" global or not in this case?
-//      * last page request -> global or not?
-//      * check that filters are still global
-//      * maxC global?
-if (isset($_POST['_channel_'])) {
-  echo "DEBUG - current channel: ".$_POST['_channel_'];
-  $smarty->assign("channel", $_POST['_channel_']);
-} else {
-  $smarty->assign("channel", "");
-}
-
 if (class_available('Game')) {
   $smarty->assign('game_screen', Game::run());
 } else {
diff --git a/ihtml/themes/breezy/framework.tpl b/ihtml/themes/breezy/framework.tpl
index a23d0920f11b2081ecb55c8861e49236315ebc0f..474dd383f48039ad7d867173febda2730a5460d4 100644
--- a/ihtml/themes/breezy/framework.tpl
+++ b/ihtml/themes/breezy/framework.tpl
@@ -44,9 +44,6 @@
             <div class="plugin-window">
               {$contents}
             </div>
-            {if $channel != ""}
-                <input type="hidden" name="_channel_" value="{$channel}"/>
-            {/if}
           </td>
         </tr>
       </tbody>
diff --git a/include/class_session.inc b/include/class_session.inc
index 1b7863f791689bb58b5de9850d678de7fa91afe9..1bf2119012ef219ca891722ab0f57ef2a6403fcb 100644
--- a/include/class_session.inc
+++ b/include/class_session.inc
@@ -2,7 +2,7 @@
 /*
   This code is part of FusionDirectory (http://www.fusiondirectory.org/)
   Copyright (C) 2003-2010  Cajus Pollmeier
-  Copyright (C) 2011-2016  FusionDirectory
+  Copyright (C) 2011-2019  FusionDirectory
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -36,34 +36,15 @@ class session
    */
   public static function is_set ($name)
   {
-    $channel = "";
-    if (isset($_POST['_channel_'])) {
-      $channel = $_POST['_channel_'];
-    }
-
-    /* Global fallback if not set */
-    if ($channel == "") {
-      return isset($_SESSION[$name]);
-    }
-
-    /* Sanity check */
-    if (!session::channel_exists($channel)) {
-      msg_dialog::display(_("Internal error"), _("Requested channel does not exist! Please contact your Administrator."), FATAL_ERROR_DIALOG);
-      exit;
-    }
-
-    $channel = "gch_".$channel;
-    return isset($_SESSION[$channel][$name]);
+    return isset($_SESSION[$name]);
   }
 
   /*!
-   * \brief Check if a session is defined
-   *
-   * \param string $name Name of the session
+   * \brief Deprecated
    */
   public static function global_is_set ($name)
   {
-    return isset($_SESSION[$name]);
+    return static::is_set($name);
   }
 
   /*!
@@ -75,34 +56,15 @@ class session
    */
   public static function set ($name, $value)
   {
-    $channel = "";
-    if (isset($_POST['_channel_'])) {
-      $channel = $_POST['_channel_'];
-    }
-
-    /* Global fallback if not set */
-    if ($channel == "") {
-      $_SESSION[$name] = $value;
-    } else {
-      /* Sanity check */
-      if (!session::channel_exists($channel)) {
-        msg_dialog::display(_("Internal error"), _("Requested channel does not exist! Please contact your Administrator."), FATAL_ERROR_DIALOG);
-        exit;
-      }
-      $_SESSION[$channel][$name] = $value;
-    }
+    $_SESSION[$name] = $value;
   }
 
   /*!
-   * \brief Set a value in a session
-   *
-   * \param string $name Name of the session
-   *
-   * \param $value The new value
+   * \brief Deprecated
    */
   public static function global_set ($name, $value)
   {
-    $_SESSION[$name] = $value;
+    static::set($name, $value);
   }
 
   /*!
@@ -112,23 +74,7 @@ class session
    */
   public static function &get ($name)
   {
-    $channel = "";
-    if (isset($_POST['_channel_'])) {
-      $channel = $_POST['_channel_'];
-    }
-
-    /* Global fallback if not set */
-    if ($channel == '') {
-      return $_SESSION[$name];
-    }
-
-    /* Sanity check */
-    if (!session::channel_exists($channel)) {
-      msg_dialog::display(_("Internal error"), _("Requested channel does not exist! Please contact your Administrator."), FATAL_ERROR_DIALOG);
-      exit;
-    }
-
-    return $_SESSION['gch_'.$channel][$name];
+    return $_SESSION[$name];
   }
 
   /*!
@@ -162,33 +108,17 @@ class session
    */
   public static function delete ($name)
   {
-    $channel = "";
-    if (isset($_POST['_channel_'])) {
-      $channel = $_POST['_channel_'];
-    }
-
-    /* Global fallback if not set */
-    if ($channel == "") {
-      if (isset($_SESSION[$name])) {
-        unset($_SESSION[$name]);
-      }
-    } else {
-      if (isset($_SESSION[$channel][$name])) {
-        unset($_SESSION[$channel][$name]);
-      }
+    if (isset($_SESSION[$name])) {
+      unset($_SESSION[$name]);
     }
   }
 
   /*!
-   * \brief Delete a session
-   *
-   * \param string $name Name of the session to delete
+   * \brief Deprecated
    */
   public static function global_delete ($name)
   {
-    if (isset($_SESSION[$name])) {
-      unset($_SESSION[$name]);
-    }
+    static::delete($name);
   }
 
   /*!
@@ -198,7 +128,7 @@ class session
    */
   public static function un_set ($name)
   {
-    return session::delete($name);
+    return static::delete($name);
   }
 
   /*!
@@ -208,7 +138,7 @@ class session
    */
   public static function global_un_set ($name)
   {
-    return session::global_delete($name);
+    return static::global_delete($name);
   }
 
   /*!