diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 510163b..e7794b1 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject } from '@angular/core';
+import { Component } from '@angular/core';
 import { ChatExampleData } from './data/chat-example-data';
 
 import { UsersService } from './user/users.service';
@@ -11,9 +11,9 @@ import { MessagesService } from './message/messages.service';
   styleUrls: ['./app.component.css']
 })
 export class AppComponent {
-    constructor(public messagesService: MessagesService,
-              public threadsService: ThreadsService,
-              public usersService: UsersService) {
+  constructor(public messagesService: MessagesService,
+    public threadsService: ThreadsService,
+    public usersService: UsersService) {
     ChatExampleData.init(messagesService, threadsService, usersService);
   }
 }
diff --git a/src/app/chat-message/chat-message.component.ts b/src/app/chat-message/chat-message.component.ts
index c2d50c1..609bb17 100644
--- a/src/app/chat-message/chat-message.component.ts
+++ b/src/app/chat-message/chat-message.component.ts
@@ -3,14 +3,9 @@ import {
   OnInit,
   Input
 } from '@angular/core';
-import { Observable } from 'rxjs';
 
 import { UsersService } from './../user/users.service';
-import { ThreadsService } from './../thread/threads.service';
-import { MessagesService } from './../message/messages.service';
-
 import { Message } from './../message/message.model';
-import { Thread } from './../thread/thread.model';
 import { User } from './../user/user.model';
 
 @Component({
diff --git a/src/app/chat-thread/chat-thread.component.ts b/src/app/chat-thread/chat-thread.component.ts
index 9d9db81..7288c85 100644
--- a/src/app/chat-thread/chat-thread.component.ts
+++ b/src/app/chat-thread/chat-thread.component.ts
@@ -1,11 +1,8 @@
 import {
   Component,
   OnInit,
-  Input,
-  Output,
-  EventEmitter
+  Input
 } from '@angular/core';
-import { Observable } from 'rxjs';
 import { ThreadsService } from './../thread/threads.service';
 import { Thread } from '../thread/thread.model';
 
diff --git a/src/app/chat-threads/chat-threads.component.ts b/src/app/chat-threads/chat-threads.component.ts
index c1b6cda..833c464 100644
--- a/src/app/chat-threads/chat-threads.component.ts
+++ b/src/app/chat-threads/chat-threads.component.ts
@@ -1,10 +1,7 @@
 import {
-  Component,
-  OnInit,
-  Inject
+  Component
 } from '@angular/core';
 import { Observable } from 'rxjs';
-import { Thread } from '../thread/thread.model';
 import { ThreadsService } from './../thread/threads.service';
 
 @Component({
diff --git a/src/app/chat-window/chat-window.component.ts b/src/app/chat-window/chat-window.component.ts
index 0f3e736..80b0da5 100644
--- a/src/app/chat-window/chat-window.component.ts
+++ b/src/app/chat-window/chat-window.component.ts
@@ -1,6 +1,5 @@
 import {
   Component,
-  Inject,
   ElementRef,
   OnInit,
   ChangeDetectionStrategy
@@ -29,8 +28,7 @@ export class ChatWindowComponent implements OnInit {
   constructor(public messagesService: MessagesService,
               public threadsService: ThreadsService,
               public UsersService: UsersService,
-              public el: ElementRef) {
-  }
+              public el: ElementRef) {  }
 
   ngOnInit(): void {
     this.messages = this.threadsService.currentThreadMessages;