diff --git a/docs/en/04_defining-you-own-elements.md b/docs/en/04_defining-you-own-elements.md
index fb52099e..c5c5b37e 100644
--- a/docs/en/04_defining-you-own-elements.md
+++ b/docs/en/04_defining-you-own-elements.md
@@ -22,7 +22,7 @@ class MyElement extends BaseElement
 
     private static $plural_name = 'my elements';
 
-    private static $description = 'What my custom element does';
+    private static $class_description = 'What my custom element does';
 
     public function getCMSFields()
     {
diff --git a/src/Models/BaseElement.php b/src/Models/BaseElement.php
index 8e79c45b..867ac208 100644
--- a/src/Models/BaseElement.php
+++ b/src/Models/BaseElement.php
@@ -60,13 +60,7 @@ class BaseElement extends DataObject implements CMSPreviewable
 
     /**
      * Describe the purpose of this element
-     *
-     * @config
-     * @var string
-     * @deprecated 5.4.0 use class_description instead.
      */
-    private static $description = 'Base element class';
-
     private static $class_description = 'Base element class';
 
     /**
@@ -1122,10 +1116,7 @@ public function getIcon()
      */
     public function getTypeNice()
     {
-        $description = $this->config()->uninherited('description');
-        if ($description) {
-            $description = _t(__CLASS__ . '.Description', $description);
-        }
+        $description = $this->i18n_classDescription();
         $markup = ($description) ? ' <span class="element__note"> &mdash; ' . $description . '</span>' : '';
 
         return DBField::create_field(
diff --git a/src/Models/ElementContent.php b/src/Models/ElementContent.php
index ffbcb038..e79a31be 100644
--- a/src/Models/ElementContent.php
+++ b/src/Models/ElementContent.php
@@ -23,11 +23,6 @@ class ElementContent extends BaseElement
 
     private static $plural_name = 'content blocks';
 
-    /**
-     * @deprecated 5.4.0 use class_description instead.
-     */
-    private static $description = 'HTML text block';
-
     private static $class_description = 'HTML text block';
 
     /**