diff --git a/jjb/pipeline/voltha-scale-measurements.groovy b/jjb/pipeline/voltha-scale-measurements.groovy
index f49de5f..d44391e 100644
--- a/jjb/pipeline/voltha-scale-measurements.groovy
+++ b/jjb/pipeline/voltha-scale-measurements.groovy
@@ -32,7 +32,7 @@
     stage('cleanup') {
       steps {
         sh '''
-          rm -rf voltha-devices.txt onos-ports.txt total-time.txt onu-activation.txt
+          rm -rf onus.txt ports.txt voltha-devices.txt onos-ports.txt total-time.txt onu-activation.txt device-list.json
           for hchart in \$(helm list -q | grep -E -v 'docker-registry|cord-kafka|etcd-operator');
           do
               echo "Purging chart: \${hchart}"
@@ -230,11 +230,6 @@
 
       archiveArtifacts artifacts: '*.log,*.json,*txt'
 
-      script {
-        sh '''
-          rm -rf onus.txt ports.txt voltha-devices.txt onos-ports.txt total-time.txt onu-activation.txt device-list.json
-        '''
-      }
     }
   }
-}
+}
\ No newline at end of file