diff --git a/config/install/redirect.settings.yml b/config/install/redirect.settings.yml
index 17e324d..70a9688 100644
--- a/config/install/redirect.settings.yml
+++ b/config/install/redirect.settings.yml
@@ -1,9 +1,7 @@
-canonical: true
 auto_redirect: true
 default_status_code: 301
 passthrough_querystring: true
 warning: false
 ignore_admin_path: false
 access_check: false
-content_location_header: false
 route_normalizer_enabled: true
diff --git a/config/schema/redirect.schema.yml b/config/schema/redirect.schema.yml
index 7fb8311..bd9ccd5 100644
--- a/config/schema/redirect.schema.yml
+++ b/config/schema/redirect.schema.yml
@@ -4,9 +4,6 @@ redirect.settings:
   type: config_entity
   label: 'Redirect settings'
   mapping:
-    canonical:
-      type: boolean
-      label: 'Redirect from non-canonical URLs to the canonical URLs.'
     auto_redirect:
       type: boolean
       label: 'Automatically create redirects when URL aliases are changed.'
@@ -25,12 +22,9 @@ redirect.settings:
     access_check:
       type: boolean
       label: 'Menu Access Checking'
-    content_location_header:
-      type: boolean
-      label: 'Set Content Location Header'
     route_normalizer_enabled:
       type: boolean
-      label: 'Enable route normalizer'
+      label: 'Enforce clean and canonical URLs.'
 
 action.configuration.redirect_delete_action:
   type: action_configuration_default
diff --git a/redirect.install b/redirect.install
index d781020..538dab2 100644
--- a/redirect.install
+++ b/redirect.install
@@ -212,3 +212,12 @@ function redirect_update_8107() {
     }
   }
 }
+
+/**
+ * Removes unnecessary settings.
+ */
+function redirect_update_8108() {
+  $config = \Drupal::configFactory()->getEditable('redirect.settings');
+  $config->clear('canonical');
+  $config->save();
+}
diff --git a/src/Form/RedirectSettingsForm.php b/src/Form/RedirectSettingsForm.php
index 85f8957..5ed9e33 100644
--- a/src/Form/RedirectSettingsForm.php
+++ b/src/Form/RedirectSettingsForm.php
@@ -61,11 +61,6 @@ class RedirectSettingsForm extends ConfigFormBase {
       '#description' => $this->t('Enabling this will automatically redirect to the canonical URL of any page. That includes redirecting to an alias if existing, removing trainling slashes, ensure the language prefix is set and similar clean-up.'),
       '#default_value' => $config->get('route_normalizer_enabled'),
     );
-    $form['globals']['redirect_canonical'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Redirect from non-canonical URLs to the canonical URLs.'),
-      '#default_value' => $config->get('canonical'),
-    );
     $form['globals']['redirect_ignore_admin_path'] = array(
       '#type' => 'checkbox',
       '#title' => $this->t('Allow redirections on admin paths.'),
@@ -78,13 +73,6 @@ class RedirectSettingsForm extends ConfigFormBase {
       '#default_value' => $config->get('access_check'),
     );
 
-    $form['globals']['redirect_content_location_header'] = array(
-      '#type' => 'checkbox',
-      '#title' => $this->t('Set Content Location Header'),
-      '#description' => $this->t('If enabled, will add a <a href=":canonical">Content-Location</a> header.', array(':canonical' => 'http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.14')),
-      '#default_value' => $config->get('content_location_header'),
-    );
-
     return parent::buildForm($form, $form_state);
   }