diff --git a/simple_node_importer-updated-function-drupal-set-message-3050908.patch b/simple_node_importer-updated-function-drupal-set-message-3050908.patch
new file mode 100644
index 0000000..e69de29
diff --git a/simple_node_importer.module b/simple_node_importer.module
index 4beb2ce..d763df9 100755
--- a/simple_node_importer.module
+++ b/simple_node_importer.module
@@ -214,8 +214,7 @@ function simple_node_importer_form_alter(&$form, FormStateInterface &$form_state
 
       $link = \Drupal::l(t('Admin Settings Page'), new url('simple_node_importer.config_form'));
       $message = t('Kindly contact Admin to select the entity types and content types which are allowed to be imported, for this you can visit:@link', ["@link" => $link]);
-
-      drupal_set_message($message);
+      \Drupal::messenger()->addMessage($message);
     }
 
     $form['field_upload_csv']['#upload_validators']['file_validate_extensions'] = ['csv'];
@@ -224,7 +223,7 @@ function simple_node_importer_form_alter(&$form, FormStateInterface &$form_state
   }
 
   if ($form_id == 'node_simple_node_edit_form') {
-    drupal_set_message(t('OOPs! Sorry you are not allowed to resubmit this node again. Please start with new import.'));
+    \Drupal::messenger()->addMessage(t('OOPs! Sorry you are not allowed to resubmit this node again. Please start with new import.'));
     $form['field_select_content_type']['#disabled'] = TRUE;
     $form['field_select_entity_type']['#disabled'] = TRUE;
     $form['field_upload_csv']['#disabled'] = TRUE;
diff --git a/src/Controller/NodeImportController.php b/src/Controller/NodeImportController.php
index bea92d4..37b76cd 100644
--- a/src/Controller/NodeImportController.php
+++ b/src/Controller/NodeImportController.php
@@ -25,7 +25,6 @@ class NodeImportController extends ControllerBase {
   protected $sessionVariable;
   protected $sessionManager;
   protected $currentUser;
-
   /**
    * Responsible for node type entity immport.
    *
@@ -158,7 +157,7 @@ class NodeImportController extends ControllerBase {
       }
 
       // $statusMessage = ;.
-      drupal_set_message(t('Node import completed! Import status:<br/> @import_status', ['@import_status' => $import_status]));
+      \Drupal::messenger()->addMessage(t('Node import completed! Import status:<br/> @import_status', ['@import_status' => $import_status]));
     }
     else {
       $error_operation = reset($operations);
@@ -166,7 +165,7 @@ class NodeImportController extends ControllerBase {
         '%error_operation' => $error_operation[0],
         '@arguments' => print_r($error_operation[1], TRUE),
       ]);
-      drupal_set_message($message, 'error');
+      \Drupal::messenger()->addError($message);
     }
 
     return new RedirectResponse(\Drupal::url('<front>'));
@@ -197,7 +196,7 @@ class NodeImportController extends ControllerBase {
       }
 
       if ($resolution_log) {
-        drupal_set_message(t('Failed records added to resolution center.'));
+        \Drupal::messenger()->addMessage(t('Failed records added to resolution center.'));
       }
     }
   }
diff --git a/src/Controller/UserImportController.php b/src/Controller/UserImportController.php
index b102603..d87d0f5 100644
--- a/src/Controller/UserImportController.php
+++ b/src/Controller/UserImportController.php
@@ -12,7 +12,6 @@ use Drupal\user\Entity\User;
  * Default controller for the simple_node_importer module.
  */
 class UserImportController extends ControllerBase {
-
   /**
    * Initiate Batch process for User Import.
    */
@@ -117,7 +116,7 @@ class UserImportController extends ControllerBase {
       }
 
       $statusMessage = t("Users import completed! Import status:<br/>@import_status", ['@import_status' => $import_status]);
-      drupal_set_message($statusMessage);
+      \Drupal::messenger()->addMessage($statusMessage);
     }
     else {
       $error_operation = reset($operations);
@@ -125,10 +124,9 @@ class UserImportController extends ControllerBase {
         '%error_operation' => $error_operation[0],
         '@arguments' => print_r($error_operation[1], TRUE),
       ]);
-      drupal_set_message($message, 'error');
+      \Drupal::messenger()->addError($message);
     }
 
     return new RedirectResponse(\Drupal::url('<front>'));
   }
-
 }
diff --git a/src/Form/SimpleNodeImporterConfigForm.php b/src/Form/SimpleNodeImporterConfigForm.php
index e4ec89c..dd16315 100644
--- a/src/Form/SimpleNodeImporterConfigForm.php
+++ b/src/Form/SimpleNodeImporterConfigForm.php
@@ -150,7 +150,7 @@ class SimpleNodeImporterConfigForm extends ConfigFormBase {
 
     // The options to display in our checkboxes.
     $option = [
-      'option' => $this->t('Delete import logs.'),
+      'deletelog' => $this->t('Delete import logs.'),
     ];
 
     $form['fieldset_remove_importer']['node_delete'] = [
@@ -168,17 +168,15 @@ class SimpleNodeImporterConfigForm extends ConfigFormBase {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $config = $this->config('simple_node_importer.settings');
-
     $config->set('entity_type_select', $form_state->getValue('entity_type_select'))
-      ->set('content_type_select', $form_state->getValue('content_type_select'))
-      ->set('simple_node_importer_allow_user_autocreate', $form_state->getValue('simple_node_importer_allow_user_autocreate'))
-      ->set('simple_node_importer_allow_add_term', $form_state->getValue('simple_node_importer_allow_add_term'))
-      ->set('node_delete', $form_state->getValue('node_delete'))->save();
+    ->set('content_type_select', $form_state->getValue('content_type_select'))
+    ->set('simple_node_importer_allow_user_autocreate', $form_state->getValue('simple_node_importer_allow_user_autocreate'))
+    ->set('simple_node_importer_allow_add_term', $form_state->getValue('simple_node_importer_allow_add_term'))->save();
 
-    if (method_exists($this, 'submitFormDeleteLogs')) {
+    $node_setting = $form_state->getValue(['node_delete', 'deletelog']);
+    if (method_exists($this, 'submitFormDeleteLogs') && $node_setting == 'deletelog') {
       $this->submitFormDeleteLogs($form, $form_state);
     }
-
     parent::submitForm($form, $form_state);
   }
 
@@ -198,10 +196,10 @@ class SimpleNodeImporterConfigForm extends ConfigFormBase {
 
       if ($node_setting === 'deletelog' && !empty($nids)) {
         entity_delete_multiple('node', $nids);
-        drupal_set_message($this->t('%count nodes has been deleted.', ['%count' => count($nids)]));
+        \Drupal::messenger()->addMessage($this->t('%count nodes has been deleted.', ['%count' => count($nids)]));
       }
       elseif ($node_setting === 'deletelog' && empty($nids)) {
-        drupal_set_message($this->t("Oops there is nothing to delete"));
+        \Drupal::messenger()->addMessage($this->t("Oops there is nothing to delete"));
       }
     }
   }
diff --git a/src/Services/GetServices.php b/src/Services/GetServices.php
index c72d0d2..5162174 100644
--- a/src/Services/GetServices.php
+++ b/src/Services/GetServices.php
@@ -202,7 +202,7 @@ class GetServices {
         }
       }
     }
-    drupal_set_message(t('Taxonomies are created successfully'));
+    \Drupal::messenger()->addMessage(t('Taxonomies are created successfully'));
   }
 
   /**
