diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php
index 0651565d5..9451f075d 100644
--- a/modules/backend/ServiceProvider.php
+++ b/modules/backend/ServiceProvider.php
@@ -1,8 +1,6 @@
 <?php namespace Backend;
 
 use App;
-use Lang;
-use Event;
 use Backend;
 use BackendMenu;
 use BackendAuth;
diff --git a/modules/backend/traits/CollapsableWidget.php b/modules/backend/traits/CollapsableWidget.php
index 060c9bdac..f163e5827 100644
--- a/modules/backend/traits/CollapsableWidget.php
+++ b/modules/backend/traits/CollapsableWidget.php
@@ -1,11 +1,6 @@
 <?php namespace Backend\Traits;
 
-use Str;
-use File;
-use Lang;
 use Input;
-use Block;
-use SystemException;
 
 /**
  * Collapsable Widget Trait
@@ -46,13 +41,13 @@ trait CollapsableWidget
         $this->putSession('groups', $statuses);
     }
 
-    protected function getGroupStatus($group)
+    protected function getGroupStatus($group, $default = true)
     {
         $statuses = $this->getGroupStatuses();
         if (array_key_exists($group, $statuses)) {
             return $statuses[$group];
         }
 
-        return true;
+        return $default;
     }
 }
diff --git a/modules/backend/traits/InspectableContainer.php b/modules/backend/traits/InspectableContainer.php
index a3b5f5c70..62ddb6295 100644
--- a/modules/backend/traits/InspectableContainer.php
+++ b/modules/backend/traits/InspectableContainer.php
@@ -1,7 +1,6 @@
 <?php namespace Backend\Traits;
 
 use Request;
-use SystemException;
 use ApplicationException;
 
 /**
diff --git a/modules/backend/traits/SearchableWidget.php b/modules/backend/traits/SearchableWidget.php
index 872c4c3f3..5c1866eea 100644
--- a/modules/backend/traits/SearchableWidget.php
+++ b/modules/backend/traits/SearchableWidget.php
@@ -1,10 +1,6 @@
 <?php namespace Backend\Traits;
 
 use Str;
-use File;
-use Lang;
-use Block;
-use SystemException;
 
 /**
  * Searchable Widget Trait
diff --git a/modules/backend/traits/SelectableWidget.php b/modules/backend/traits/SelectableWidget.php
index 5326c4d64..93fe23779 100644
--- a/modules/backend/traits/SelectableWidget.php
+++ b/modules/backend/traits/SelectableWidget.php
@@ -1,11 +1,6 @@
 <?php namespace Backend\Traits;
 
-use Str;
-use File;
-use Lang;
 use Input;
-use Block;
-use SystemException;
 
 /**
  * Selectable Widget Trait
diff --git a/modules/backend/traits/WidgetMaker.php b/modules/backend/traits/WidgetMaker.php
index ff6fee6ce..6337637e5 100644
--- a/modules/backend/traits/WidgetMaker.php
+++ b/modules/backend/traits/WidgetMaker.php
@@ -2,7 +2,6 @@
 
 use Lang;
 use Backend\Classes\FormField;
-use Backend\Classes\WidgetManager;
 use SystemException;
 
 /**
diff --git a/modules/cms/widgets/ComponentList.php b/modules/cms/widgets/ComponentList.php
index 2362489bd..6abffbd0b 100644
--- a/modules/cms/widgets/ComponentList.php
+++ b/modules/cms/widgets/ComponentList.php
@@ -3,9 +3,6 @@
 use Str;
 use Lang;
 use Input;
-use Request;
-use Response;
-use Cms\Classes\Theme;
 use System\Classes\PluginManager;
 use Cms\Classes\ComponentHelpers;
 use Backend\Classes\WidgetBase;
@@ -18,9 +15,9 @@ use Backend\Classes\WidgetBase;
  */
 class ComponentList extends WidgetBase
 {
-    protected $searchTerm = false;
+    use \Backend\Traits\CollapsableWidget;
 
-    protected $groupStatusCache = false;
+    protected $searchTerm = false;
 
     protected $pluginComponentList;
 
@@ -61,11 +58,6 @@ class ComponentList extends WidgetBase
         return $this->updateList();
     }
 
-    public function onGroupStatusUpdate()
-    {
-        $this->setGroupStatus(Input::get('group'), Input::get('status'));
-    }
-
     /*
      * Methods for th internal use
      */
@@ -262,37 +254,4 @@ class ComponentList extends WidgetBase
 
         return false;
     }
-
-    protected function getGroupStatuses()
-    {
-        if ($this->groupStatusCache !== false) {
-            return $this->groupStatusCache;
-        }
-
-        $groups = $this->getSession('groups');
-        if (!is_array($groups)) {
-            return $this->groupStatusCache = [];
-        }
-
-        return $this->groupStatusCache = $groups;
-    }
-
-    protected function setGroupStatus($group, $status)
-    {
-        $statuses = $this->getGroupStatuses();
-        $statuses[$group] = $status;
-        $this->groupStatusCache = $statuses;
-
-        $this->putSession('groups', $statuses);
-    }
-
-    protected function getGroupStatus($group)
-    {
-        $statuses = $this->getGroupStatuses();
-        if (array_key_exists($group, $statuses)) {
-            return $statuses[$group];
-        }
-
-        return false;
-    }
 }
diff --git a/modules/cms/widgets/componentlist/partials/_items.htm b/modules/cms/widgets/componentlist/partials/_items.htm
index a182623a7..003e79f28 100644
--- a/modules/cms/widgets/componentlist/partials/_items.htm
+++ b/modules/cms/widgets/componentlist/partials/_items.htm
@@ -1,7 +1,7 @@
 <?php if ($items): ?>
     <ul>
     <?php foreach ($items as $item): ?>
-        <li class="group" data-status="<?= $this->getGroupStatus($item->pluginClass) ? 'expanded' : 'collapsed' ?>" data-group-id="<?= e($item->pluginClass) ?>">
+        <li class="group" data-status="<?= $this->getGroupStatus($item->pluginClass, false) ? 'expanded' : 'collapsed' ?>" data-group-id="<?= e($item->pluginClass) ?>">
             <div class="group">
                 <h4><a href="#"><?= e(trans($item->title)) ?></a></h4>
                 <i class="<?= $item->icon ?>"></i>