diff --git a/simplify.module b/simplify.module
index b5de82c..7945912 100644
--- a/simplify.module
+++ b/simplify.module
@@ -1,9 +1,9 @@
 <?php
 
 use Drupal\Core\Render\Element;
-use Drupal\Core\Config\ImmutableConfig;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\user\Entity\Role;
+use Drupal\Core\Url;
 
 /**
  * Implements hook_form_FORM_ID_alter() for node_type_form.
@@ -17,7 +17,7 @@ function simplify_form_node_type_edit_form_alter(&$form, FormStateInterface $for
   $form['simplify'] = array(
     '#type' => 'details',
     '#title' => t('Simplify'),
-    '#description' => t("These fields will be hidden from <em>@type</em> node forms. Disabled checkboxes indicate fields that have been hidden globally on the <a href=\"@global\">Simplify administration page</a>.", array('@type' => $form['name']['#default_value'], '@global' => \Drupal::url('simplify.admin'))),
+    '#description' => t("These fields will be hidden from <em>@type</em> node forms. Disabled checkboxes indicate fields that have been hidden globally on the <a href=\"@global\">Simplify administration page</a>.", array('@type' => $form['name']['#default_value'], '@global' => Url::fromRoute('simplify.admin')->toString())),
     '#access' => \Drupal::currentUser()->hasPermission('administer simplify'),
     '#group' => 'additional_settings',
   );
@@ -62,7 +62,7 @@ function simplify_form_comment_type_edit_form_alter(&$form, FormStateInterface $
   $form['comment']['simplify'] = array(
       '#type' => 'details',
       '#title' => t('Simplify'),
-      '#description' => t("These fields will be hidden from <em>@type</em> comment forms. Disabled checkboxes indicate fields that have been hidden globally on the <a href=\"@global\">Simplify administration page</a>.", array('@type' => $form['label']['#default_value'], '@global' => \Drupal::url('simplify.admin'))),
+      '#description' => t("These fields will be hidden from <em>@type</em> comment forms. Disabled checkboxes indicate fields that have been hidden globally on the <a href=\"@global\">Simplify administration page</a>.", array('@type' => $form['label']['#default_value'], '@global' => Url::fromRoute('simplify.admin')->toString())),
       '#access' => \Drupal::currentUser()->hasPermission('administer simplify'),
       '#collapsible' => TRUE,
       '#collapsed' => TRUE,
@@ -108,7 +108,7 @@ function simplify_form_taxonomy_vocabulary_form_alter(&$form, FormStateInterface
   $form['simplify'] = array(
     '#type' => 'details',
     '#title' => t('Simplify'),
-    '#description' => t("These fields will be hidden from <em>@vocabulary</em> taxonomy term forms. Disabled checkboxes indicate fields that have been hidden globally on the <a href=\"@global\">Simplify administration page</a>.", array('@vocabulary' => $form['name']['#default_value'], '@global' => \Drupal::url('simplify.admin'))),
+    '#description' => t("These fields will be hidden from <em>@vocabulary</em> taxonomy term forms. Disabled checkboxes indicate fields that have been hidden globally on the <a href=\"@global\">Simplify administration page</a>.", array('@vocabulary' => $form['name']['#default_value'], '@global' => Url::fromRoute('simplify.admin')->toString())),
     '#access' => \Drupal::currentUser()->hasPermission('administer simplify'),
     '#group' => 'additional_settings',
   );
@@ -152,7 +152,7 @@ function simplify_form_block_content_type_edit_form_alter(&$form, FormStateInter
   $form['simplify'] = array(
       '#type' => 'details',
       '#title' => t('Simplify'),
-      '#description' => t("These fields will be hidden from <em>@type</em> block forms. Disabled checkboxes indicate fields that have been hidden globally on the <a href=\"@global\">Simplify administration page</a>.", array('@type' => $form['label']['#default_value'], '@global' => \Drupal::url('simplify.admin'))),
+      '#description' => t("These fields will be hidden from <em>@type</em> block forms. Disabled checkboxes indicate fields that have been hidden globally on the <a href=\"@global\">Simplify administration page</a>.", array('@type' => $form['label']['#default_value'], '@global' => Url::fromRoute('simplify.admin')->toString())),
       '#access' => \Drupal::currentUser()->hasPermission('administer simplify'),
       '#group' => 'additional_settings',
   );
diff --git a/src/Tests/PerBlockTypeSettingsTest.php b/src/Tests/PerBlockTypeSettingsTest.php
index 863ac97..5036b80 100644
--- a/src/Tests/PerBlockTypeSettingsTest.php
+++ b/src/Tests/PerBlockTypeSettingsTest.php
@@ -9,8 +9,8 @@
 
 namespace Drupal\simplify\Tests;
 
+use Drupal\block_content\Entity\BlockContentType;
 use Drupal\simpletest\WebTestBase;
-use Drupal\user\Entity\Role;
 
 /**
  * Test simplify per block-type settings.
@@ -139,7 +139,7 @@ class PerBlockTypeSettingsTest extends WebTestBase {
    *   Created custom block type.
    */
   protected function createBlockContentType($label, $create_body = FALSE) {
-    $bundle = entity_create('block_content_type', array(
+    $bundle = BlockContentType::create(array(
         'id' => $label,
         'label' => $label,
         'revision' => TRUE,
diff --git a/src/Tests/PerContentTypeSettingsTest.php b/src/Tests/PerContentTypeSettingsTest.php
index 19e9bd1..d3a52c8 100644
--- a/src/Tests/PerContentTypeSettingsTest.php
+++ b/src/Tests/PerContentTypeSettingsTest.php
@@ -10,7 +10,6 @@
 namespace Drupal\simplify\Tests;
 
 use Drupal\simpletest\WebTestBase;
-use Drupal\user\Entity\Role;
 
 /**
  * Test simplify per content-type settings.
diff --git a/src/Tests/PerVocabularySettingsTest.php b/src/Tests/PerVocabularySettingsTest.php
index e562e05..ee8a8d8 100644
--- a/src/Tests/PerVocabularySettingsTest.php
+++ b/src/Tests/PerVocabularySettingsTest.php
@@ -10,7 +10,7 @@
 namespace Drupal\simplify\Tests;
 
 use Drupal\simpletest\WebTestBase;
-use Drupal\Component\Utility\Unicode;
+use Drupal\taxonomy\Plugin\migrate\source\d7\Vocabulary;
 
 /**
  * Test simplify per vocabulary settings.
@@ -49,7 +49,7 @@ class PerVocabularySettingsTest extends WebTestBase {
     $this->drupalLogin($admin_user);
 
     // Create a vocabulary.
-    $vocabulary = entity_create('taxonomy_vocabulary', array(
+    $vocabulary = Vocabulary::create(array(
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       'vid' => 'testing_vocabulary',
diff --git a/src/Tests/UserSettingsTest.php b/src/Tests/UserSettingsTest.php
index b2ce77a..04aaa1b 100644
--- a/src/Tests/UserSettingsTest.php
+++ b/src/Tests/UserSettingsTest.php
@@ -10,7 +10,6 @@
 namespace Drupal\simplify\Tests;
 
 use Drupal\simpletest\WebTestBase;
-use Drupal\user\Entity\Role;
 
 /**
  * Test simplify user settings.