LOG.info("Received artifact " + curArtifact.getArtifactName());
 
-                               handleArtifact(data, data.getServiceName(), null, null, curArtifact, incomingDir, archiveDir);
+                               handleArtifact(data, data.getServiceName(), null, curArtifact, incomingDir, archiveDir);
             }
         }
 
 
                     LOG.info("Received artifact " + curArtifact.getArtifactName());
 
-                                       handleArtifact(data, data.getServiceName(), curResource.getResourceName(), curResource.getResourceType(), curArtifact, incomingDir, archiveDir);
+                                       handleArtifact(data, data.getServiceName(), curResource.getResourceName(), curArtifact, incomingDir, archiveDir);
                 }
             }
         }
                     IArtifactInfo artifactInfo = artifact.getArtifactInfo();
 
                                        if ((artifactInfo != null) && (data != null)) {
-                        IDistributionClientResult deploymentStatus;
-                            deploymentStatus = client.sendDeploymentStatus(buildStatusMessage(
+                        client.sendDeploymentStatus(buildStatusMessage(
                                     client, data, artifactInfo,
                                     deployResult));
                     }
         }
     }
 
-       private void handleArtifact(INotificationData data, String svcName, String resourceName, String resourceType,
+       private void handleArtifact(INotificationData data, String svcName, String resourceName,
         IArtifactInfo artifact, File incomingDir, File archiveDir) {
 
         // Download Artifact
     private void handleFailedDownload(INotificationData data,
             IArtifactInfo relevantArtifact) {
         // Send Download Status
-        IDistributionClientResult sendDownloadStatus = client
-                .sendDownloadStatus(buildStatusMessage(client, data,
+        client.sendDownloadStatus(buildStatusMessage(client, data,
                         relevantArtifact, DistributionStatusEnum.DOWNLOAD_ERROR));
     }
 
     private void handleSuccessfulDownload(INotificationData data, String svcName, String resourceName,
-            IArtifactInfo artifact, File spoolFile, File archiveDir) {
+            IArtifactInfo artifact, File inpSpoolFile, File archiveDir) {
 
                if ((data != null) && (artifact != null)) {
             // Send Download Status
-            IDistributionClientResult sendDownloadStatus = client
-                    .sendDownloadStatus(buildStatusMessage(client, data, artifact, DistributionStatusEnum.DOWNLOAD_OK));
+            client.sendDownloadStatus(buildStatusMessage(client, data, artifact, DistributionStatusEnum.DOWNLOAD_OK));
         }
 
         // If an override file exists, read that instead of the file we just downloaded
         ArtifactTypeEnum artifactEnum = ArtifactTypeEnum.YANG_XML;
+        File spoolFile = inpSpoolFile;
 
                boolean toscaCsarType = false;
         if (artifact != null) {
         }
 
                if (toscaCsarType) {
-                       processToscaCsar (data, svcName, resourceName, artifact, spoolFile, archiveDir);
+                       processToscaCsar (data, resourceName, artifact, spoolFile, archiveDir);
 
                        try {
                                Path source = spoolFile.toPath();
     }
 
 
-       private void processToscaCsar(INotificationData data, String svcName, String resourceName,
+       private void processToscaCsar(INotificationData data, String resourceName,
                        IArtifactInfo artifact, File spoolFile, File archiveDir) {
 
                // Use ASDC Dist Client 1.1.5 with TOSCA parsing APIs to extract relevant TOSCA model data