diff --git a/bin/parser_generator_for_spec.dart b/bin/parser_generator_for_spec.dart
index 7333a3d33..b4248b64b 100644
--- a/bin/parser_generator_for_spec.dart
+++ b/bin/parser_generator_for_spec.dart
@@ -2,7 +2,6 @@ import 'dart:io' as io;
 
 import 'package:di/di.dart';
 import 'package:di/dynamic_injector.dart';
-import 'package:angular/core/module_internal.dart';
 import 'package:angular/core/parser/parser.dart';
 import 'package:angular/tools/parser_getter_setter/generator.dart';
 
diff --git a/example/web/bouncing_balls.dart b/example/web/bouncing_balls.dart
index 34d2d25c9..4684bde98 100644
--- a/example/web/bouncing_balls.dart
+++ b/example/web/bouncing_balls.dart
@@ -1,7 +1,5 @@
-import 'package:perf_api/perf_api.dart';
 import 'package:angular/angular.dart';
 import 'package:angular/angular_dynamic.dart';
-import 'package:angular/change_detection/change_detection.dart';
 import 'dart:html';
 import 'dart:math';
 import 'dart:core';
diff --git a/lib/mock/module.dart b/lib/mock/module.dart
index 6236965a8..4bc69b7c1 100644
--- a/lib/mock/module.dart
+++ b/lib/mock/module.dart
@@ -22,7 +22,6 @@ import 'package:angular/angular.dart';
 import 'package:angular/core/module_internal.dart';
 import 'package:angular/core_dom/module_internal.dart';
 import 'package:angular/core/parser/parser.dart';
-import 'package:angular/mock/test_injection.dart';
 import 'package:di/di.dart';
 import 'package:mock/mock.dart';
 
diff --git a/lib/tools/expression_extractor.dart b/lib/tools/expression_extractor.dart
index 8180cb8f2..e59705d1c 100644
--- a/lib/tools/expression_extractor.dart
+++ b/lib/tools/expression_extractor.dart
@@ -12,7 +12,6 @@ import 'package:angular/tools/common.dart';
 import 'package:di/di.dart';
 import 'package:di/dynamic_injector.dart';
 
-import 'package:angular/core/module_internal.dart';
 import 'package:angular/core/parser/parser.dart';
 import 'package:angular/tools/parser_getter_setter/generator.dart';
 
diff --git a/lib/tools/transformer/metadata_generator.dart b/lib/tools/transformer/metadata_generator.dart
index ffa79e9e0..c42a8b899 100644
--- a/lib/tools/transformer/metadata_generator.dart
+++ b/lib/tools/transformer/metadata_generator.dart
@@ -5,7 +5,6 @@ import 'package:analyzer/src/generated/element.dart';
 import 'package:angular/tools/transformer/options.dart';
 import 'package:barback/barback.dart';
 import 'package:code_transformers/resolver.dart';
-import 'package:di/transformer/refactor.dart';
 import 'package:path/path.dart' as path;
 
 import 'metadata_extractor.dart';
diff --git a/lib/tools/transformer/options.dart b/lib/tools/transformer/options.dart
index f4de9794b..f95f2ab51 100644
--- a/lib/tools/transformer/options.dart
+++ b/lib/tools/transformer/options.dart
@@ -3,11 +3,8 @@ library angular.tools.transformer.options;
 import 'dart:async';
 
 import 'package:barback/barback.dart';
-import 'package:analyzer/analyzer.dart' as analyzer;
-import 'package:analyzer/src/generated/ast.dart';
 import 'package:code_transformers/resolver.dart';
 import 'package:di/transformer/options.dart' as di;
-import 'package:path/path.dart' as path;
 
 /** Options used by Angular transformers */
 class TransformOptions {
diff --git a/lib/tools/transformer/static_angular_generator.dart b/lib/tools/transformer/static_angular_generator.dart
index 631b6b8be..9b564d719 100644
--- a/lib/tools/transformer/static_angular_generator.dart
+++ b/lib/tools/transformer/static_angular_generator.dart
@@ -5,7 +5,6 @@ import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:angular/tools/transformer/options.dart';
 import 'package:code_transformers/resolver.dart';
-import 'package:di/transformer/refactor.dart';
 import 'package:barback/barback.dart';
 import 'package:path/path.dart' as path;
 import 'package:source_maps/refactor.dart' show TextEditTransaction;
diff --git a/test/_specs.dart b/test/_specs.dart
index c03e4b185..9c48ea771 100644
--- a/test/_specs.dart
+++ b/test/_specs.dart
@@ -11,7 +11,6 @@ import 'jasmine_syntax.dart' as jasmine_syntax;
 export 'dart:html' hide Animation;
 export 'package:unittest/unittest.dart';
 export 'package:mock/mock.dart';
-export 'package:unittest/mock.dart';
 export 'package:di/di.dart';
 export 'package:di/dynamic_injector.dart';
 export 'package:angular/angular.dart';
diff --git a/test/io/test_files/cssUrls/main.dart b/test/io/test_files/cssUrls/main.dart
index 5da0b55ed..963ff94e7 100644
--- a/test/io/test_files/cssUrls/main.dart
+++ b/test/io/test_files/cssUrls/main.dart
@@ -1,6 +1,6 @@
 library test_files.main;
 
-import 'package:angular/core/module.dart';
+import 'package:angular/core/annotation_src.dart';
 
 @NgComponent(
     selector: 'my-component',
diff --git a/test/io/test_files/main.dart b/test/io/test_files/main.dart
index 5c0052bf5..6ab15ab72 100644
--- a/test/io/test_files/main.dart
+++ b/test/io/test_files/main.dart
@@ -1,5 +1,7 @@
 library test_files.main;
 
+import 'package:angular/core/annotation_src.dart';
+
 @NgDirective(
     children: AbstractNgAnnotation.TRANSCLUDE_CHILDREN,
     selector:'[ng-if]',