diff --git a/entity_browser.views.inc b/entity_browser.views.inc
index a026adc..c5a6d12 100644
--- a/entity_browser.views.inc
+++ b/entity_browser.views.inc
@@ -9,7 +9,7 @@
  * Implements hook_views_data_alter().
  */
 function entity_browser_views_data_alter(&$data) {
-  $entity_manager = \Drupal::entityManager();
+  $entity_manager = \Drupal::entityTypeManager();
   foreach ($entity_manager->getDefinitions() as $entity_type_name => $entity_type) {
     if (!empty($data[$entity_type->getBaseTable()])) {
       $entity_keys = $entity_type->get('entity_keys');
diff --git a/modules/entity_form/entity_browser_entity_form.module b/modules/entity_form/entity_browser_entity_form.module
index 41894b0..d4a6638 100644
--- a/modules/entity_form/entity_browser_entity_form.module
+++ b/modules/entity_form/entity_browser_entity_form.module
@@ -8,7 +8,7 @@ use \Drupal\Component\Utility\NestedArray;
  * Implements hook_inline_entity_form_reference_form_alter().
  */
 function entity_browser_entity_form_inline_entity_form_reference_form_alter(&$reference_form, \Drupal\Core\Form\FormStateInterface &$form_state) {
-  $entity_manager = \Drupal::entityManager();
+  $entity_manager = \Drupal::entityTypeManager();
   \Drupal::service('event_dispatcher')
     ->addListener(
       Events::REGISTER_JS_CALLBACKS,
@@ -86,11 +86,11 @@ function entity_browser_entity_form_reference_form_validate(&$reference_form, Fo
   $instance = $form_state->get(['inline_entity_form', $ief_id, 'instance']);
   $target_type = $instance->getFieldStorageDefinition()->getSetting('target_type');
   /** @var \Drupal\inline_entity_form\InlineEntityFormHandlerInterface $handler */
-  $handler = \Drupal::entityManager()->getHandler($target_type, 'inline_form');
+  $handler = \Drupal::entityTypeManager()->getHandler($target_type, 'inline_form');
   $labels = $handler->labels();
 
   $form_values = NestedArray::getValue($form_state->getValues(), $reference_form['#parents']);
-  $attach_entities = \Drupal::entityManager()->getStorage($entity_type)->loadMultiple(explode(' ', $form_values['entity_id']));
+  $attach_entities = \Drupal::entityTypeManager()->getStorage($entity_type)->loadMultiple(explode(' ', $form_values['entity_id']));
 
   // Check to see if entity is already referenced by current IEF widget
   if (!empty($attach_entities)) {
@@ -126,7 +126,7 @@ function entity_browser_entity_form_reference_form_submit($reference_form, FormS
   $entity_type = $reference_form['#entity_type'];
 
   $form_values = NestedArray::getValue($form_state->getValues(), $reference_form['#parents']);
-  $attach_entities = \Drupal::entityManager()->getStorage($entity_type)->loadMultiple(explode(' ', $form_values['entity_id']));
+  $attach_entities = \Drupal::entityTypeManager()->getStorage($entity_type)->loadMultiple(explode(' ', $form_values['entity_id']));
 
   // Determine the correct weight of the new element.
   $weight = 0;
diff --git a/src/Controllers/EntityBrowserController.php b/src/Controllers/EntityBrowserController.php
index a3f546b..2bb8fe2 100644
--- a/src/Controllers/EntityBrowserController.php
+++ b/src/Controllers/EntityBrowserController.php
@@ -30,7 +30,7 @@ class EntityBrowserController extends ControllerBase {
    */
   public function entityBrowserEdit(EntityInterface $entity) {
     // Build the entity edit form.
-    $form_object = $this->entityManager()->getFormObject($entity->getEntityTypeId(), 'edit');
+    $form_object = $this->entityTypeManager()->getFormObject($entity->getEntityTypeId(), 'edit');
     $form_object->setEntity($entity);
     $form_state = (new FormState())
       ->setFormObject($form_object)
diff --git a/src/EntityBrowserInterface.php b/src/EntityBrowserInterface.php
index 70623f8..1b07bf0 100644
--- a/src/EntityBrowserInterface.php
+++ b/src/EntityBrowserInterface.php
@@ -8,7 +8,6 @@
 namespace Drupal\entity_browser;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
-use Drupal\Core\Form\FormStateInterface;
 
 /**
  * Provides an interface defining an entity browser entity.
diff --git a/src/Plugin/EntityBrowser/Display/Modal.php b/src/Plugin/EntityBrowser/Display/Modal.php
index 75ec8f8..d731db6 100644
--- a/src/Plugin/EntityBrowser/Display/Modal.php
+++ b/src/Plugin/EntityBrowser/Display/Modal.php
@@ -12,7 +12,6 @@ use Drupal\Core\Ajax\OpenModalDialogCommand;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
-use Drupal\entity_browser\DisplayAjaxInterface;
 use Drupal\entity_browser\DisplayBase;
 use Drupal\entity_browser\DisplayRouterInterface;
 use Drupal\entity_browser\Events\Events;
@@ -21,7 +20,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Drupal\Core\Path\CurrentPathStack;
 use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\CloseDialogCommand;
 use Drupal\entity_browser\Ajax\SelectEntitiesCommand;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
diff --git a/src/Plugin/Field/FieldWidget/EntityReference.php b/src/Plugin/Field/FieldWidget/EntityReference.php
index c88924f..8243893 100644
--- a/src/Plugin/Field/FieldWidget/EntityReference.php
+++ b/src/Plugin/Field/FieldWidget/EntityReference.php
@@ -17,8 +17,6 @@ use Drupal\Core\Field\WidgetBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Url;
-use Drupal\entity_browser\Events\Events;
-use Drupal\entity_browser\Events\RegisterJSCallbacks;
 use Drupal\entity_browser\FieldWidgetDisplayManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
diff --git a/src/Plugin/views/display/EntityBrowser.php b/src/Plugin/views/display/EntityBrowser.php
index c6f271b..8d4e9df 100644
--- a/src/Plugin/views/display/EntityBrowser.php
+++ b/src/Plugin/views/display/EntityBrowser.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\entity_browser\Plugin\views\display;
 
-use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 
 /**
diff --git a/src/WidgetSelectorBase.php b/src/WidgetSelectorBase.php
index aef1971..4f8f95d 100644
--- a/src/WidgetSelectorBase.php
+++ b/src/WidgetSelectorBase.php
@@ -9,7 +9,6 @@ namespace Drupal\entity_browser;
 
 use Drupal\Core\Plugin\PluginBase;
 use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Base class for widget selector plugins.
diff --git a/src/WidgetSelectorInterface.php b/src/WidgetSelectorInterface.php
index 9fc7a24..9ef6798 100644
--- a/src/WidgetSelectorInterface.php
+++ b/src/WidgetSelectorInterface.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\entity_browser;
 
-use Drupal\Component\Plugin\LazyPluginCollection;
 use Drupal\Component\Plugin\PluginInspectionInterface;
 use Drupal\Core\Form\FormStateInterface;