diff --git a/src/directives/uiSrefStatus.ts b/src/directives/uiSrefStatus.ts
index 37bec1c77..39843351d 100644
--- a/src/directives/uiSrefStatus.ts
+++ b/src/directives/uiSrefStatus.ts
@@ -1,17 +1,20 @@
-/** @ng2api @module directives */ /** */
-import {Directive, Output, EventEmitter, ContentChildren, QueryList, Inject} from "@angular/core";
-import {UISref} from "./uiSref";
-import {PathNode} from "ui-router-core";
-import {Transition} from "ui-router-core";
-import {TargetState} from "ui-router-core";
-import {State} from "ui-router-core";
-import {anyTrueR, tail, unnestR, Predicate} from "ui-router-core";
-import {UIRouterGlobals} from "ui-router-core";
-import {Param} from "ui-router-core";
-import {PathFactory} from "ui-router-core";
-import {Subscription} from "rxjs/Subscription";
-import {Observable} from "rxjs/Observable";
-import {BehaviorSubject} from "rxjs/BehaviorSubject";
+/** @ng2api @module directives */
+/** */
+import { Directive, Output, EventEmitter, ContentChildren, QueryList } from '@angular/core';
+import { UISref } from './uiSref';
+import {
+  PathNode, Transition, TargetState, State, anyTrueR, tail, unnestR, Predicate, UIRouterGlobals, Param, PathFactory
+} from 'ui-router-core';
+
+import { Subscription } from 'rxjs/Subscription';
+import { Observable } from 'rxjs/Observable';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+
+import 'rxjs/add/observable/of';
+import 'rxjs/add/observable/fromPromise';
+import 'rxjs/add/observable/combineLatest';
+import 'rxjs/add/operator/concat';
+import 'rxjs/add/operator/switchMap';
 
 /** @internalapi */
 interface TransEvt { evt: string, trans: Transition }
diff --git a/src/index.ts b/src/index.ts
index ae9351ffe..fb78870ea 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,16 +1,4 @@
 /** @ng2api @module ng2 */ /** for typedoc */
-import "rxjs/Observable";
-import "rxjs/ReplaySubject";
-import "rxjs/BehaviorSubject";
-import "rxjs/Subscription";
-import 'rxjs/add/observable/of';
-import 'rxjs/add/observable/combineLatest';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/switchMap';
-import 'rxjs/add/operator/mergeMap';
-import 'rxjs/add/operator/concat';
-import 'rxjs/add/operator/map';
-
 export * from "ui-router-core";
 export * from "./interface";
 export * from "./providers";