diff --git a/demo-shell-ng2/app/vendor.ts b/demo-shell-ng2/app/vendor.ts
index caef0d0a69..e7a4cbf671 100644
--- a/demo-shell-ng2/app/vendor.ts
+++ b/demo-shell-ng2/app/vendor.ts
@@ -11,3 +11,6 @@ import 'rxjs';
 
 // Other vendors for example jQuery, Lodash or Bootstrap
 // You can import js, ts, css, sass, ...
+
+import 'ng2-activiti-form/stencils/runtime.ng1';
+import 'ng2-activiti-form/stencils/runtime.adf';
diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html
index 83401ac994..8f0c22b8c5 100644
--- a/demo-shell-ng2/index.html
+++ b/demo-shell-ng2/index.html
@@ -21,11 +21,9 @@
 
     <!-- 1. Load libraries -->
     <!-- Polyfill(s) for Safari (pre-10.x) -->
-    <script src="node_modules/intl/dist/Intl.min.js"></script>
-    <script src="node_modules/intl/locale-data/jsonp/en.js"></script>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=Intl.~locale.en"></script>
 
     <!-- Polyfill(s) for older browsers -->
-    <!--<script src="node_modules/core-js/client/shim.min.js"></script>-->
     <script src="//cdnjs.cloudflare.com/ajax/libs/dom4/1.8.3/dom4.js"></script>
     <script src="node_modules/element.scrollintoviewifneeded-polyfill/index.js"></script>
 
@@ -44,10 +42,6 @@
     <script src="node_modules/md-date-time-picker/dist/js/mdDateTimePicker.min.js"></script>
     <script src="node_modules/md-date-time-picker/dist/js/draggabilly.pkgd.min.js"></script>
 
-    <!-- Stencils integration -->
-    <script src="node_modules/ng2-activiti-form/stencils/runtime.ng1.js"></script>
-    <script src="node_modules/ng2-activiti-form/stencils/runtime.adf.js"></script>
-
     <style>
         .main_header_adf .mdl-layout__drawer-button {
             right: 0 !important;
diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json
index 660eb2657a..58bee4e17e 100644
--- a/demo-shell-ng2/package.json
+++ b/demo-shell-ng2/package.json
@@ -3,23 +3,14 @@
   "description": "Demo shell for Alfresco Angular2 components",
   "version": "0.5.0",
   "author": "Alfresco Software, Ltd.",
-  "_scripts": {
-    "clean": "npm install rimraf && rimraf dist node_modules typings",
-    "build": "npm run tslint && npm run tsc && npm run licensecheck",
-    "start": "npm run build && npm run serve",
-    "start:dev": "npm run build && concurrently \"npm run tsc:w\" \"npm run serve:dev\" ",
-    "aws": "node app.js",
-    "tsc": "tsc",
-    "tsc:w": "tsc -w",
-    "serve": "wsrv -O http://localhost:3000 -s -p 3000 -a 0.0.0.0 -x ./server/versions.js",
-    "serve:dev": "wsrv -O http://localhost:3000 -s -l -p 3000 -a 0.0.0.0 -x ./server/versions.js",
-    "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json 'app/{,**/}**.ts'",
-    "licensecheck": "license-check"
-  },
   "scripts": {
     "start": "webpack-dev-server --inline --progress --port 3000",
     "test": "karma start",
-    "build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail"
+    "build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail",
+
+    "aws": "node app.js",
+    "tslint": "tslint -c tslint.json *.ts && tslint -c tslint.json 'app/{,**/}**.ts'",
+    "licensecheck": "license-check"
   },
   "repository": {
     "type": "git",
@@ -78,7 +69,6 @@
     "ng2-translate": "2.5.0",
     "pdfjs-dist": "1.5.404",
     "flag-icon-css": "2.3.0",
-    "intl": "1.2.4",
     "moment": "2.15.1",
     "chart.js": "^2.1.4",
     "ng2-charts": "1.1.0",
@@ -103,11 +93,9 @@
     "element.scrollintoviewifneeded-polyfill": "^1.0.1"
   },
   "devDependencies": {
-    "concurrently": "^2.2.0",
     "license-check": "1.1.5",
     "mime": "^1.3.4",
     "tslint": "3.15.1",
-    "wsrv": "^0.1.5",
 
     "@types/jasmine": "^2.5.35",
     "@types/node": "^6.0.45",
@@ -132,9 +120,7 @@
     "typescript": "2.0.3",
     "webpack": "^1.13.0",
     "webpack-dev-server": "^1.14.1",
-    "webpack-merge": "^0.14.0",
-
-    "url-loader": "^0.5.7"
+    "webpack-merge": "^0.14.0"
   },
   "license-check-config": {
     "src": [
diff --git a/demo-shell-ng2/wsrv-config.json b/demo-shell-ng2/wsrv-config.json
deleted file mode 100644
index 5329327a46..0000000000
--- a/demo-shell-ng2/wsrv-config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "watch": [
-        "node_modules/ng2-alfresco-core/dist/**/*.{html,css,js}",
-        "node_modules/ng2-alfresco-datatable/dist/**/*.{html,css,js}",
-        "node_modules/ng2-alfresco-documentlist/dist/**/*.{html,css,js}",
-        "node_modules/ng2-alfresco-login/dist/**/*.{html,css,js}",
-        "node_modules/ng2-alfresco-search/dist/**/*.{html,css,js}",
-        "node_modules/ng2-alfresco-upload/dist/**/*.{html,css,js}",
-        "node_modules/ng2-alfresco-userinfo/dist/**/*.{html,css,js}",
-        "node_modules/ng2-alfresco-viewer/dist/**/*.{html,css,js}",
-        "node_modules/ng2-alfresco-webscript/dist/**/*.{html,css,js}",
-        "node_modules/ng2-activiti-form/dist/**/*.{html,css,js}",
-        "node_modules/ng2-activiti-tasklist/dist/**/*.{html,css,js}"
-    ]
-}