diff --git a/.travis.yml b/.travis.yml
index d31f8ef0da..93f2c98a42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ before_install: |
 install: |
     set -ev
     date
-    travis_wait 30 ./.travis/install.sh
+    ./.travis/install.sh
     date
 script: ./.travis/script.sh
 after_failure: |
diff --git a/packages/composer-connector-hlfv1/package.json b/packages/composer-connector-hlfv1/package.json
index 2edb2b8a03..77d90540d5 100644
--- a/packages/composer-connector-hlfv1/package.json
+++ b/packages/composer-connector-hlfv1/package.json
@@ -45,6 +45,7 @@
     "fabric-ca-client": "^1.0.1",
     "fabric-client": "^1.0.1",
     "fs-extra": "^1.0.0",
+	"grpc": "1.6.0",
     "semver": "^5.3.0",
     "temp": "^0.8.3",
     "thenify-all": "^1.6.0",
diff --git a/packages/composer-playground/config/webpack.common.js b/packages/composer-playground/config/webpack.common.js
index f6487e9d31..adfe4badd9 100644
--- a/packages/composer-playground/config/webpack.common.js
+++ b/packages/composer-playground/config/webpack.common.js
@@ -326,6 +326,10 @@ module.exports = function (options) {
                 $ : 'jquery',
                 jquery : 'jquery'
             }),
-        ]
+        ],
+
+        node: {
+            fs: 'empty'
+        }
     };
 };
diff --git a/packages/composer-playground/config/webpack.test.js b/packages/composer-playground/config/webpack.test.js
index 192fadd941..73e7c47847 100644
--- a/packages/composer-playground/config/webpack.test.js
+++ b/packages/composer-playground/config/webpack.test.js
@@ -264,6 +264,10 @@ module.exports = function (options) {
                 $ : 'jquery',
                 jquery : 'jquery'
             }),
-        ]
+        ],
+        
+        node: {
+            fs: 'empty'
+        }
     };
 };
diff --git a/packages/composer-playground/package.json b/packages/composer-playground/package.json
index 3cdcbe31d6..6492642aad 100644
--- a/packages/composer-playground/package.json
+++ b/packages/composer-playground/package.json
@@ -127,7 +127,6 @@
     "babel-loader": "^6.2.10",
     "babel-polyfill": "^6.23.0",
     "babel-preset-latest": "^6.24.1",
-    "bootstrap": "4.0.0-alpha.5",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "codelyzer": "^2.0.1",
@@ -183,7 +182,7 @@
     "protractor": "5.1.2",
     "raw-loader": "^0.5.1",
     "rimraf": "^2.5.4",
-    "rxjs": "^5.0.2",
+    "rxjs": "5.4.2",
     "sass-loader": "^6.0.1",
     "script-ext-html-webpack-plugin": "^1.3.5",
     "semver": "^5.3.0",
@@ -208,6 +207,7 @@
     "typescript": "2.4.0",
     "url-loader": "^0.5.7",
     "v8-lazy-parse-webpack-plugin": "^0.3.0",
+    "webpack-sources": "1.0.1",
     "webpack": "~2.4.1",
     "webpack-dev-middleware": "^1.10.1",
     "webpack-dev-server": "~2.4.2",
diff --git a/packages/composer-playground/src/app/editor/add-file/add-file.component.spec.ts b/packages/composer-playground/src/app/editor/add-file/add-file.component.spec.ts
index 4bdae02a5b..c16ab274fd 100644
--- a/packages/composer-playground/src/app/editor/add-file/add-file.component.spec.ts
+++ b/packages/composer-playground/src/app/editor/add-file/add-file.component.spec.ts
@@ -23,8 +23,6 @@ import * as sinon from 'sinon';
 
 import { expect } from 'chai';
 
-const fs = require('fs');
-
 class MockAdminService {
     ensureConnection(): Promise<any> {
         return new Promise((resolve, reject) => {
diff --git a/packages/composer-playground/src/app/services/connectionProfileStores/connectionprofilestore.service.ts b/packages/composer-playground/src/app/services/connectionProfileStores/connectionprofilestore.service.ts
index dd00aa831c..9790bdd3e5 100644
--- a/packages/composer-playground/src/app/services/connectionProfileStores/connectionprofilestore.service.ts
+++ b/packages/composer-playground/src/app/services/connectionProfileStores/connectionprofilestore.service.ts
@@ -5,8 +5,6 @@ import { ConfigService } from '../config.service';
 import { ConnectionProfileStore } from 'composer-common';
 import { PlaygroundConnectionProfileStore } from './playgroundconnectionprofilestore';
 import { BrowserConnectionProfileStore } from './browserconnectionprofilestore';
-/* tslint:disable:no-var-requires */
-const fs = require('fs');
 
 @Injectable()
 export class ConnectionProfileStoreService {
diff --git a/packages/composer-playground/src/app/services/connectionProfileStores/playgroundconnectionprofilestore.ts b/packages/composer-playground/src/app/services/connectionProfileStores/playgroundconnectionprofilestore.ts
index ddd4249097..2ddca355ba 100644
--- a/packages/composer-playground/src/app/services/connectionProfileStores/playgroundconnectionprofilestore.ts
+++ b/packages/composer-playground/src/app/services/connectionProfileStores/playgroundconnectionprofilestore.ts
@@ -3,8 +3,6 @@ import { BrowserConnectionProfileStore } from './browserconnectionprofilestore';
 /* tslint:disable:no-var-requires */
 const ProxyConnectionProfileStore = require('composer-connector-proxy').ProxyConnectionProfileStore;
 
-const fs = require('fs');
-
 /**
  * The playground connection profile store provides a combined view over a connection
  * profile store persisted in the web browser (for web connection profiles) and a
diff --git a/packages/composer-playground/src/vendor.browser.ts b/packages/composer-playground/src/vendor.browser.ts
index c6fe64dfb8..1e42f824b5 100644
--- a/packages/composer-playground/src/vendor.browser.ts
+++ b/packages/composer-playground/src/vendor.browser.ts
@@ -22,10 +22,6 @@ import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/mergeMap';
 
 import 'jquery';
-// Bootstrap v4 currently requires window.Tether to exist.
-import * as Tether from 'tether';
-(<any> window).Tether = Tether;
-import 'bootstrap';
 
 if ('production' === ENV) {
     // Production