diff --git a/core/modules/file/lib/Drupal/file/Plugin/field/field_type/FileField.php b/core/modules/file/lib/Drupal/file/Plugin/field/field_type/FileField.php
index 273ddb7..6c95619 100644
--- a/core/modules/file/lib/Drupal/file/Plugin/field/field_type/FileField.php
+++ b/core/modules/file/lib/Drupal/file/Plugin/field/field_type/FileField.php
@@ -17,6 +17,11 @@ class FileField extends ConfigField {
   /**
    * {@inheritdoc}
    */
+  public function defaultValuesForm(array &$form, array &$form_state) { }
+
+  /**
+   * {@inheritdoc}
+   */
   public function update() {
     parent::update();
     $this->updateFileUsage();
diff --git a/core/modules/file/lib/Drupal/file/Type/FileField.php b/core/modules/file/lib/Drupal/file/Type/FileField.php
deleted file mode 100644
index 3666238..0000000
--- a/core/modules/file/lib/Drupal/file/Type/FileField.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\file\Type\FileField.
- */
-
-namespace Drupal\file\Type;
-
-use Drupal\field\Plugin\field\field_type\LegacyConfigField;
-
-/**
- * Represents a configurable entity file field.
- */
-class FileField extends LegacyConfigField {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultValuesForm(array &$form, array &$form_state) { }
-
-}
diff --git a/core/modules/image/lib/Drupal/image/Type/ImageField.php b/core/modules/image/lib/Drupal/image/Type/ImageField.php
deleted file mode 100644
index aea434b..0000000
--- a/core/modules/image/lib/Drupal/image/Type/ImageField.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\image\Type\ImageField.
- */
-
-namespace Drupal\image\Type;
-
-use Drupal\field\Plugin\field\field_type\LegacyConfigField;
-
-/**
- * Represents a configurable entity image field.
- */
-class ImageField extends LegacyConfigField {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function defaultValuesForm(array &$form, array &$form_state) { }
-
-}