diff --git a/files/gvm_library.py b/files/gvm_library.py
index 976db70a17dc7bb40f6a0ed0dbb8984db11a6352..dfef5bc01504d3d33ccc40b843da8b8aec02c183 100644
--- a/files/gvm_library.py
+++ b/files/gvm_library.py
@@ -141,9 +141,6 @@ class PortList:
              'in_use': self.in_use}
         return pretty_json(d)
     
-    #def __del__(self):
-    #    self.delete()
-    
     def delete(self):
         logging.debug(f"Deletion port_list {self.name}")
         res = self.client.delete_port_list(self.id)
@@ -253,9 +250,6 @@ class Target:
              'host': self.host}
         return pretty_json(d)
     
-    #def __del__(self):
-    #    self.delete()
-        
     def delete(self):
         logging.debug(f"Deletion target {self.name}")
         res = self.client.delete_target(self.id)
@@ -408,9 +402,6 @@ class Task:
         else:
             logging.error(f"ERROR during the task deletion {status}: {status_text}")
     
-    #def __del__(self):
-    #    self.delete()
-
     def update_status(self):
         task_info = self.client.get_tasks(filter_string = self.id) \
                                .xpath('task')[0]
diff --git a/files/scan.py b/files/scan.py
index 548de44c16e77dab260398291d215736e1055769..0aa81911c46c1885c93b6013c542e22672448bc9 100644
--- a/files/scan.py
+++ b/files/scan.py
@@ -128,6 +128,10 @@ for host,ports in endpoints.items():
     else:
         reports[host] = {'global': {"severity": -1, "threat": f"Scan Error. task.id: {task.id}"} }
 
+    task.delete()
+    target.delete()
+    port_list.delete()
+
 reports = process_global_reports_info(reports)
 logging.info(pretty_json(reports))
 
@@ -135,11 +139,11 @@ logging.info(pretty_json(reports))
 with open(summary_filename, "w") as f:
     f.write(json.dumps(reports))  
 
-for task in tasks:
+"""for task in tasks:
     task.delete()
 
 for target in targets:
     target.delete()
     
 for port_list in port_lists:
-    port_list.delete()
\ No newline at end of file
+    port_list.delete()"""
\ No newline at end of file