diff --git a/includes/field_ui.inc b/includes/field_ui.inc
index 948cb8a..d519c5c 100755
--- a/includes/field_ui.inc
+++ b/includes/field_ui.inc
@@ -9,6 +9,7 @@ use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityDisplayBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Link;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Url;
 use Drupal\efs\Entity\ExtraField;
@@ -151,7 +152,7 @@ function efs_field_ui_display_form_alter(array &$form, FormStateInterface $form_
       $query = ['destination' => $current_url->toString()];
       $delete_route = Url::fromRoute('entity.extra_field.delete_form', ['extra_field' => $id], ['query' => $query]);
 
-      $table[$name]['settings_edit']['#suffix'] .= Drupal::l(t('delete'), $delete_route);
+      $table[$name]['settings_edit']['#suffix'] .= Link::fromTextAndUrl(t('delete'), $delete_route)->toString();
     }
   }
 }
@@ -166,7 +167,7 @@ function efs_field_ui_display_form_alter(array &$form, FormStateInterface $form_
  *   The plugin label.
  */
 function efs_get_plugin_label(ExtraField $extra_field) {
-  $manager = \Drupal::service('plugin.manager.efs.formatters');
+  $manager = Drupal::service('plugin.manager.efs.formatters');
   $plugin_id = $extra_field->getPlugin();
   /** @var \Drupal\efs\ExtraFieldFormatterPluginBase $plugin */
   $plugin = $manager->createInstance($plugin_id);
@@ -190,7 +191,7 @@ function efs_get_plugin_label(ExtraField $extra_field) {
  *   The settings array form.
  */
 function efs_format_settings_form(ExtraField $extra_field, array $form, FormStateInterface $form_state, string $name) {
-  $manager = \Drupal::service('plugin.manager.efs.formatters');
+  $manager = Drupal::service('plugin.manager.efs.formatters');
   $plugin_id = $extra_field->getPlugin();
   /** @var \Drupal\efs\ExtraFieldFormatterPluginBase $plugin */
   $plugin = $manager->createInstance($plugin_id);
@@ -215,7 +216,7 @@ function efs_format_settings_form(ExtraField $extra_field, array $form, FormStat
  */
 function efs_format_settings_summary(ExtraField $extra_field) {
 
-  $manager = \Drupal::service('plugin.manager.efs.formatters');
+  $manager = Drupal::service('plugin.manager.efs.formatters');
   $plugin_id = $extra_field->getPlugin();
   /** @var \Drupal\efs\ExtraFieldFormatterPluginBase $plugin */
   $plugin = $manager->createInstance($plugin_id);