--- a/Framework/Messages/IObservable.h	Fri Oct 11 13:38:35 2019 +0200
+++ b/Framework/Messages/IObservable.h	Fri Oct 11 17:08:34 2019 +0200
@@ -24,7 +24,6 @@
 #include "../StoneEnumerations.h"
 #include "ICallable.h"
 #include "IObserver.h"
-#include "MessageBroker.h"
 #include "MessageForwarder.h"
 
 #include <set>
@@ -39,7 +38,6 @@
 
     typedef std::set<IMessageForwarder*>     Forwarders;
 
-    MessageBroker&  broker_;
     Callables       callables_;
     Forwarders      forwarders_;
 
@@ -47,21 +45,12 @@
                              const IMessage& message);
 
   public:
-    IObservable(MessageBroker& broker) :
-      broker_(broker)
-    {
-    }
-
     virtual ~IObservable();
 
-    MessageBroker& GetBroker() const
-    {
-      return broker_;
-    }
-
     // Takes ownsership
     void RegisterObserverCallback(ICallable* callable);
 
+    // TODO - Remove this?
     void Unregister(IObserver* observer);
 
     void BroadcastMessage(const IMessage& message);