diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php
index 99549bd53224..b3d6cd822672 100644
--- a/app/Jobs/Util/Import.php
+++ b/app/Jobs/Util/Import.php
@@ -275,7 +275,12 @@ class Import implements ShouldQueue
 
         info('Completed🚀🚀🚀🚀🚀 at '.now());
 
-        unlink($this->file_path);
+        try{
+            unlink($this->file_path);
+        }
+        catch(\Exception $e){
+            nlog("problem unsetting file");
+        }
     }
 
     private function fixData()
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index d481a33d24bf..a360a078cca1 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -84,9 +84,6 @@ class TemplateEngine
 
     public function build()
     {
-        
-        if ($this->template == 'email_template_null')
-            $this->template = 'email_template_purchase_order';
 
         return $this->setEntity()
                  ->setSettingsObject()