diff --git a/package.json b/package.json
index ff3afddc2e42..ff77eba4de90 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-cli/ast-tools": "^1.0.0",
     "@angular/compiler": "^2.3.1",
     "@angular/compiler-cli": "^2.3.1",
     "@angular/core": "^2.3.1",
diff --git a/packages/@angular-cli/ast-tools/src/ast-utils.spec.ts b/packages/@angular-cli/ast-tools/src/ast-utils.spec.ts
index 17c0444e417b..add77d389a06 100644
--- a/packages/@angular-cli/ast-tools/src/ast-utils.spec.ts
+++ b/packages/@angular-cli/ast-tools/src/ast-utils.spec.ts
@@ -296,5 +296,5 @@ function getNodesOfKind(kind: ts.SyntaxKind, sourceFile: string) {
 
 function getRootNode(sourceFile: string) {
   return ts.createSourceFile(sourceFile, fs.readFileSync(sourceFile).toString(),
-    ts.ScriptTarget.ES6, true);
+    ts.ScriptTarget.Latest, true);
 }
diff --git a/packages/@angular-cli/ast-tools/src/ast-utils.ts b/packages/@angular-cli/ast-tools/src/ast-utils.ts
index 8d0980102116..6d79d1ab8111 100644
--- a/packages/@angular-cli/ast-tools/src/ast-utils.ts
+++ b/packages/@angular-cli/ast-tools/src/ast-utils.ts
@@ -29,7 +29,7 @@ import 'rxjs/add/operator/toPromise';
 */
 export function getSource(filePath: string): ts.SourceFile {
   return ts.createSourceFile(filePath, fs.readFileSync(filePath).toString(),
-    ts.ScriptTarget.ES6, true);
+    ts.ScriptTarget.Latest, true);
 }
 
 
diff --git a/packages/@angular-cli/ast-tools/src/change.ts b/packages/@angular-cli/ast-tools/src/change.ts
index 14e537575b3c..b9b2655d6912 100644
--- a/packages/@angular-cli/ast-tools/src/change.ts
+++ b/packages/@angular-cli/ast-tools/src/change.ts
@@ -1,8 +1,8 @@
 import fs = require('fs');
 import denodeify = require('denodeify');
 
-const readFile = (denodeify(fs.readFile) as (...args: any[]) => Promise<string>);
-const writeFile = (denodeify(fs.writeFile) as (...args: any[]) => Promise<string>);
+const readFile = (denodeify(fs.readFile) as (...args: any[]) => Promise<any>);
+const writeFile = (denodeify(fs.writeFile) as (...args: any[]) => Promise<any>);
 
 export interface Host {
   write(path: string, content: string): Promise<void>;
diff --git a/packages/@angular-cli/ast-tools/src/route-utils.spec.ts b/packages/@angular-cli/ast-tools/src/route-utils.spec.ts
index 4405742a35f4..3b7f32a75e1a 100644
--- a/packages/@angular-cli/ast-tools/src/route-utils.spec.ts
+++ b/packages/@angular-cli/ast-tools/src/route-utils.spec.ts
@@ -7,7 +7,7 @@ import denodeify = require('denodeify');
 import * as _ from 'lodash';
 import {it} from './spec-utils';
 
-const readFile = (denodeify(fs.readFile) as (...args: any[]) => Promise<string>);
+const readFile = (denodeify(fs.readFile) as (...args: any[]) => Promise<any>);
 
 
 describe('route utils', () => {
diff --git a/packages/@angular-cli/ast-tools/src/route-utils.ts b/packages/@angular-cli/ast-tools/src/route-utils.ts
index 4455bafdc814..c36a995c0faf 100644
--- a/packages/@angular-cli/ast-tools/src/route-utils.ts
+++ b/packages/@angular-cli/ast-tools/src/route-utils.ts
@@ -553,5 +553,5 @@ function getValueForKey(objectLiteralNode: ts.Node, key: string) {
  * @param file
  */
 function getRootNode(file: string) {
-  return ts.createSourceFile(file, fs.readFileSync(file).toString(), ts.ScriptTarget.ES6, true);
+  return ts.createSourceFile(file, fs.readFileSync(file).toString(), ts.ScriptTarget.Latest, true);
 }
diff --git a/packages/angular-cli/commands/get.ts b/packages/angular-cli/commands/get.ts
index f567f76809e8..87220310d4fb 100644
--- a/packages/angular-cli/commands/get.ts
+++ b/packages/angular-cli/commands/get.ts
@@ -11,7 +11,7 @@ const GetCommand = Command.extend({
   availableOptions: [],
 
   run: function (commandOptions: any, rawArgs: string[]): Promise<void> {
-    return new Promise(resolve => {
+    return new Promise<void>(resolve => {
       const config = CliConfig.fromProject();
       const value = config.get(rawArgs[0]);
 
diff --git a/packages/angular-cli/commands/set.ts b/packages/angular-cli/commands/set.ts
index 6530f7ee5908..a89184980e1d 100644
--- a/packages/angular-cli/commands/set.ts
+++ b/packages/angular-cli/commands/set.ts
@@ -29,7 +29,7 @@ const SetCommand = Command.extend({
   },
 
   run: function (commandOptions: any, rawArgs: string[]): Promise<void> {
-    return new Promise(resolve => {
+    return new Promise<void>(resolve => {
       const [jsonPath, rawValue] = rawArgs;
       const config = CliConfig.fromProject();
       const type = config.typeOf(jsonPath);
diff --git a/packages/angular-cli/utilities/get-dependent-files.ts b/packages/angular-cli/utilities/get-dependent-files.ts
index 73a5cf847663..ff8db613c949 100644
--- a/packages/angular-cli/utilities/get-dependent-files.ts
+++ b/packages/angular-cli/utilities/get-dependent-files.ts
@@ -32,7 +32,7 @@ export interface ModuleMap {
 export function createTsSourceFile(fileName: string): Promise<ts.SourceFile> {
   return readFile(fileName, 'utf8')
     .then((contents: string) => {
-      return ts.createSourceFile(fileName, contents, ts.ScriptTarget.ES6, true);
+      return ts.createSourceFile(fileName, contents, ts.ScriptTarget.Latest, true);
     });
 }