diff --git a/scripts/download-build-in-cs.js b/scripts/download-build-in-cs.js
index dec137df00..768bf63321 100755
--- a/scripts/download-build-in-cs.js
+++ b/scripts/download-build-in-cs.js
@@ -6,7 +6,6 @@ var fs = require('fs');
 var path = require('path');
 var archiver = require('archiver');
 var unzip = require('unzip-stream');
-var stream = require('unzip-stream');
 
 replaceHrefInIndex = (folder) => {
     fs.readFile(`demo-shell/${folder}/index.html`, 'utf8', function (err, data) {
@@ -61,24 +60,29 @@ async function main() {
         response.pipe(file);
         file.on('finish', async () => {
             console.log('Unzip Demo ' + path.join(__dirname, '../demo.zip'));
-            fs.createReadStream(path.join(__dirname, '../demo.zip'))
-                .pipe(unzip.Extract({path: path.join(__dirname, '../demo-shell')}))
-                .on('finish', () => {
 
-                    setTimeout(() => {
-                        let oldFolder = path.join(__dirname, `../demo-shell/demo.zip`)
-                        let newFolder = path.join(__dirname, `../demo-shell/${outputFolder}`)
+            setTimeout(() => {
+                fs.createReadStream(path.join(__dirname, '../demo.zip'))
+                    .pipe(unzip.Extract({path: path.join(__dirname, '../demo-shell')}))
+                    .on('finish', () => {
 
-                        fs.rename(oldFolder, newFolder, (err) => {
-                            console.log('renamed complete');
-                        });
+                        setTimeout(() => {
+                            let oldFolder = path.join(__dirname, `../demo-shell/demo.zip`)
+                            let newFolder = path.join(__dirname, `../demo-shell/${outputFolder}`)
+
+                            fs.rename(oldFolder, newFolder, (err) => {
+                                console.log('renamed complete');
+                            });
+
+                            if (program.baseHref) {
+                                replaceHrefInIndex(outputFolder);
+                            }
+                        }, 10000);
+
+                    })
+            }, 10000);
 
-                        if (program.baseHref) {
-                            replaceHrefInIndex(outputFolder);
-                        }
-                    }, 10000);
 
-                })
         });
     });
 }
diff --git a/scripts/download-build-lib-in-cs.js b/scripts/download-build-lib-in-cs.js
index 33f7a22252..d15ac0254d 100644
--- a/scripts/download-build-lib-in-cs.js
+++ b/scripts/download-build-lib-in-cs.js
@@ -6,33 +6,33 @@ var fs = require('fs');
 var path = require('path');
 var archiver = require('archiver');
 var unzip = require('unzip-stream');
-var stream = require('unzip-stream');
 
 var exec = require('child_process').exec;
 
 var alfrescoJsApi;
 
-downloadZip = async(url, pacakge) => {
+downloadZip = async (url, pacakge) => {
     console.log(`Download ${pacakge}`)
     var file = fs.createWriteStream(`${pacakge}.zip`);
     return await http.get(`http://${url}`, (response) => {
         response.pipe(file);
         file.on('finish', async () => {
-            console.log(`Unzip  ${pacakge}` + path.join(__dirname, `../${pacakge}.zip`));
-            fs.createReadStream(path.join(__dirname,  `../${pacakge}.zip`))
-                .pipe(unzip.Extract({path: path.join(__dirname, '../node_modules/@alfresco/')}))
-                .on('finish', () => {
-                    setTimeout(() => {
-                        let oldFolder = path.join(__dirname, `../node_modules/@alfresco/${pacakge}`)
-                        let newFolder = path.join(__dirname, `../node_modules/@alfresco/adf-${pacakge}`)
+            setTimeout(() => {
+                console.log(`Unzip  ${pacakge}` + path.join(__dirname, `../${pacakge}.zip`));
+                fs.createReadStream(path.join(__dirname, `../${pacakge}.zip`))
+                    .pipe(unzip.Extract({path: path.join(__dirname, '../node_modules/@alfresco/')}))
+                    .on('finish', () => {
+                        setTimeout(() => {
+                            let oldFolder = path.join(__dirname, `../node_modules/@alfresco/${pacakge}`)
+                            let newFolder = path.join(__dirname, `../node_modules/@alfresco/adf-${pacakge}`)
 
-                        fs.rename(oldFolder, newFolder, (err) => {
-                            console.log('renamed complete');
-                        });
+                            fs.rename(oldFolder, newFolder, (err) => {
+                                console.log('renamed complete');
+                            });
 
-                    }, 10000);
-
-                })
+                        }, 10000);
+                    })
+            })
         });
     });
 }