diff --git a/Jenkinsfile b/Jenkinsfile
index 911c1bc..8005fa4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -104,20 +104,13 @@ pipeline {
                 echo 'Cron build enabled. Deploy from system ongoing'
                 script {
                     println "Going to check the deploy file in ${PENDING_DEPLOY_FOLDER}"
- //                   def records = readCSV file: 'CD/deploy.csv'
-// 					def files = findFiles(glob: 'target/surefire-reports/*.csv')
 					def deployFolder="CD-${env.BUILD_NUMBER}";
 					println ("searching files in folder ${deployFolder}");
 					def files = findFiles(glob: "${deployFolder}/*.csv")
 					if (files == null){
 						println ("Nothing to do");
 					}else{
-						for ( def file : files){
-							sh """
-								touch ${deployFolder}/testdeploy.csv
-								${file.path} >> ${deployFolder}/testdeploy.csv
-							"""
-						}							                   
+						def serviceList = []
 						for (def file : files){
 						    echo """
 						    Found: ${file.name} with path ${file.path} 
@@ -126,17 +119,20 @@ pipeline {
 						    def records = readCSV file: "${file.path}"
 	                        for (def record : records) {
 	                            println("Processing record: "+record)
-	                            stage(record.get(0)){
-	                                println "Deploy on going of component: record.get(0)"
-	                                catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') {
-	                                    checkup(record.get(0), record.get(1), record.get(2));
-	                                    deploy(record.get(0), record.get(1), record.get(2));
-	                                }
+	                            if(!serviceList.contains(record.get(0))){
+		                            stage(record.get(0)){
+		                                println "Deploy on going of component: record.get(0)"
+		                                catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') {
+		                                    checkup(record.get(0), record.get(1), record.get(2));
+		                                    deploy(record.get(0), record.get(1), record.get(2));
+		                                }
+		                            }
+		                            serviceList << record.get(0)
 	                            }
 	                        }    
 	                        sh "rm ${file.path}"
 	                    }
-	                   // sh "rm -Rf ${deployFolder}"
+	                    sh "rm -Rf ${deployFolder}"
  					}
 
                 }