diff --git a/modules/sms_valid/sms_valid.install b/modules/sms_valid/sms_valid.install
index b9c3447..37639e7 100644
--- a/modules/sms_valid/sms_valid.install
+++ b/modules/sms_valid/sms_valid.install
@@ -8,8 +8,6 @@
  * @subpackage sms_valid
  */
 
-use \Drupal\Component\Utility\String;
-
 /**
  * Implements hook_install().
  *
@@ -119,6 +117,5 @@ function sms_valid_create_example_ruleset(&$ret = array()) {
 
   $ret[] = array(
     'success' => !empty($ruleset),
-//    'query' => String::checkPlain($sql),
   );
 }
diff --git a/modules/sms_valid/src/RulesetTestFormController.php b/modules/sms_valid/src/RulesetTestFormController.php
index dce0aa8..0f83eea 100644
--- a/modules/sms_valid/src/RulesetTestFormController.php
+++ b/modules/sms_valid/src/RulesetTestFormController.php
@@ -6,9 +6,9 @@
 
 namespace Drupal\sms_valid;
 
+use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Form\FormBase;
-use Drupal\Component\Utility\String;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
@@ -80,7 +80,7 @@ class RulesetTestFormController extends FormBase {
         $result = sms_valid_validate($number, $options);
         $pass = $result['pass'];
         $log_msg = implode("<br />", $result['log']);
-        drupal_set_message(String::checkPlain($log_msg));
+        drupal_set_message(Html::escape($log_msg));
         break;
       // Test main validation function.
       case 1:
diff --git a/src/Form/CarrierAdminForm.php b/src/Form/CarrierAdminForm.php
index 2fe0e2d..a76dd30 100644
--- a/src/Form/CarrierAdminForm.php
+++ b/src/Form/CarrierAdminForm.php
@@ -7,9 +7,10 @@
 
 namespace Drupal\sms\Form;
 
+use Drupal\Component\Utility\Html;
 use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Component\Utility\String;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
 
 /**
  * Provides a configuration form for sms carriers.
@@ -50,23 +51,23 @@ class CarrierAdminForm extends ConfigFormBase {
       }
       $form['status'][$css_safe_id] = array(
         '#type' => 'checkbox',
-        '#title' => String::checkPlain($carrier['name']),
-        '#description' => String::checkPlain($storage),
+        '#title' => $carrier['name'],
+        '#description' => $storage,
         '#default_value' => $carrier['status'] == 1,
       );
   
       $form['domain'][$css_safe_id] = array(
         '#type' => 'markup',
-        '#markup' => String::checkPlain($id),
+        '#markup' => $id,
       );
   
-      $actions[] = l($this->t('Edit'), "admin/config/smsframework/carriers/edit/{$id}");
+      $actions[] = \Drupal::l($this->t('Edit'), Url::fromRoute('sms.carrier_edit', ['domain' => $id]));
   
       if ($carrier['type'] == SMS_CARRIER_OVERRIDDEN) {
-        $actions[] = l($this->t('Revert'), "admin/config/smsframework/carriers/delete/{$id}");
+        $actions[] = \Drupal::l($this->t('Revert'), Url::fromRoute('sms.carrier_delete', ['domain' => $id]));
       }
       elseif ($carrier['type'] == SMS_CARRIER_NORMAL) {
-        $actions[] = l($this->t('Delete'), "admin/config/smsframework/carriers/delete/{$id}");
+        $actions[] = \Drupal::l($this->t('Delete'), Url::fromRoute('sms.carrier_delete', ['domain' => $id]));
       }
   
       $form['actions'][$css_safe_id] = array(