diff --git a/Hubs/Broadcaster.cs b/Hubs/Broadcaster.cs
index 9dd8849..feb51f1 100644
--- a/Hubs/Broadcaster.cs
+++ b/Hubs/Broadcaster.cs
@@ -9,10 +9,6 @@ namespace LiveGameFeed.Hubs
         {
             return Clients.All.userConnected("New connection " + Context.ConnectionId);
         }
-        public Task Broadcast(string message)
-        {
-            return Clients.All.messageReceived(Context.ConnectionId + "> " + message);
-        }
 
         public Task Subscribe(int matchId)
         {
diff --git a/app/shared/interfaces.ts b/app/shared/interfaces.ts
index 92f33b7..056c3a4 100644
--- a/app/shared/interfaces.ts
+++ b/app/shared/interfaces.ts
@@ -14,7 +14,6 @@ export interface FeedClient {
 
     updateMatch: (match: Match) => void;
     addFeed: (feed: Feed) => void;
-    messageReceived: (message: string) => void;
     addChatMessage: (chatMessage: ChatMessage) => void;
 }
 
diff --git a/app/shared/services/feed.service.ts b/app/shared/services/feed.service.ts
index 8761e0a..103d36e 100644
--- a/app/shared/services/feed.service.ts
+++ b/app/shared/services/feed.service.ts
@@ -12,11 +12,10 @@ export class FeedService {
 
     currentState = ConnectionState.Disconnected;
     connectionState: Observable<ConnectionState>;
-    userConnected: Observable<any>;
 
+    userConnected: Observable<any>;
     updateMatch: Observable<Match>;
     addFeed: Observable<Feed>;
-    messageReceived: Observable<string>;
     addChatMessage: Observable<ChatMessage>;
 
     private connectionStateSubject = new Subject<ConnectionState>();
@@ -24,18 +23,16 @@ export class FeedService {
 
     private updateMatchSubject = new Subject<Match>();
     private addFeedSubject = new Subject<Feed>();
-    private messageReceivedSubject = new Subject<string>();
     private addChatMessageSubject = new Subject<ChatMessage>();
 
     private server: FeedServer;
 
     constructor(private http: Http) {
         this.connectionState = this.connectionStateSubject.asObservable();
-        this.userConnected = this.userConnectedSubject.asObservable();
 
+        this.userConnected = this.userConnectedSubject.asObservable();
         this.updateMatch = this.updateMatchSubject.asObservable();
         this.addFeed = this.addFeedSubject.asObservable();
-        this.messageReceived = this.messageReceivedSubject.asObservable();
         this.addChatMessage = this.addChatMessageSubject.asObservable();
     }
 
@@ -52,7 +49,7 @@ export class FeedService {
          * @param User user, the connected user
        */
         feedHub.client.userConnected = user => this.onUserConnected(user);
-        
+
         /**
           * @desc callback when match score is updated
         */
@@ -63,34 +60,8 @@ export class FeedService {
         */
         feedHub.client.addFeed = feed => this.onAddFeed(feed);
 
-        /**
-          * @desc callback when a message is received
-          * @param String to, the conversation id
-          * @param Message data, the message
-        */
-        feedHub.client.messageReceived = message => this.onMessageReceived(message);
-
         feedHub.client.addChatMessage = chatMessage => this.onAddChatMessage(chatMessage);
 
-        if (debug) {
-            // for debug only, callback on connection state change
-            $.connection.hub.stateChanged(change => {
-                let oldState: string,
-                    newState: string;
-
-                for (var state in $.signalR.connectionState) {
-                    if ($.signalR.connectionState[state] === change.oldState) {
-                        oldState = state;
-                    }
-                    if ($.signalR.connectionState[state] === change.newState) {
-                        newState = state;
-                    }
-                }
-
-                console.log("Feed Hub state changed from " + oldState + " to " + newState);
-            });
-        }
-
         // start the connection
         $.connection.hub.start()
             .done(response => this.setConnectionState(ConnectionState.Connected))
@@ -105,6 +76,7 @@ export class FeedService {
         this.connectionStateSubject.next(connectionState);
     }
 
+    // Client side methods
     private onUserConnected(user: any) {
         this.userConnectedSubject.next(user);
     }
@@ -118,15 +90,12 @@ export class FeedService {
         this.addFeedSubject.next(feed);
     }
 
-    private onMessageReceived(message: string) {
-        this.messageReceivedSubject.next(message);
-    }
-
     private onAddChatMessage(chatMessage: ChatMessage) {
         console.log(chatMessage);
         this.addChatMessageSubject.next(chatMessage);
     }
 
+    // Server side methods
     public subscribeToFeed(matchId: number) {
         this.server.subscribe(matchId);
     }