diff --git a/aio/content/examples/toh-pt6/e2e/src/app.e2e-spec.ts b/aio/content/examples/toh-pt6/e2e/src/app.e2e-spec.ts
index a6c0ca7de6..cbd0df76d4 100644
--- a/aio/content/examples/toh-pt6/e2e/src/app.e2e-spec.ts
+++ b/aio/content/examples/toh-pt6/e2e/src/app.e2e-spec.ts
@@ -44,9 +44,6 @@ class Hero {
   }
 }
 
-// TODO(i): temorarily disable these tests because angular-in-memory-web-api is not compatible with rxjs v6 yet
-//          and we don't have the backwards compatibility package yet.
-//          Reenable after rxjs v6 compatibility package is out or angular-in-memory-web-api is compatible with rxjs v6
 describe('Tutorial part 6', () => {
 
   beforeAll(() => browser.get(''));
diff --git a/aio/content/examples/upgrade-module/src/systemjs.config.1.js b/aio/content/examples/upgrade-module/src/systemjs.config.1.js
index d7d3d68785..67e5fa5464 100644
--- a/aio/content/examples/upgrade-module/src/systemjs.config.1.js
+++ b/aio/content/examples/upgrade-module/src/systemjs.config.1.js
@@ -27,8 +27,7 @@
 
       // other libraries
       'rxjs': 'npm:rxjs',
-      'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js',
-      'tslib': 'npm:tslib/tslib.js',
+      'angular-in-memory-web-api': 'npm:angular-in-memory-web-api/bundles/in-memory-web-api.umd.js'
     },
     // packages tells the System loader how to load when no filename and/or no extension
     packages: {
@@ -37,11 +36,7 @@
       'rxjs/operators': {main: 'index.js', defaultExtension: 'js' },
       'rxjs/testing': {main: 'index.js', defaultExtension: 'js' },
       'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' },
-      'rxjs/ajax': {main: 'index.js', defaultExtension: 'js' },
-      'rxjs/operators': {main: 'index.js', defaultExtension: 'js' },
-      'rxjs/testing': {main: 'index.js', defaultExtension: 'js' },
-      'rxjs/websocket': {main: 'index.js', defaultExtension: 'js' },
-      'rxjs': { main: 'index.js', defaultExtension: 'js' }
+      'rxjs': { main: 'index.js', defaultExtension: 'js' },
     }
   });
 })(this);
diff --git a/aio/tools/example-zipper/customizer/package-json/base.json b/aio/tools/example-zipper/customizer/package-json/base.json
index 20254af421..85c8e13d8c 100644
--- a/aio/tools/example-zipper/customizer/package-json/base.json
+++ b/aio/tools/example-zipper/customizer/package-json/base.json
@@ -18,7 +18,6 @@
     "angular-in-memory-web-api",
     "core-js",
     "rxjs",
-    "web-animations-js",
     "zone.js"
   ],
   "devDependencies": [
diff --git a/aio/tools/examples/shared/boilerplate/cli/.gitignore b/aio/tools/examples/shared/boilerplate/cli/.gitignore
index baa28d9dd4..6b66814308 100644
--- a/aio/tools/examples/shared/boilerplate/cli/.gitignore
+++ b/aio/tools/examples/shared/boilerplate/cli/.gitignore
@@ -35,7 +35,7 @@ testem.log
 yarn-error.log
 
 # e2e
-/e2e/(?!protractor)*.js
+/e2e/*.js
 /e2e/*.map
 
 # System Files
diff --git a/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts b/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts
index 6e818e047a..e16a72f6c9 100644
--- a/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts
+++ b/aio/tools/examples/shared/boilerplate/cli/src/polyfills.ts
@@ -50,7 +50,7 @@ import 'core-js/es7/reflect';
  * Required to support Web Animations `@angular/platform-browser/animations`.
  * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
  **/
-import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+// import 'web-animations-js';
 
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents