diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultObserverHandler.java b/li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultObserverHandler.java
index d449a6088..2d6eed840 100644
--- a/li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultObserverHandler.java
+++ b/li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultObserverHandler.java
@@ -23,15 +23,14 @@ import java.util.List;
 import java.util.ResourceBundle;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
 
 import li.strolch.agent.api.*;
-import li.strolch.model.log.LogMessage;
-import li.strolch.model.log.LogMessageState;
-import li.strolch.model.log.LogSeverity;
 import li.strolch.handler.operationslog.OperationsLog;
 import li.strolch.model.Locator;
 import li.strolch.model.StrolchRootElement;
+import li.strolch.model.log.LogMessage;
+import li.strolch.model.log.LogMessageState;
+import li.strolch.model.log.LogSeverity;
 import li.strolch.utils.collections.MapOfLists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,8 +47,7 @@ public class DefaultObserverHandler implements ObserverHandler {
 	private final StrolchAgent agent;
 	private final StrolchRealm realm;
 
-	private MapOfLists<String, Observer> observerMap;
-	private Future<?> future;
+	private final MapOfLists<String, Observer> observerMap;
 
 	public DefaultObserverHandler(StrolchAgent agent, StrolchRealm realm) {
 		this.agent = agent;
@@ -64,26 +62,17 @@ public class DefaultObserverHandler implements ObserverHandler {
 
 	@Override
 	public void stop() {
-
-		if (this.future != null) {
-			this.future.cancel(false);
-			this.future = null;
-		}
-	}
-
-	private ScheduledExecutorService getExecutor() {
-		return this.agent.getScheduledExecutor("Observer");
+		// nothing to do
 	}
 
 	@Override
 	public void notify(ObserverEvent event) {
-
 		if (event.added.isEmpty() && event.updated.isEmpty() && event.removed.isEmpty())
 			return;
 
 		ExecutorService service = this.agent.getExecutor("Observer");
 		if (!service.isShutdown())
-			this.future = service.submit(() -> doUpdates(event));
+			service.submit(() -> doUpdates(event));
 	}
 
 	protected void doUpdates(ObserverEvent event) {
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultRealmHandler.java b/li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultRealmHandler.java
index 8b88b5856..4d892e233 100644
--- a/li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultRealmHandler.java
+++ b/li.strolch.agent/src/main/java/li/strolch/agent/impl/DefaultRealmHandler.java
@@ -47,10 +47,6 @@ public class DefaultRealmHandler extends StrolchComponent implements RealmHandle
 
 	protected Map<String, InternalStrolchRealm> realms;
 
-	/**
-	 * @param container
-	 * @param componentName
-	 */
 	public DefaultRealmHandler(ComponentContainer container, String componentName) {
 		super(container, componentName);
 	}
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/impl/EventCollectingObserverHandler.java b/li.strolch.agent/src/main/java/li/strolch/agent/impl/EventCollectingObserverHandler.java
index acdeab2aa..075b3b5ac 100644
--- a/li.strolch.agent/src/main/java/li/strolch/agent/impl/EventCollectingObserverHandler.java
+++ b/li.strolch.agent/src/main/java/li/strolch/agent/impl/EventCollectingObserverHandler.java
@@ -46,12 +46,12 @@ public class EventCollectingObserverHandler implements ObserverHandler {
 
 	private static final Logger logger = LoggerFactory.getLogger(DefaultObserverHandler.class);
 
-	private MapOfLists<String, Observer> observerMap;
+	private final MapOfLists<String, Observer> observerMap;
 
 	private ObserverEvent observerEvent;
 
 	private ScheduledFuture<?> future;
-	private StrolchAgent agent;
+	private final StrolchAgent agent;
 	private final StrolchRealm realm;
 
 	public EventCollectingObserverHandler(StrolchAgent agent, StrolchRealm realm) {
@@ -67,7 +67,6 @@ public class EventCollectingObserverHandler implements ObserverHandler {
 
 	@Override
 	public void stop() {
-
 		if (this.future != null) {
 			this.future.cancel(false);
 			this.future = null;