diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 5ee4354..4b55e32 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -15,10 +15,8 @@
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Config\Config;
 use Drupal\Core\Config\StorageException;
-use Drupal\Core\Extension\ThemeHandler;
 use Drupal\Core\Render\RenderableInterface;
 use Drupal\Core\Template\Attribute;
-use Drupal\Core\Theme\ThemeFeatures;
 use Drupal\Core\Theme\ThemeSettings;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Render\Element;
@@ -100,7 +98,7 @@ function theme_get_registry($complete = TRUE) {
  *
  * @see \Drupal\Core\Theme\ThemeSettings::defaults()
  *
- * @deprecated in Drupal 8.0.x, will be removed before Drupal 9.0.0.
+ * @deprecated in Drupal 8.2.x, will be removed before Drupal 9.0.0.
  *   Use \Drupal\Core\Theme\ThemeSettings::defaults() instead.
  */
 function _system_default_theme_features() {
diff --git a/core/lib/Drupal/Core/Extension/ThemeHandler.php b/core/lib/Drupal/Core/Extension/ThemeHandler.php
index 794f963..3be02e7 100644
--- a/core/lib/Drupal/Core/Extension/ThemeHandler.php
+++ b/core/lib/Drupal/Core/Extension/ThemeHandler.php
@@ -4,7 +4,6 @@
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\State\StateInterface;
-use Drupal\Core\Theme\ThemeFeatures;
 use Drupal\Core\Theme\ThemeSettings;
 
 /**