diff --git a/sharemessage.routing.yml b/sharemessage.routing.yml
index 1484604..f12ae05 100644
--- a/sharemessage.routing.yml
+++ b/sharemessage.routing.yml
@@ -22,7 +22,7 @@ entity.sharemessage.edit_form:
   requirements:
     _entity_access: sharemessage.update
 
-sharemessage.sharemessage_list:
+entity.sharemessage.collection:
   path: '/admin/config/services/sharemessage'
   defaults:
     _title: 'Share message list'
diff --git a/src/Entity/ShareMessage.php b/src/Entity/ShareMessage.php
index 26dd572..e92171e 100644
--- a/src/Entity/ShareMessage.php
+++ b/src/Entity/ShareMessage.php
@@ -21,8 +21,7 @@ use Drupal\Core\Url;
  *     "list_builder" = "Drupal\sharemessage\Entity\Handler\ShareMessageListBuilder",
  *     "form" = {
  *       "add" = "Drupal\sharemessage\Form\ShareMessageForm",
- *       "edit" = "Drupal\sharemessage\Form\ShareMessageForm",
- *       "delete" = "Drupal\sharemessage\Form\ShareMessageDeleteForm"
+ *       "edit" = "Drupal\sharemessage\Form\ShareMessageForm"
  *     }
  *   },
  *   entity_keys = {
@@ -44,7 +43,8 @@ use Drupal\Core\Url;
  *   },
  *   links = {
  *     "edit-form" = "/admin/config/services/sharemessage/manage/{sharemessage}",
- *     "delete-form" = "/admin/config/services/sharemessage/manage/{sharemessage}/delete"
+ *     "delete-form" = "/admin/config/services/sharemessage/manage/{sharemessage}/delete",
+ *     "collection" = "/admin/config/services/sharemessage",
  *   }
  * )
  */
diff --git a/src/Form/ShareMessageDeleteForm.php b/src/Form/ShareMessageDeleteForm.php
deleted file mode 100644
index 8ecc282..0000000
--- a/src/Form/ShareMessageDeleteForm.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of \Drupal\sharemessage\Entity\Controller\ShareMessageFormController.
- */
-
-namespace Drupal\sharemessage\Form;
-
-use Drupal\Core\Entity\EntityConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Builds the form to delete a ShareMessage config entity.
- */
-class ShareMessageDeleteForm extends EntityConfirmFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return t('Are you sure you want to delete %name?', array('%name' => $this->entity->label()));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return new Url('sharemessage.sharemessage_list');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return t('Delete');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->entity->delete();
-    drupal_set_message(t('ShareMessage %label has been deleted.', array('%label' => $this->entity->label())));
-    \Drupal::logger('sharemessage')->notice('ShareMessage %label has been deleted.', array('%label' => $this->entity->label()));
-    $form_state->setRedirect('sharemessage.sharemessage_list');
-  }
-
-}