diff --git a/src/Service/AccessCheck.php b/src/Service/AccessCheck.php
index 7427a9d..4ec38cb 100644
--- a/src/Service/AccessCheck.php
+++ b/src/Service/AccessCheck.php
@@ -5,15 +5,11 @@ namespace Drupal\permissions_by_term\Service;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\user\Entity\User;
-use Drupal\permissions_by_term\Service\ServiceInterface\AccessCheckInterface;
 
 /**
  * AccessCheckService class.
  */
-class AccessCheck implements AccessCheckInterface {
-
-  /**
-   * The database connection.
+class AccessCheck
    *
    * @var \Drupal\Core\Database\Connection
    */
@@ -31,165 +27,4 @@ class AccessCheck implements AccessCheckInterface {
     $this->entityManager = $entity_manager;
     $this->database  = $database;
   }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function canUserAccessByNodeId($iNid, $uid = FALSE) {
-    $node = $this->entityManager->getStorage('node')->load($iNid);
-
-    $access_allowed = TRUE;
-
-    foreach ($node->getFields() as $field) {
-      if ($field->getFieldDefinition()->getType() == 'entity_reference' && $field->getFieldDefinition()->getSetting('target_type') == 'taxonomy_term') {
-        $aReferencedTaxonomyTerms = $field->getValue();
-        if (!empty($aReferencedTaxonomyTerms)) {
-          foreach ($aReferencedTaxonomyTerms as $aReferencedTerm) {
-            if (isset($aReferencedTerm['target_id']) && !$this->isAccessAllowedByDatabase($aReferencedTerm['target_id'], $uid)) {
-              $access_allowed = FALSE;
-            }
-          }
-        }
-      }
-    }
-
-    return $access_allowed;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function viewContainsNode($view) {
-    $bViewContainsNodes = FALSE;
-
-    foreach ($view->result as $view_result) {
-      if (array_key_exists('nid', $view_result) === TRUE) {
-        $bViewContainsNodes = TRUE;
-        break;
-      }
-    }
-    return $bViewContainsNodes;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function removeForbiddenNodesFromView(&$view) {
-    $aNodesToHideInView = [];
-
-    // Iterate over all nodes in view.
-    foreach ($view->result as $v) {
-
-      if ($this->canUserAccessByNodeId($v->nid) === FALSE) {
-        $aNodesToHideInView[] = $v->nid;
-      }
-
-    }
-
-    $counter = 0;
-
-    foreach ($view->result as $v) {
-      if (in_array($v->nid, $aNodesToHideInView)) {
-        unset($view->result[$counter]);
-      }
-      $counter++;
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isAccessAllowedByDatabase($tid, $uid = FALSE) {
-
-    if ($uid === FALSE) {
-      $user = \Drupal::currentUser();
-    } elseif (is_numeric($uid)) {
-      $user = User::load($uid);
-    }
-
-    // Admin can access everything (user id "1").
-    if ($user->id() == 1) {
-      return TRUE;
-    }
-
-    $tid = intval($tid);
-
-    if (!$this->isAnyPermissionSetForTerm($tid)) {
-      return TRUE;
-    }
-
-    /* At this point permissions are enabled, check to see if this user or one
-     * of their roles is allowed.
-     */
-    $aUserRoles = $user->getRoles();
-
-    foreach ($aUserRoles as $sUserRole) {
-
-      if ($this->isTermAllowedByUserRole($tid, $sUserRole)) {
-        return TRUE;
-      }
-
-    }
-
-    $iUid = intval($user->id());
-
-    if ($this->isTermAllowedByUserId($tid, $iUid)) {
-      return TRUE;
-    }
-
-    return FALSE;
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isTermAllowedByUserId($tid, $iUid) {
-
-    $query_result = $this->database->query("SELECT uid FROM {permissions_by_term_user} WHERE tid = :tid AND uid = :uid",
-      [':tid' => $tid, ':uid' => $iUid])->fetchField();
-
-    if (!empty($query_result)) {
-      return TRUE;
-    }
-    else {
-      return FALSE;
-    }
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isTermAllowedByUserRole($tid, $sUserRole) {
-    $query_result = $this->database->query("SELECT rid FROM {permissions_by_term_role} WHERE tid = :tid AND rid IN (:user_roles)",
-      [':tid' => $tid, ':user_roles' => $sUserRole])->fetchField();
-
-    if (!empty($query_result)) {
-      return TRUE;
-    }
-    else {
-      return FALSE;
-    }
-
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isAnyPermissionSetForTerm($tid) {
-
-    $iUserTableResults = intval($this->database->query("SELECT COUNT(1) FROM {permissions_by_term_user} WHERE tid = :tid",
-      [':tid' => $tid])->fetchField());
-
-    $iRoleTableResults = intval($this->database->query("SELECT COUNT(1) FROM {permissions_by_term_role} WHERE tid = :tid",
-      [':tid' => $tid])->fetchField());
-
-    if ($iUserTableResults > 0 ||
-      $iRoleTableResults > 0) {
-      return TRUE;
-    }
-
-  }
-
 }
diff --git a/src/Service/AccessStorage.php b/src/Service/AccessStorage.php
index 90d0f32..ad6d368 100644
--- a/src/Service/AccessStorage.php
+++ b/src/Service/AccessStorage.php
@@ -5,7 +5,6 @@ namespace Drupal\permissions_by_term\Service;
 use Drupal\Core\Database\Connection;
 use Drupal\Component\Utility\Tags;
 use Drupal\Core\Form\FormState;
-use Drupal\permissions_by_term\Service\ServiceInterface\AccessStorageInterface;
 
 /**
  * Class AccessStorage.
@@ -19,7 +18,7 @@ use Drupal\permissions_by_term\Service\ServiceInterface\AccessStorageInterface;
  *
  * @package Drupal\permissions_by_term
  */
-class AccessStorage implements AccessStorageInterface {
+class AccessStorage {
 
   /**
    * The database connection.
@@ -60,185 +59,6 @@ class AccessStorage implements AccessStorageInterface {
   }
 
   /**
-   * Gets submitted roles with granted access from form.
-   *
-   * @return array
-   *   An array with chosen roles.
-   */
-  public function getSubmittedRolesGrantedAccess(FormState $form_state) {
-    $aRoles       = $form_state->getValue('access')['role'];
-    $aChosenRoles = [];
-    foreach ($aRoles as $sRole) {
-      if ($sRole !== 0) {
-        $aChosenRoles[] = $sRole;
-      }
-    }
-    return $aChosenRoles;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function checkIfUsersExists(FormState $form_state) {
-    $sAllowedUsers = $form_state->getValue('access')['user'];
-    $aAllowedUsers = Tags::explode($sAllowedUsers);
-    foreach ($aAllowedUsers as $sUserId) {
-      $aUserId = \Drupal::entityQuery('user')
-        ->condition('uid', $sUserId)
-        ->execute();
-      if (empty($aUserId)) {
-        $form_state->setErrorByName('access][user',
-          t('The user with ID %user_id does not exist.',
-          ['%user_id' => $sUserId]));
-      }
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getUserTermPermissionsByTid($term_id) {
-    return $this->oDatabase->select('permissions_by_term_user', 'pu')
-      ->condition('tid', $term_id)
-      ->fields('pu', ['uid'])
-      ->execute()
-      ->fetchCol();
-  }
-
-  /**
-   * @param array $tids
-   *
-   * @return array
-   */
-  public function getUserTermPermissionsByTids($tids) {
-    $uids = [];
-
-    foreach ($tids as $tid) {
-      $uids[] = array_shift($this->getUserTermPermissionsByTid($tid));
-    }
-
-    return $uids;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRoleTermPermissionsByTid($term_id) {
-    return $this->oDatabase->select('permissions_by_term_role', 'pr')
-      ->condition('tid', $term_id)
-      ->fields('pr', ['rid'])
-      ->execute()
-      ->fetchCol();
-  }
-
-  /**
-   * @param array $tids
-   *
-   * @return array
-   */
-  public function getRoleTermPermissionsByTids($tids) {
-    $rids = [];
-
-    foreach ($tids as $tid) {
-      $rids[] = array_shift($this->getRoleTermPermissionsByTid($tid));
-    }
-
-    return $rids;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getUserIdByName($sUsername) {
-    return $this->oDatabase->select('users_field_data', 'ufd')
-      ->condition('name', $sUsername)
-      ->fields('ufd', ['uid'])
-      ->execute()
-      ->fetchAssoc();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getUserIdsByNames($aUserNames) {
-    $aUserIds = [];
-    foreach ($aUserNames as $userName) {
-      $iUserId    = $this->getUserIdByName($userName)['uid'];
-      $aUserIds[] = $iUserId['uid'];
-    }
-    return $aUserIds;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAllowedUserIds($term_id) {
-    $query = $this->oDatabase->select('permissions_by_term_user', 'p')
-      ->fields('p', ['uid'])
-      ->condition('p.tid', $term_id);
-
-    // fetchCol() returns all results, fetchAssoc() only "one" result.
-    return $query->execute()
-      ->fetchCol();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteTermPermissionsByUserIds($aUserIdsAccessRemove, $term_id) {
-    foreach ($aUserIdsAccessRemove as $iUserId) {
-      $this->oDatabase->delete('permissions_by_term_user')
-        ->condition('uid', $iUserId, '=')
-        ->condition('tid', $term_id, '=')
-        ->execute();
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function deleteTermPermissionsByRoleIds($aRoleIdsAccessRemove, $term_id) {
-    foreach ($aRoleIdsAccessRemove as $sRoleId) {
-      $this->oDatabase->delete('permissions_by_term_role')
-        ->condition('rid', $sRoleId, '=')
-        ->condition('tid', $term_id, '=')
-        ->execute();
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addTermPermissionsByUserIds($aUserIdsGrantedAccess, $term_id) {
-    foreach ($aUserIdsGrantedAccess as $iUserIdGrantedAccess) {
-      $this->oDatabase->insert('permissions_by_term_user')
-        ->fields(['tid', 'uid'], [$term_id, $iUserIdGrantedAccess])
-        ->execute();
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addTermPermissionsByRoleIds($aRoleIdsGrantedAccess, $term_id) {
-    foreach ($aRoleIdsGrantedAccess as $sRoleIdGrantedAccess) {
-      $this->oDatabase->insert('permissions_by_term_role')
-        ->fields(['tid', 'rid'], [$term_id, $sRoleIdGrantedAccess])
-        ->execute();
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getTermIdByName($sTermName) {
-    $aTermId = \Drupal::entityQuery('taxonomy_term')
-      ->condition('name', $sTermName)
-      ->execute();
-    return key($aTermId);
-  }
-
-  /**
    * {@inheritdoc}
    */
   public function getTermNameById($term_id) {
@@ -249,76 +69,6 @@ class AccessStorage implements AccessStorageInterface {
   }
 
   /**
-   * Gets the user ids which have been submitted by form.
-   *
-   * Users which will gain granted access to taxonomy terms.
-   *
-   * @return array
-   *   The user ids which have been submitted.
-   */
-  public function getSubmittedUserIds() {
-    /* There's a $this->oFormState->getValues() method, but
-     * it is loosing multiple form values. Don't know why.
-     * So there're some custom lines on the $_REQUEST array. */
-    $sRawUsers = $_REQUEST['access']['user'];
-
-    if (empty($sRawUsers)) {
-      return [];
-    }
-
-    $aRawUsers = explode('),', $sRawUsers);
-    $aUserIds = [];
-    if (!empty($aRawUsers)) {
-      foreach ($aRawUsers as $sRawUser) {
-        $aTempRawUser = explode(' (', $sRawUser);
-        // We check the user id by user name. If we get null back, the user might
-        // be the Anonymous user. In that case we get null back and then we use
-        // this id, which is 0.
-        if (!empty($aTempRawUser[1])) {
-          $fallback_user_id = str_replace(')', '', $aTempRawUser[1]);
-          $fallback_user_id = intval($fallback_user_id);
-        }
-
-        $sRawUser = trim($aTempRawUser['0']);
-        $uid = $this->getUserIdByName($sRawUser)['uid'];
-        if ($uid == NULL && $fallback_user_id == 0) {
-          // We might want to give access to the Anonymous user.
-          $aUserIds[] = 0;
-        }
-        else {
-          $aUserIds[] = $this->getUserIdByName($sRawUser)['uid'];
-        }
-      }
-    }
-
-    return $aUserIds;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function saveTermPermissions(FormState $form_state, $term_id) {
-    $aExistingUserPermissions       = $this->getUserTermPermissionsByTid($term_id);
-    $aSubmittedUserIdsGrantedAccess = $this->getSubmittedUserIds();
-
-    $aExistingRoleIdsGrantedAccess = $this->getRoleTermPermissionsByTid($term_id);
-    $aSubmittedRolesGrantedAccess  = $this->getSubmittedRolesGrantedAccess($form_state);
-
-    $aRet = $this->getPreparedDataForDatabaseQueries($aExistingUserPermissions,
-      $aSubmittedUserIdsGrantedAccess, $aExistingRoleIdsGrantedAccess,
-      $aSubmittedRolesGrantedAccess);
-
-    // Run the database queries.
-    $this->deleteTermPermissionsByUserIds($aRet['UserIdPermissionsToRemove'], $term_id);
-    $this->addTermPermissionsByUserIds($aRet['UserIdPermissionsToAdd'], $term_id);
-
-    $this->deleteTermPermissionsByRoleIds($aRet['UserRolePermissionsToRemove'], $term_id);
-    $this->addTermPermissionsByRoleIds($aRet['aRoleIdPermissionsToAdd'], $term_id);
-
-    return $aRet;
-  }
-
-  /**
    * Get array items to remove.
    *
    * The array items which aren't in the new items array, but are in old items
@@ -371,64 +121,6 @@ class AccessStorage implements AccessStorageInterface {
   }
 
   /**
-   * {@inheritdoc}
-   */
-  public function getPreparedDataForDatabaseQueries($aExistingUserPermissions,
-                                                    $aSubmittedUserIdsGrantedAccess,
-                                                    $aExistingRoleIdsGrantedAccess,
-                                                    $aSubmittedRolesGrantedAccess) {
-    // Fill array with user ids to remove permission.
-    $aRet['UserIdPermissionsToRemove'] =
-      $this->getArrayItemsToRemove($aExistingUserPermissions,
-        $aSubmittedUserIdsGrantedAccess);
-
-    // Fill array with user ids to add permission.
-    $aRet['UserIdPermissionsToAdd'] =
-      $this->getArrayItemsToAdd($aSubmittedUserIdsGrantedAccess,
-        $aExistingUserPermissions);
-
-    // Fill array with user roles to remove permission.
-    $aRet['UserRolePermissionsToRemove'] =
-      $this->getArrayItemsToRemove($aExistingRoleIdsGrantedAccess,
-        $aSubmittedRolesGrantedAccess);
-
-    // Fill array with user roles to add permission.
-    $aRet['aRoleIdPermissionsToAdd'] =
-      $this->getArrayItemsToAdd($aSubmittedRolesGrantedAccess,
-        $aExistingRoleIdsGrantedAccess);
-
-    return $aRet;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getUserFormValue($aAllowedUsers) {
-
-    $sUserInfos = '';
-
-    if (!empty($aAllowedUsers)) {
-
-      foreach ($aAllowedUsers as $oUser) {
-        $iUid = intval($oUser->id());
-        if ($iUid !== 0) {
-          $sUsername = $oUser->getUsername();
-        }
-        else {
-          $sUsername = t('Anonymous User');
-        }
-
-        $sUserInfos .= "$sUsername ($iUid), ";
-      }
-
-      // Remove space and comma at the end of the string.
-      $sUserInfos = substr($sUserInfos, 0, -2);
-    }
-
-    return $sUserInfos;
-  }
-
-  /**
    * @return array
    */
   public function getAllNids()
diff --git a/src/Service/ServiceInterface/AccessCheckInterface.php b/src/Service/ServiceInterface/AccessCheckInterface.php
deleted file mode 100644
index 7d4fd78..0000000
--- a/src/Service/ServiceInterface/AccessCheckInterface.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace Drupal\permissions_by_term\Service\ServiceInterface;
-
-interface AccessCheckInterface {
-
-  /**
-   * Checks if a user can access a node by given node id.
-   */
-  public function canUserAccessByNodeId($iNid, $uid = FALSE);
-
-  /**
-   * Returns a boolean if the view is containing nodes.
-   */
-  public function viewContainsNode($view);
-
-  /**
-   * Removes forbidden nodes from view listing.
-   */
-  public function removeForbiddenNodesFromView(&$view);
-
-  /**
-   * @param int $tid
-   * @param bool|int $uid
-   * @return mixed
-   */
-  public function isAccessAllowedByDatabase($tid, $uid = FALSE);
-
-  /**
-   * Returns a boolean if the term is allowed by given user id.
-   *
-   * @param int $iTid
-   *   The taxonomy term id.
-   * @param int $iUid
-   *   The user id.
-   *
-   * @return bool
-   *   Determines by boolean if the given term id is allowed by given user id.
-   */
-  public function isTermAllowedByUserId($iTid, $iUid);
-
-  /**
-   * Returns a boolean if the term is allowed by given user role id.
-   *
-   * @param int $iTid
-   *   The term id.
-   * @param string $sUserRole
-   *   The user role.
-   *
-   * @return bool
-   *   Determines if the term is allowed by the given user role.
-   */
-  public function isTermAllowedByUserRole($iTid, $sUserRole);
-
-  /**
-   * Gets boolean for set permission on a term.
-   *
-   * @param int $iTid
-   *   The taxonomy term id.
-   *
-   * @return bool
-   *   Returns either TRUE or FALSE if there is any permission set for the term.
-   */
-  public function isAnyPermissionSetForTerm($iTid);
-
-}
diff --git a/src/Service/ServiceInterface/AccessStorageInterface.php b/src/Service/ServiceInterface/AccessStorageInterface.php
deleted file mode 100644
index 46b3570..0000000
--- a/src/Service/ServiceInterface/AccessStorageInterface.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-namespace Drupal\permissions_by_term\Service\ServiceInterface;
-
-use \Drupal\Core\Form\FormState;
-
-/**
- * Defines an interface for access storage classes.
- */
-interface AccessStorageInterface {
-
-  /**
-   * Checks if the submitted users are existing.
-   *
-   * If an user isn't existing, set an error message.
-   *
-   * @param \Drupal\Core\Form\FormState $form_state
-   */
-  public function checkIfUsersExists(FormState $form_state);
-
-  /**
-   * Gets user term permissions by tid.
-   *
-   * @param int $term_id
-   *
-   * @return mixed
-   *   Existing term permissions.
-   */
-  public function getUserTermPermissionsByTid($term_id);
-
-  /**
-   * Gets role term permissions by tid.
-   *
-   * @param int $term_id
-   *
-   * @return mixed
-   *   Existing role term permissions.
-   */
-  public function getRoleTermPermissionsByTid($term_id);
-
-  /**
-   * Gets single user id by user name.
-   *
-   * @param string $sUsername
-   *   An user name.
-   *
-   * @return int
-   *   User id.
-   */
-  public function getUserIdByName($sUsername);
-
-  /**
-   * Gets multiple user ids by user names.
-   *
-   * @param array $aUserNames
-   *   An array with user names.
-   *
-   * @return array
-   *   User ids.
-   */
-  public function getUserIdsByNames($aUserNames);
-
-  /**
-   * Gets the user names from users.
-   *
-   * Users which have granted access for a taxonomy term.
-   *
-   * @param int $term_id
-   *
-   * @return mixed
-   *   Gets user ids, which are allowed to access.
-   */
-  public function getAllowedUserIds($term_id);
-
-  /**
-   * Deletes term permissions by user id.
-   *
-   * @param array $aUserIdsAccessRemove
-   *   An array with user ids, which access will be removed.
-   * @param int $term_id
-   *   The term id to remove.
-   */
-  public function deleteTermPermissionsByUserIds($aUserIdsAccessRemove, $term_id);
-
-  /**
-   * Deletes term permissions by role ids.
-   *
-   * @param array $aRoleIdsAccessRemove
-   *   An array with role ids, that will be removed.
-   * @param int $term_id
-   *   The term id.
-   */
-  public function deleteTermPermissionsByRoleIds($aRoleIdsAccessRemove, $term_id);
-
-  /**
-   * Adds term permissions by user ids.
-   *
-   * @param array $aUserIdsGrantedAccess
-   *   The user ids which will get granted access.
-   * @param int $term_id
-   *
-   * @throws \Exception
-   */
-  public function addTermPermissionsByUserIds($aUserIdsGrantedAccess, $term_id);
-
-  /**
-   * Adds term permissions by role ids.
-   *
-   * @param array $aRoleIdsGrantedAccess
-   *   The role ids which will gain access.
-   * @param int $term_id
-   *
-   * @throws \Exception
-   */
-  public function addTermPermissionsByRoleIds($aRoleIdsGrantedAccess, $term_id);
-
-  /**
-   * Gets the term id by term name.
-   *
-   * @param string $sTermName
-   *   The term name.
-   *
-   * @return int
-   *   The term id.
-   */
-  public function getTermIdByName($sTermName);
-
-  /**
-   * Gets the taxonomy name by id.
-   *
-   * @param int $term_id
-   *   The taxonomy term id.
-   *
-   * @return string
-   *   Gets a term name by an id.
-   */
-  public function getTermNameById($term_id);
-
-  /**
-   * Saves term permissions by users.
-   *
-   * Opposite to save term permission by roles.
-   *
-   * @param \Drupal\Core\Form\FormState $form_state
-   * @param int $term_id
-   *
-   * @return array
-   *   Data for database queries.
-   */
-  public function saveTermPermissions(FormState $form_state, $term_id);
-
-  /**
-   * Prepares the data which has to be applied to the database.
-   *
-   * @param array $aExistingUserPermissions
-   *   The permissions for existing user.
-   * @param array $aSubmittedUserIdsGrantedAccess
-   *   The user ids which get access.
-   * @param array $aExistingRoleIdsGrantedAccess
-   *   The existing role ids.
-   * @param array $aSubmittedRolesGrantedAccess
-   *   The user roles which get access.
-   *
-   * @return array
-   *   User ID and role data.
-   */
-  public function getPreparedDataForDatabaseQueries($aExistingUserPermissions,
-                                                    $aSubmittedUserIdsGrantedAccess,
-                                                    $aExistingRoleIdsGrantedAccess,
-                                                    $aSubmittedRolesGrantedAccess);
-
-  /**
-   * The form value for allowed users as string to be shown to the user.
-   *
-   * @param \Drupal\user\Entity\User[] $aAllowedUsers
-   *   An array with the allowed users.
-   *
-   * @return null|string
-   *   Either null or the user name.
-   */
-  public function getUserFormValue($aAllowedUsers);
-
-}