diff --git a/package-lock.json b/package-lock.json
index 760e458781..cb6f3d153e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2228,16 +2228,6 @@
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
       "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
     },
-    "binary": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
-      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
-      "dev": true,
-      "requires": {
-        "buffers": "~0.1.1",
-        "chainsaw": "~0.1.0"
-      }
-    },
     "binary-extensions": {
       "version": "1.11.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
@@ -3022,12 +3012,6 @@
       "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
       "dev": true
     },
-    "buffers": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
-      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
-      "dev": true
-    },
     "buildmail": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz",
@@ -3277,15 +3261,6 @@
         "lazy-cache": "^1.0.3"
       }
     },
-    "chainsaw": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
-      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
-      "dev": true,
-      "requires": {
-        "traverse": ">=0.3.0 <0.4"
-      }
-    },
     "chalk": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
@@ -15225,12 +15200,6 @@
         }
       }
     },
-    "traverse": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
-      "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
-      "dev": true
-    },
     "tree-kill": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
@@ -15803,16 +15772,6 @@
       "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
       "dev": true
     },
-    "unzip-stream": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/unzip-stream/-/unzip-stream-0.3.0.tgz",
-      "integrity": "sha512-NG1h/MdGIX3HzyqMjyj1laBCmlPYhcO4xEy7gEqqzGiSLw7XqDQCnY4nYSn5XSaH8mQ6TFkaujrO8d/PIZN85A==",
-      "dev": true,
-      "requires": {
-        "binary": "^0.3.0",
-        "mkdirp": "^0.5.1"
-      }
-    },
     "upath": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
diff --git a/package.json b/package.json
index 97c9ce99de..fd6ad1c8ab 100644
--- a/package.json
+++ b/package.json
@@ -109,6 +109,7 @@
     "@types/jasmine": "~2.8.3",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "6.0.90",
+    "adm-zip": "^0.4.11",
     "ajv-cli": "^3.0.0",
     "angular2-template-loader": "0.6.2",
     "archiver": "^3.0.0",
@@ -168,7 +169,6 @@
     "tslint": "5.9.1",
     "typedoc": "^0.11.1",
     "typescript": "2.9.2",
-    "unzip-stream": "^0.3.0",
     "url-join": "^4.0.0",
     "webpack-bundle-analyzer": "^2.13.1",
     "webpack-cli": "^3.1.0",
diff --git a/scripts/download-build-in-cs.js b/scripts/download-build-in-cs.js
index 768bf63321..64e15709d7 100755
--- a/scripts/download-build-in-cs.js
+++ b/scripts/download-build-in-cs.js
@@ -5,7 +5,7 @@ var http = require('http');
 var fs = require('fs');
 var path = require('path');
 var archiver = require('archiver');
-var unzip = require('unzip-stream');
+var AdmZip = require('adm-zip');
 
 replaceHrefInIndex = (folder) => {
     fs.readFile(`demo-shell/${folder}/index.html`, 'utf8', function (err, data) {
@@ -61,27 +61,19 @@ async function main() {
         file.on('finish', async () => {
             console.log('Unzip Demo ' + path.join(__dirname, '../demo.zip'));
 
-            setTimeout(() => {
-                fs.createReadStream(path.join(__dirname, '../demo.zip'))
-                    .pipe(unzip.Extract({path: path.join(__dirname, '../demo-shell')}))
-                    .on('finish', () => {
+            var zip = new AdmZip(path.join(__dirname, '../demo.zip'));
+            zip.extractAllToAsync(path.join(__dirname, '../demo-shell'), true, ()=>{
+                let oldFolder = path.join(__dirname, `../demo-shell/demo.zip`)
+                let newFolder = path.join(__dirname, `../demo-shell/${outputFolder}`)
 
-                        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);
+                fs.rename(oldFolder, newFolder, (err) => {
+                    console.log('renamed complete');
+                });
 
+                if (program.baseHref) {
+                    replaceHrefInIndex(outputFolder);
+                }
+            });
 
         });
     });
diff --git a/scripts/download-build-lib-in-cs.js b/scripts/download-build-lib-in-cs.js
index bd924e65df..d9599f2f9b 100644
--- a/scripts/download-build-lib-in-cs.js
+++ b/scripts/download-build-lib-in-cs.js
@@ -5,9 +5,7 @@ var http = require('http');
 var fs = require('fs');
 var path = require('path');
 var archiver = require('archiver');
-var unzip = require('unzip-stream');
-
-var exec = require('child_process').exec;
+var AdmZip = require('adm-zip');
 
 var alfrescoJsApi;
 
@@ -18,21 +16,24 @@ downloadZip = async (url, outputFolder, pacakge) => {
         response.pipe(file);
         file.on('finish', async () => {
             setTimeout(() => {
+
+                var zip = new AdmZip(path.join(__dirname, `../${pacakge}.zip`));
                 console.log(`Unzip  ${pacakge}` + path.join(__dirname, `../${pacakge}.zip`));
 
-                fs.createReadStream(path.join(__dirname, `../${pacakge}.zip`))
-                    .pipe(unzip.Extract({path: path.join(__dirname, '../', outputFolder, `@alfresco/`)}))
-                    .on('finish', () => {
-                        setTimeout(() => {
-                            let oldFolder = path.join(__dirname, '../', outputFolder, `@alfresco/${pacakge}`)
-                            let newFolder = path.join(__dirname, '../', outputFolder, `@alfresco/adf-${pacakge}`)
+                zip.extractAllToAsync(path.join(__dirname, '../', outputFolder, `@alfresco/`), true, () => {
 
-                            fs.rename(oldFolder, newFolder, (err) => {
-                                console.log('renamed complete');
-                            });
+                    setTimeout(() => {
+                        let oldFolder = path.join(__dirname, '../', outputFolder, `@alfresco/${pacakge}`)
+                        let newFolder = path.join(__dirname, '../', outputFolder, `@alfresco/adf-${pacakge}`)
+
+                        fs.rename(oldFolder, newFolder, (err) => {
+                            console.log('renamed complete');
+                        });
+
+                    }, 10000);
+
+                });
 
-                        }, 10000);
-                    })
             })
         });
     });