diff --git a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
index 74008b7..6ecf3d3 100644
--- a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
+++ b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php
@@ -5,7 +5,7 @@
  * Contains \Drupal\migrate\Plugin\migrate\destination\EntityFile.
  */
 
-namespace Drupal\migrate\Plugin\migrate\destination;
+namespace Drupal\file\Plugin\migrate\destination;
 
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
@@ -13,7 +13,6 @@
 use Drupal\Core\StreamWrapper\LocalStream;
 use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
 use Drupal\migrate\Entity\MigrationInterface;
-use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
 use Drupal\migrate\Row;
 use Drupal\migrate\MigrateException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
diff --git a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php.rej b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php.rej
deleted file mode 100644
index 486ecb2..0000000
--- a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php.rej
+++ /dev/null
@@ -1,14 +0,0 @@
-diff a/core/modules/file/src/Plugin/migrate/destination/EntityFile.php b/core/modules/file/src/Plugin/migrate/destination/EntityFile.php	(rejected hunks)
-@@ -2,10 +2,10 @@
- 
- /**
-  * @file
-- * Contains \Drupal\migrate\Plugin\migrate\destination\EntityFile.
-+ * Contains \Drupal\file\Plugin\migrate\destination\EntityFile.
-  */
- 
--namespace Drupal\migrate\Plugin\migrate\destination;
-+namespace Drupal\file\Plugin\migrate\destination;
- 
- use Drupal\Component\Utility\SafeMarkup;
- use Drupal\Core\Entity\EntityManagerInterface;