diff --git a/src/angularfire2.ts b/src/angularfire2.ts
index f859c4fe6..10ddc81a4 100644
--- a/src/angularfire2.ts
+++ b/src/angularfire2.ts
@@ -26,7 +26,6 @@ import {
   FirebaseSdkAuthBackend,
   AngularFireAuth,
   firebaseAuthConfig,
-  FirebaseAuth,
   AuthBackend,
   AuthMethods,
   AuthProviders,
@@ -37,8 +36,7 @@ import {
   FirebaseObjectObservable,
   FirebaseListFactory,
   FirebaseObjectFactory,
-  AngularFireDatabase,
-  FirebaseDatabase
+  AngularFireDatabase
 } from './database/index';
 
 @Injectable()
@@ -77,10 +75,6 @@ export function _getDefaultFirebase(config){
 }
 
 export const COMMON_PROVIDERS: any[] = [
-  // TODO: Deprecate
-  { provide: FirebaseAuth,
-    useExisting: AngularFireAuth
-  },
   {
     provide: FirebaseApp,
     useFactory: _getFirebase,
@@ -135,10 +129,6 @@ export class AngularFireModule {
 export {
   AngularFireAuth,
   AngularFireDatabase,
-  // TODO: Deprecate
-  FirebaseAuth,
-  // TODO: Deprecate
-  FirebaseDatabase,
   FirebaseListObservable,
   FirebaseObjectObservable,
   FirebaseListFactory,
diff --git a/src/auth/auth.ts b/src/auth/auth.ts
index a60ca0637..4fe5fdb02 100644
--- a/src/auth/auth.ts
+++ b/src/auth/auth.ts
@@ -185,5 +185,3 @@ function attachCredentialToAuthState (authState: FirebaseAuthState, credential,
   authState[stripProviderId(providerId)] = credential;
   return authState;
 }
-// TODO: Deprecate
-export class FirebaseAuth extends AngularFireAuth {}
diff --git a/src/database/database.ts b/src/database/database.ts
index 8927c0344..7acfb258f 100644
--- a/src/database/database.ts
+++ b/src/database/database.ts
@@ -29,9 +29,6 @@ export class AngularFireDatabase {
   }
 }
 
-// TODO: Deprecate
-export class FirebaseDatabase extends AngularFireDatabase {}
-
 function getAbsUrl (root:FirebaseAppConfig, url:string) {
   if (!(/^[a-z]+:\/\/.*/.test(url))) {
     // Provided url is relative.