diff --git a/src/Access/RegistrationAddAccessCheck.php b/src/Access/RegistrationAddAccessCheck.php
index 0f81b8a..c6cd8fc 100644
--- a/src/Access/RegistrationAddAccessCheck.php
+++ b/src/Access/RegistrationAddAccessCheck.php
@@ -16,20 +16,20 @@ use Drupal\rng\Entity\RegistrationTypeInterface;
 class RegistrationAddAccessCheck implements AccessInterface {
 
   /**
-   * The entity manager.
+   * The entity type manager.
    *
    * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  protected $entityManager;
+  protected $entityTypeManager;
 
   /**
    * Constructs a EventRegistrationAllowedCheck object.
    *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
-   *   The entity manager.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
    */
-  public function __construct(EntityTypeManagerInterface $entity_manager) {
-    $this->entityManager = $entity_manager;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**
@@ -38,7 +38,7 @@ class RegistrationAddAccessCheck implements AccessInterface {
   public function access(Route $route, RouteMatchInterface $route_match, AccountInterface $account, RegistrationTypeInterface $registration_type = NULL) {
     if ($event = $route->getDefault('event')) {
       $context = ['event' => $route_match->getParameter($event)];
-      $access_control_handler = $this->entityManager->getAccessControlHandler('registration');
+      $access_control_handler = $this->entityTypeManager->getAccessControlHandler('registration');
       if ($registration_type) {
         return $access_control_handler->createAccess($registration_type->id(), $account, $context, TRUE);
       }
diff --git a/src/Form/MessageActionForm.php b/src/Form/MessageActionForm.php
index 16795bb..f611088 100644
--- a/src/Form/MessageActionForm.php
+++ b/src/Form/MessageActionForm.php
@@ -24,7 +24,7 @@ class MessageActionForm extends FormBase {
   protected $actionPlugin;
 
   /**
-   * The entity manager.
+   * The entity type manager.
    *
    * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
@@ -43,7 +43,7 @@ class MessageActionForm extends FormBase {
    * @param \Drupal\Core\Action\ActionManager $action_manager
    *   The action manager.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
-   *   The entity manager.
+   *   The entity type manager.
    * @param \Drupal\rng\EventManagerInterface $event_manager
    *   The RNG event manager.
    */
diff --git a/src/Form/RegistrationTypeForm.php b/src/Form/RegistrationTypeForm.php
index 0e7e3a2..cb31328 100644
--- a/src/Form/RegistrationTypeForm.php
+++ b/src/Form/RegistrationTypeForm.php
@@ -4,7 +4,6 @@ namespace Drupal\rng\Form;
 
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Link;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -12,23 +11,22 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  * Form controller for registration types.
  */
 class RegistrationTypeForm extends EntityForm {
-  /**
-   * @var \Drupal\Core\Entity\Query\QueryFactory
-   */
-  protected $entityQueryFactory;
 
   /**
-   * {@inheritdoc}
+   * The registration type storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
    */
-  public function __construct(QueryFactory $query_factory) {
-    $this->entityQueryFactory = $query_factory;
-  }
+  protected $registrationTypeStorage;
 
   /**
    * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
-    return new static($container->get('entity.query'));
+    $instance = new static();
+    $instance->registrationTypeStorage = $container->get('entity_type.manager')
+      ->getStorage('registration_type');
+    return $instance;
   }
 
   /**
@@ -80,7 +78,7 @@ class RegistrationTypeForm extends EntityForm {
    * Callback for `id` form element in RegistrationTypeForm->buildForm.
    */
   public function exists($entity_id, array $element, FormStateInterface $form_state) {
-    $query = $this->entityQueryFactory->get('registration_type');
+    $query = $this->registrationTypeStorage->getQuery();
     return (bool) $query->condition('id', $entity_id)->execute();
   }
 
diff --git a/src/Lists/EventTypeListBuilder.php b/src/Lists/EventTypeListBuilder.php
index d6d6120..ca3d8b6 100644
--- a/src/Lists/EventTypeListBuilder.php
+++ b/src/Lists/EventTypeListBuilder.php
@@ -4,9 +4,6 @@ namespace Drupal\rng\Lists;
 
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
 use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Url;
@@ -17,33 +14,23 @@ use Drupal\Core\Url;
 class EventTypeListBuilder extends ConfigEntityListBuilder {
 
   /**
-   * Constructs a new EntityListBuilder object.
+   * The entity type manager.
    *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type definition.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
-   *   The entity storage class.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
-   *   The entity manager.
-   * @param \Drupal\Core\Session\AccountInterface $current_user
-   *   The current user.
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
-  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $storage, EntityTypeManagerInterface $entity_manager, AccountInterface $current_user) {
-    parent::__construct($entity_type, $storage);
-    $this->entityManager = $entity_manager;
-    $this->currentUser = $current_user;
-  }
+  protected $entityTypeManager;
 
   /**
    * {@inheritdoc}
    */
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
+    $entity_type_manager = $container->get('entity_type.manager');
+    $instance = new static(
       $entity_type,
-      $container->get('entity_type.manager')->getStorage($entity_type->id()),
-      $container->get('entity_type.manager'),
-      $container->get('current_user')
+      $entity_type_manager->getStorage($entity_type->id())
     );
+    $instance->entityTypeManager = $entity_type_manager;
+    return $instance;
   }
 
   /**
@@ -54,7 +41,7 @@ class EventTypeListBuilder extends ConfigEntityListBuilder {
     $operations = parent::getDefaultOperations($entity);
 
     if ($this->moduleHandler->moduleExists('field_ui')) {
-      $entity_type = \Drupal::entityTypeManager()
+      $entity_type = $this->entityTypeManager
         ->getDefinition($entity->getEventEntityTypeId());
 
       if ($entity_type->get('field_ui_base_route')) {
@@ -87,13 +74,13 @@ class EventTypeListBuilder extends ConfigEntityListBuilder {
   public function buildRow(EntityInterface $entity) {
     /** @var \Drupal\rng\Entity\EventTypeInterface $entity **/
 
-    $entity_type = $this->entityManager
+    $entity_type = $this->entityTypeManager
       ->getDefinition($entity->getEventEntityTypeId());
     $t_args = ['@entity_type' => $entity_type->getLabel()];
     $bundle_entity_type = $entity_type->getBundleEntityType();
     if ($bundle_entity_type && $bundle_entity_type !== 'bundle') {
-      $bundle = $this->entityManager
-        ->getStorage($entity_type->getBundleEntityType())
+      $bundle = $this->entityTypeManager
+        ->getStorage($bundle_entity_type)
         ->load($entity->getEventBundle());
       $t_args['@bundle'] = $bundle->label();
       $row['machine_name'] = $this->t('@entity_type: @bundle', $t_args);
diff --git a/src/Plugin/Derivative/LocalActions.php b/src/Plugin/Derivative/LocalActions.php
index de799ef..1d84e93 100644
--- a/src/Plugin/Derivative/LocalActions.php
+++ b/src/Plugin/Derivative/LocalActions.php
@@ -6,7 +6,6 @@ use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Routing\RouteProviderInterface;
 use Drupal\rng\EventManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\Cache\Cache;
@@ -37,14 +36,11 @@ class LocalActions extends DeriverBase implements ContainerDeriverInterface {
    *
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_manager
    *   The entity manager.
-   * @param \Drupal\Core\Routing\RouteProviderInterface $route_provider
-   *   The route provider.
    * @param \Drupal\rng\EventManagerInterface $event_manager
    *   The RNG event manager.
    */
-  public function __construct(EntityTypeManagerInterface $entity_manager, RouteProviderInterface $route_provider, EventManagerInterface $event_manager) {
+  public function __construct(EntityTypeManagerInterface $entity_manager, EventManagerInterface $event_manager) {
     $this->entityManager = $entity_manager;
-    $this->routeProvider = $route_provider;
     $this->eventManager = $event_manager;
   }
 
@@ -54,7 +50,6 @@ class LocalActions extends DeriverBase implements ContainerDeriverInterface {
   public static function create(ContainerInterface $container, $base_plugin_id) {
     return new static(
       $container->get('entity_type.manager'),
-      $container->get('router.route_provider'),
       $container->get('rng.event_manager')
     );
   }