diff --git a/default_content_extra.services.yml b/default_content_extra.services.yml
index 73d32e5..3b4d204 100644
--- a/default_content_extra.services.yml
+++ b/default_content_extra.services.yml
@@ -4,7 +4,3 @@ services:
     tags:
     - { name: normalizer, priority: 50 }
     arguments: ['@hal.link_manager', '@entity.manager', '@module_handler', '@config.factory']
-  default_content_exta.default_content_import_subscriber:
-    class: Drupal\default_content_extra\EventSubscriber\DefaultContentImportSubscriber
-    tags:
-      - { name: 'event_subscriber'}
\ No newline at end of file
diff --git a/drush/default_content_extra.drush.inc b/drush/default_content_extra.drush.inc
index 1c79feb..210adaf 100644
--- a/drush/default_content_extra.drush.inc
+++ b/drush/default_content_extra.drush.inc
@@ -28,4 +28,15 @@ function drush_default_content_extra_post_default_content_export_references($ent
       }
     }
   }
+
+  // Delete all exported workspaces.
+  $dir_path = $folder . '/workspace/';
+  if ($dir_path) {
+    $files = glob($dir_path . '*', GLOB_MARK);
+    foreach ($files as $file) {
+      unlink($file);
+    }
+    rmdir($dir_path);
+    drush_log(dt('Deleted @path.', ['@path' => $dir_path]), 'ok');
+  }
 }
diff --git a/src/EventSubscriber/DefaultContentImportSubscriber.php b/src/EventSubscriber/DefaultContentImportSubscriber.php
deleted file mode 100644
index 02de7e4..0000000
--- a/src/EventSubscriber/DefaultContentImportSubscriber.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\default_content_extra\EventSubscriber;
-
-use Drupal\default_content\Event\DefaultContentEvents;
-use Drupal\default_content\Event\ImportEvent;
-use Drupal\multiversion\Entity\WorkspaceInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-
-/**
- * Class DefaultContentImportSubscriber.
- */
-class DefaultContentImportSubscriber implements EventSubscriberInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function getSubscribedEvents() {
-    $events[DefaultContentEvents::IMPORT][] = ['removeDuplicateWorkspaces'];
-    return $events;
-  }
-
-  /**
-   * Deletes "live" and "stage" workspaces on import.
-   *
-   * These are created by Multiversion and Workspace module on install and
-   * this will remove workspace duplication and SQL errors.
-   *
-   * @param \Drupal\default_content\Event\ImportEvent $event
-   *   Import Event.
-   */
-  public function removeDuplicateWorkspaces(ImportEvent $event) {
-    foreach ($event->getImportedEntities() as $importedEntity) {
-      if (($importedEntity instanceof WorkspaceInterface) && in_array($importedEntity->machine_name->value, ['live', 'stage'])) {
-        $importedEntity->delete();
-      }
-    }
-  }
-
-}
diff --git a/src/Normalizer/NodeEntityNormalizer.php b/src/Normalizer/NodeEntityNormalizer.php
index 5e161d0..797087e 100644
--- a/src/Normalizer/NodeEntityNormalizer.php
+++ b/src/Normalizer/NodeEntityNormalizer.php
@@ -75,19 +75,6 @@ class NodeEntityNormalizer extends ContentEntityNormalizer {
       }
     }
 
-    if ($entity->workspace) {
-      $workspace  = $entity->workspace->entity;
-      $matching_workspaces = $this->entityManager
-        ->getStorage('workspace')
-        ->getQuery()
-        ->accessCheck(FALSE)
-        ->condition('machine_name', $workspace->machine_name->value)
-        ->execute();
-      if (count($matching_workspaces > 1)) {
-        $entity->workspace->target_id = reset($matching_workspaces);
-      }
-    }
-
     return $entity;
   }