diff --git a/paragraphs.module b/paragraphs.module
index 7ccfaa1..b0b7a0f 100644
--- a/paragraphs.module
+++ b/paragraphs.module
@@ -617,22 +617,14 @@ function _paragraphs_make_associative($plugin_process) {
 }
 
 /**
- * Implements hook_migrate_MIGRATION_ID_prepare_row()
-
- * @param \Drupal\migrate\Row $row
- *   The row being imported.
- * @param \Drupal\migrate\Plugin\MigrateSourceInterface $source
- *   The source migration.
- * @param \Drupal\migrate\Plugin\MigrationInterface $migration
- *   The current migration.
- *
- * @return bool
- *   FALSE if the row should be skipped.
+ * Implements hook_migrate_prepare_row().
  */
-function paragraphs_migrate_upgrade_d7_field_formatter_settings_prepare_row(Row $row, MigrateSourceInterface $source, MigrationInterface $migration) {
+function paragraphs_migrate_prepare_row(Row $row, MigrateSourceInterface $source, MigrationInterface $migration) {
   // Skip migrating field formatter settings from multifields.
   // These will need to be configured manually at "Manage Display".
-  if ($row->getSourceProperty('entity_type') == 'multifield') {
-    return FALSE;
+  if ($source->getPluginId() == 'd7_field_instance_per_view_mode') {
+    if ($row->getSourceProperty('entity_type') == 'multifield') {
+      return FALSE;
+    }
   }
 }
diff --git a/src/Plugin/migrate/field/Multifield.php b/src/Plugin/migrate/field/Multifield.php
index 17bf93a..9ba1883 100644
--- a/src/Plugin/migrate/field/Multifield.php
+++ b/src/Plugin/migrate/field/Multifield.php
@@ -54,25 +54,6 @@ class Multifield extends FieldPluginBase {
 
   /**
    * {@inheritdoc}
-   *
-   */
-  public function processFieldValues(MigrationInterface $migration, $field_name, $data) {
-    $process = [
-      'plugin' => 'multifield_lookup',
-      'entity_id_name' => 'nid',
-      'field_name'=> $field_name,
-    ];
-    $migration->setProcessOfProperty($field_name, $process);
-
-    // Add the respective multifield migration as a dependency.
-    $dependencies = $migration->getMigrationDependencies();
-    $migration_dependency = 'd7_multifield:' . substr($field_name, static::PREFIX_LENGTH);
-    $dependencies['optional'][] = $migration_dependency;
-    $migration->set('migration_dependencies', $dependencies);
-  }
-
-  /**
-   * {@inheritdoc}
    */
   public function alterFieldFormatterMigration(MigrationInterface $migration) {
     $view_mode = [
diff --git a/src/Plugin/migrate/process/MultifieldLookup.php b/src/Plugin/migrate/process/MultifieldLookup.php
index 23278c9..c86d00b 100644
--- a/src/Plugin/migrate/process/MultifieldLookup.php
+++ b/src/Plugin/migrate/process/MultifieldLookup.php
@@ -30,7 +30,7 @@ class MultifieldLookup extends ProcessPluginBase implements ContainerFactoryPlug
   protected $storage;
 
   /**
-   * EntityExists constructor.
+   * MultifieldLookup constructor.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
diff --git a/src/Plugin/migrate/source/d7/MultifieldItem.php b/src/Plugin/migrate/source/d7/MultifieldItem.php
index 9792106..c3b192d 100644
--- a/src/Plugin/migrate/source/d7/MultifieldItem.php
+++ b/src/Plugin/migrate/source/d7/MultifieldItem.php
@@ -9,7 +9,7 @@ use Drupal\paragraphs\Plugin\migrate\field\Multifield;
  * Multifield Item source plugin.
  *
  * Available configuration keys:
- * - field_name: (optional) If supplied, this will only return field collections
+ * - field_name: (optional) If supplied, this will only return multifields
  *   of that particular type.
  *
  * @MigrateSource(
@@ -56,9 +56,9 @@ class MultifieldItem extends FieldableEntity {
 
     $fields = $this->getSubfields($this->configuration['field_name']);
     // Here I found a way to figure out the structure of each sub-field.
-    // They are of the form parent_field_name + _ + sub_field_name + _ + suffix such as target_id or value.
-    // There must be an easier way to figure out the above but this is what
-    // I found.
+    // They are of the form parent_field_name + _ + sub_field_name + _ + suffix
+    // such as target_id or value. There must be an easier way to figure out
+    // the above but this is what I found.
     foreach ($fields as $field_name => $field_config) {
       $field_value_suffix = key($field_config['data']['indexes']);
       $field_value = $row->getSourceProperty($this->configuration['field_name'] . '_' . $field_name . '_' . $field_value_suffix);
diff --git a/src/Plugin/migrate/source/d7/MultifieldType.php b/src/Plugin/migrate/source/d7/MultifieldType.php
index 57577f0..a6c409d 100644
--- a/src/Plugin/migrate/source/d7/MultifieldType.php
+++ b/src/Plugin/migrate/source/d7/MultifieldType.php
@@ -9,10 +9,6 @@ use Drupal\paragraphs\Plugin\migrate\source\DrupalSqlBase;
 /**
  * Multifield Type source plugin.
  *
- * Available configuration keys:
- * - add_description: (bool) (optional) If enabled this will add a default
- *   description to the source data. default:FALSE.
- *
  * @MigrateSource(
  *   id = "d7_multifield_type",
  *   source_module = "multifield"
@@ -23,15 +19,6 @@ class MultifieldType extends DrupalSqlBase {
   /**
    * {@inheritdoc}
    */
-  public function defaultConfiguration() {
-    return [
-      'add_description' => FALSE,
-    ] + parent::defaultConfiguration();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function query() {
     $query = $this->select('field_config', 'fc')
       ->fields('fc');
@@ -87,28 +74,4 @@ class MultifieldType extends DrupalSqlBase {
     return $ids;
   }
 
-  /**
-   * {@inheritdoc}
-   *
-   * @deprecated addDescription configuration key is deprecated in 8.x-1.0 and
-   * will be removed prior to 9.x.  Use add_description instead.
-   *
-   * @see https://www.drupal.org/project/paragraphs/issues/2911242
-   */
-  public function setConfiguration(array $configuration) {
-
-    // Configuration keys should be snake_case, not CamelCase. Adding a BC
-    // layer for addDescription which should be deprecated.
-    if (isset($configuration['addDescription'])) {
-      @trigger_error("addDescription configuration key is deprecated in 8.x-1.0 and will be removed prior to 9.x.  Use add_description instead. See https://www.drupal.org/project/paragraphs/issues/2911242",
-        E_USER_DEPRECATED);
-      if (!isset($configuration['add_description'])) {
-        $configuration['add_description'] = $configuration['addDescription'];
-      }
-      unset($configuration['addDescription']);
-    }
-
-    parent::setConfiguration($configuration);
-  }
-
 }