diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php
index 1e4a99a8a..59a1effa1 100644
--- a/modules/backend/ServiceProvider.php
+++ b/modules/backend/ServiceProvider.php
@@ -151,54 +151,18 @@ class ServiceProvider extends ModuleServiceProvider
     protected function registerBackendWidgets()
     {
         WidgetManager::instance()->registerFormWidgets(function ($manager) {
-            $manager->registerFormWidget('Backend\FormWidgets\CodeEditor', [
-                'label' => 'Code editor',
-                'code'  => 'codeeditor'
-            ]);
-            $manager->registerFormWidget('Backend\FormWidgets\RichEditor', [
-                'label' => 'Rich editor',
-                'code'  => 'richeditor'
-            ]);
-            $manager->registerFormWidget('Backend\FormWidgets\MarkdownEditor', [
-                'label' => 'Markdown editor',
-                'code'  => 'markdown'
-            ]);
-            $manager->registerFormWidget('Backend\FormWidgets\FileUpload', [
-                'label' => 'File uploader',
-                'code'  => 'fileupload'
-            ]);
-            $manager->registerFormWidget('Backend\FormWidgets\Relation', [
-                'label' => 'Relationship',
-                'code'  => 'relation'
-            ]);
-            $manager->registerFormWidget('Backend\FormWidgets\DatePicker', [
-                'label' => 'Date picker',
-                'code'  => 'datepicker'
-            ]);
-            $manager->registerFormWidget('Backend\FormWidgets\TimePicker', [
-                'label' => 'Time picker',
-                'code'  => 'timepicker'
-            ]);
-            $manager->registerFormWidget('Backend\FormWidgets\ColorPicker', [
-                'label' => 'Color picker',
-                'code'  => 'colorpicker'
-            ]);
-            $manager->registerFormWidget('Backend\FormWidgets\DataTable', [
-                'label' => 'Data Table',
-                'code'  => 'datatable'
-            ]);
-            $manager->registerFormWidget('Backend\FormWidgets\RecordFinder', [
-                'label' => 'Record Finder',
-                'code'  => 'recordfinder'
-            ]);
-            $manager->registerFormWidget('Backend\FormWidgets\Repeater', [
-                'label' => 'Repeater',
-                'code'  => 'repeater'
-            ]);
-            $manager->registerFormWidget('Backend\FormWidgets\TagList', [
-                'label' => 'Tag List',
-                'code'  => 'taglist'
-            ]);
+            $manager->registerFormWidget('Backend\FormWidgets\CodeEditor', 'codeeditor');
+            $manager->registerFormWidget('Backend\FormWidgets\RichEditor', 'richeditor');
+            $manager->registerFormWidget('Backend\FormWidgets\MarkdownEditor', 'markdown');
+            $manager->registerFormWidget('Backend\FormWidgets\FileUpload', 'fileupload');
+            $manager->registerFormWidget('Backend\FormWidgets\Relation', 'relation');
+            $manager->registerFormWidget('Backend\FormWidgets\DatePicker', 'datepicker');
+            $manager->registerFormWidget('Backend\FormWidgets\TimePicker', 'timepicker');
+            $manager->registerFormWidget('Backend\FormWidgets\ColorPicker', 'colorpicker');
+            $manager->registerFormWidget('Backend\FormWidgets\DataTable', 'datatable');
+            $manager->registerFormWidget('Backend\FormWidgets\RecordFinder', 'recordfinder');
+            $manager->registerFormWidget('Backend\FormWidgets\Repeater', 'repeater');
+            $manager->registerFormWidget('Backend\FormWidgets\TagList', 'taglist');
         });
     }
 
diff --git a/modules/backend/classes/WidgetManager.php b/modules/backend/classes/WidgetManager.php
index b0f64a5d1..5240a2369 100644
--- a/modules/backend/classes/WidgetManager.php
+++ b/modules/backend/classes/WidgetManager.php
@@ -98,6 +98,10 @@ class WidgetManager
      */
     public function registerFormWidget($className, $widgetInfo = null)
     {
+        if (!is_array($widgetInfo)) {
+            $widgetInfo = ['code' => $widgetInfo];
+        }
+
         $widgetCode = isset($widgetInfo['code']) ? $widgetInfo['code'] : null;
 
         if (!$widgetCode) {
diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php
index b4c990e03..f163a2562 100644
--- a/modules/cms/ServiceProvider.php
+++ b/modules/cms/ServiceProvider.php
@@ -245,10 +245,7 @@ class ServiceProvider extends ModuleServiceProvider
     {
         WidgetManager::instance()->registerFormWidgets(function ($manager) {
             $manager->registerFormWidget('Cms\FormWidgets\Components');
-            $manager->registerFormWidget('Cms\FormWidgets\MediaFinder', [
-                'label' => 'cms::lang.mediafinder.label',
-                'code'  => 'mediafinder'
-            ]);
+            $manager->registerFormWidget('Cms\FormWidgets\MediaFinder', 'mediafinder');
         });
     }
 
diff --git a/modules/cms/widgets/ComponentList.php b/modules/cms/widgets/ComponentList.php
index 2fc38cb52..8c0486004 100644
--- a/modules/cms/widgets/ComponentList.php
+++ b/modules/cms/widgets/ComponentList.php
@@ -41,13 +41,6 @@ class ComponentList extends WidgetBase
         ]);
     }
 
-    /**
-     * Returns information about this widget, including name and description.
-     */
-    public function widgetDetails()
-    {
-    }
-
     /*
      * Event handlers
      */