diff --git a/build.sh b/build.sh
index 9263449503..6c32b40797 100755
--- a/build.sh
+++ b/build.sh
@@ -6,9 +6,9 @@ cd `dirname $0`
 
 
 TSCONFIG=./modules/tsconfig.json
-echo "====== (all)COMPILING: \$(npm bin)/ng2tc -p ${TSCONFIG} ====="
+echo "====== (all)COMPILING: \$(npm bin)/tsc -p ${TSCONFIG} ====="
 rm -rf ./dist/all/
-$(npm bin)/ng2tc -p ${TSCONFIG}
+$(npm bin)/tsc -p ${TSCONFIG}
 
 
 rm -rf ./dist/packages-dist
@@ -30,8 +30,8 @@ do
   UMDES5PATH=${DESTDIR}/${PACKAGE}.umd.js
 
 
-  echo "======      COMPILING: \$(npm bin)/ng2tc -p ${SRCDIR}/tsconfig.json        ====="
-  $(npm bin)/ng2tc -p ${SRCDIR}/tsconfig.json
+  echo "======      COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig.json        ====="
+  $(npm bin)/tsc -p ${SRCDIR}/tsconfig.json
   cp ${SRCDIR}/package.json ${DESTDIR}/
 
 
@@ -44,8 +44,8 @@ do
   fi
 
 
-  echo "====== (esm)COMPILING: \$(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es2015.json ====="
-  $(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es2015.json
+  echo "====== (esm)COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json ====="
+  $(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json
 
 
   echo "======      BUNDLING: ${SRCDIR} ====="
diff --git a/modules/@angular/common/tsconfig-es2015.json b/modules/@angular/common/tsconfig-es2015.json
index e2777e8390..8608568c02 100644
--- a/modules/@angular/common/tsconfig-es2015.json
+++ b/modules/@angular/common/tsconfig-es2015.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/common/tsconfig.json b/modules/@angular/common/tsconfig.json
index d2a895ed3f..3bb02d7d91 100644
--- a/modules/@angular/common/tsconfig.json
+++ b/modules/@angular/common/tsconfig.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/compiler/tsconfig-es2015.json b/modules/@angular/compiler/tsconfig-es2015.json
index 0748be28df..e3eff4974c 100644
--- a/modules/@angular/compiler/tsconfig-es2015.json
+++ b/modules/@angular/compiler/tsconfig-es2015.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/compiler/tsconfig.json b/modules/@angular/compiler/tsconfig.json
index 47f94011d4..b184b16d68 100644
--- a/modules/@angular/compiler/tsconfig.json
+++ b/modules/@angular/compiler/tsconfig.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/core/tsconfig-es2015.json b/modules/@angular/core/tsconfig-es2015.json
index 2fddf77860..78b6280696 100644
--- a/modules/@angular/core/tsconfig-es2015.json
+++ b/modules/@angular/core/tsconfig-es2015.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/core/tsconfig.json b/modules/@angular/core/tsconfig.json
index 1775327c41..3b7834904d 100644
--- a/modules/@angular/core/tsconfig.json
+++ b/modules/@angular/core/tsconfig.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/http/tsconfig-es2015.json b/modules/@angular/http/tsconfig-es2015.json
index 33f9dbe4ea..0aae89c028 100644
--- a/modules/@angular/http/tsconfig-es2015.json
+++ b/modules/@angular/http/tsconfig-es2015.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/http/tsconfig.json b/modules/@angular/http/tsconfig.json
index 8ca797bb6b..610e0bc930 100644
--- a/modules/@angular/http/tsconfig.json
+++ b/modules/@angular/http/tsconfig.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/platform-browser-dynamic/tsconfig-es2015.json b/modules/@angular/platform-browser-dynamic/tsconfig-es2015.json
index 8a784c2485..e48a4b6ecc 100644
--- a/modules/@angular/platform-browser-dynamic/tsconfig-es2015.json
+++ b/modules/@angular/platform-browser-dynamic/tsconfig-es2015.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/platform-browser-dynamic/tsconfig.json b/modules/@angular/platform-browser-dynamic/tsconfig.json
index a5db5574b7..94000ba24b 100644
--- a/modules/@angular/platform-browser-dynamic/tsconfig.json
+++ b/modules/@angular/platform-browser-dynamic/tsconfig.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/platform-browser/tsconfig-es2015.json b/modules/@angular/platform-browser/tsconfig-es2015.json
index 836d3c6b4c..e3dca138a1 100644
--- a/modules/@angular/platform-browser/tsconfig-es2015.json
+++ b/modules/@angular/platform-browser/tsconfig-es2015.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/platform-browser/tsconfig.json b/modules/@angular/platform-browser/tsconfig.json
index fbde0e5900..4b64f213a0 100644
--- a/modules/@angular/platform-browser/tsconfig.json
+++ b/modules/@angular/platform-browser/tsconfig.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/platform-server/tsconfig-es2015.json b/modules/@angular/platform-server/tsconfig-es2015.json
index 926644da94..a8cc7b7659 100644
--- a/modules/@angular/platform-server/tsconfig-es2015.json
+++ b/modules/@angular/platform-server/tsconfig-es2015.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/platform-server/tsconfig.json b/modules/@angular/platform-server/tsconfig.json
index 12d6d2c108..1ff19ad813 100644
--- a/modules/@angular/platform-server/tsconfig.json
+++ b/modules/@angular/platform-server/tsconfig.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/router/tsconfig-es2015.json b/modules/@angular/router/tsconfig-es2015.json
index a952fd0126..e13e77b3ea 100644
--- a/modules/@angular/router/tsconfig-es2015.json
+++ b/modules/@angular/router/tsconfig-es2015.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/router/tsconfig.json b/modules/@angular/router/tsconfig.json
index ff8568d7ef..a7727259d2 100644
--- a/modules/@angular/router/tsconfig.json
+++ b/modules/@angular/router/tsconfig.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/upgrade/tsconfig-es2015.json b/modules/@angular/upgrade/tsconfig-es2015.json
index 7c9d657a37..15106250a4 100644
--- a/modules/@angular/upgrade/tsconfig-es2015.json
+++ b/modules/@angular/upgrade/tsconfig-es2015.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/@angular/upgrade/tsconfig.json b/modules/@angular/upgrade/tsconfig.json
index 5b38c01ffd..12eb9587ed 100644
--- a/modules/@angular/upgrade/tsconfig.json
+++ b/modules/@angular/upgrade/tsconfig.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/modules/tsconfig.json b/modules/tsconfig.json
index d1907a5054..56c76c81bf 100644
--- a/modules/tsconfig.json
+++ b/modules/tsconfig.json
@@ -1,7 +1,4 @@
 {
-  "angularCompilerOptions": {
-    "skipTemplateCodegen": true
-  },
   "compilerOptions": {
     "baseUrl": ".",
     "declaration": true,
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 79136d1288..074272a383 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -54,13 +54,6 @@
     "angular-mocks": {
       "version": "1.5.0"
     },
-    "angular2": {
-      "version": "2.0.0-beta.17",
-      "resolved": "git://github.com/angular/angular.git#08cbd5481d04255864f5ff8e33d0756d4ec4c440"
-    },
-    "angular2-template-compiler": {
-      "version": "0.1.5"
-    },
     "ansi": {
       "version": "0.3.0"
     },
@@ -5368,9 +5361,6 @@
         }
       }
     },
-    "ts-metadata-collector": {
-      "version": "0.1.1"
-    },
     "ts2dart": {
       "version": "0.9.10",
       "dependencies": {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index d8a1972100..83894efbf0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -88,16 +88,6 @@
       "from": "angular-mocks@1.5.0",
       "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.5.0.tgz"
     },
-    "angular2": {
-      "version": "2.0.0-beta.17",
-      "from": "angular/angular#2.0.0-build.cacdead.js",
-      "resolved": "git://github.com/angular/angular.git#08cbd5481d04255864f5ff8e33d0756d4ec4c440"
-    },
-    "angular2-template-compiler": {
-      "version": "0.1.5",
-      "from": "angular2-template-compiler@0.1.5",
-      "resolved": "file:dist/js/cjs/compiler_cli"
-    },
     "ansi": {
       "version": "0.3.0",
       "from": "ansi@>=0.3.0 <0.4.0",
@@ -8559,11 +8549,6 @@
         }
       }
     },
-    "ts-metadata-collector": {
-      "version": "0.1.1",
-      "from": "ts-metadata-collector@>=0.1.0 <0.2.0",
-      "resolved": "file:dist/tools/metadata"
-    },
     "ts2dart": {
       "version": "0.9.10",
       "from": "ts2dart@>=0.9.9 <0.10.0",
diff --git a/package.json b/package.json
index 835f82fbac..fc1eacf3ff 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,6 @@
     "angular": "^1.5.0",
     "angular-animate": "^1.5.0",
     "angular-mocks": "^1.5.0",
-    "angular2-template-compiler": "^0.1.5",
     "base64-js": "^0.0.8",
     "bower": "^1.3.12",
     "broccoli": "^0.16.9",