diff --git a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
index fe26cc2ff3..4e3dd03576 100644
--- a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
+++ b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
@@ -148,15 +148,15 @@ sub data_producer ($) {
       WHERE id_recon_server = ?
       AND disabled = 0
       AND ((utimestamp = 0 AND interval_sweep != 0 OR status = 1)
-        OR (status < 0 AND interval_sweep > 0 AND (utimestamp + interval_sweep) < UNIX_TIMESTAMP()))
-        OR (status < 0 AND utimestamp = 0 AND interval_sweep = 0)', $server_id);
+        OR (status < 0 AND interval_sweep > 0 AND (utimestamp + interval_sweep) < UNIX_TIMESTAMP())
+        OR (status < 0 AND utimestamp = 0 AND interval_sweep = 0))', $server_id);
   } else {
     @rows = get_db_rows ($dbh, 'SELECT * FROM trecon_task 
       WHERE (id_recon_server = ? OR id_recon_server NOT IN (SELECT id_server FROM tserver WHERE status = 1 AND server_type = ?))
       AND disabled = 0
       AND ((utimestamp = 0 AND interval_sweep != 0 OR status = 1)
-        OR (status < 0 AND interval_sweep > 0 AND (utimestamp + interval_sweep) < UNIX_TIMESTAMP()))
-        OR (status < 0 AND utimestamp = 0 AND interval_sweep = 0)', $server_id, DISCOVERYSERVER);
+        OR (status < 0 AND interval_sweep > 0 AND (utimestamp + interval_sweep) < UNIX_TIMESTAMP())
+        OR (status < 0 AND utimestamp = 0 AND interval_sweep = 0))', $server_id, DISCOVERYSERVER);
   }
 
   foreach my $row (@rows) {
@@ -315,13 +315,7 @@ sub data_consumer ($$) {
     # Clean tmp file.
     if (defined($cnf_extra{'creds_file'})
     && -f $cnf_extra{'creds_file'}) {
-    unlink($cnf_extra{'creds_file'});
-  }
-
-
-    # Clean one shot tasks
-    if ($task->{'type'} eq DISCOVERY_DEPLOY_AGENTS) {
-      db_delete_limit($dbh, ' trecon_task ', ' id_rt = ? ', 1, $task->{'id_rt'});   
+      unlink($cnf_extra{'creds_file'});
     }
   };
   if ($@) {