diff --git a/src/lib/component/controller/CodeController.cpp b/src/lib/component/controller/CodeController.cpp
index c35cb9c5..de284c38 100644
--- a/src/lib/component/controller/CodeController.cpp
+++ b/src/lib/component/controller/CodeController.cpp
@@ -125,25 +125,22 @@ void CodeController::handleMessage(MessageActivateTokens* message)
 		std::shared_ptr<TokenLocationCollection> collection = m_storageAccess->getTokenLocationsForTokenIds(activeTokenIds);
 		view->showCodeSnippets(getSnippetsForActiveTokenLocations(collection.get(), declarationId), activeTokenIds);
 
-		if (!message->isFromSystem)
+		size_t fileCount = collection->getTokenLocationFileCount();
+		size_t referenceCount = collection->getTokenLocationCount();
+
+		std::stringstream ss;
+		ss << message->tokenIds.size() << ' ';
+		ss << (message->tokenIds.size() == 1 ? "result" : "results");
+
+		if (fileCount > 0)
 		{
-			size_t fileCount = collection->getTokenLocationFileCount();
-			size_t referenceCount = collection->getTokenLocationCount();
-
-			std::stringstream ss;
-			ss << message->tokenIds.size() << ' ';
-			ss << (message->tokenIds.size() == 1 ? "result" : "results");
-
-			if (fileCount > 0)
-			{
-				ss << " with " << referenceCount << ' ';
-				ss << (referenceCount == 1 ? "reference" : "references");
-				ss << " in " << fileCount << ' ';
-				ss << (fileCount == 1 ? "file" : "files");
-			}
-
-			MessageStatus(ss.str()).dispatch();
+			ss << " with " << referenceCount << ' ';
+			ss << (referenceCount == 1 ? "reference" : "references");
+			ss << " in " << fileCount << ' ';
+			ss << (fileCount == 1 ? "file" : "files");
 		}
+
+		MessageStatus(ss.str()).dispatch();
 	}
 
 	showContents(message);
diff --git a/src/lib/component/controller/helper/ActivationTranslator.cpp b/src/lib/component/controller/helper/ActivationTranslator.cpp
index 9b75f97d..1e6a97da 100644
--- a/src/lib/component/controller/helper/ActivationTranslator.cpp
+++ b/src/lib/component/controller/helper/ActivationTranslator.cpp
@@ -96,7 +96,6 @@ std::shared_ptr<MessageActivateTokens> ActivationTranslator::translateMessage(co
 
 	std::shared_ptr<MessageActivateTokens> m;
 	m = std::make_shared<MessageActivateTokens>(message, nodeIds);
-	m->isFromSystem = message->isFromSystem;
 	return m;
 }
 
diff --git a/src/lib/utility/messaging/type/MessageActivateNodes.h b/src/lib/utility/messaging/type/MessageActivateNodes.h
index c4340335..0dbcb5bb 100644
--- a/src/lib/utility/messaging/type/MessageActivateNodes.h
+++ b/src/lib/utility/messaging/type/MessageActivateNodes.h
@@ -18,7 +18,6 @@ public:
 	};
 
 	MessageActivateNodes()
-		: isFromSystem(false)
 	{
 	}
 
@@ -46,8 +45,6 @@ public:
 	}
 
 	std::vector<ActiveNode> nodes;
-
-	bool isFromSystem;
 };
 
 #endif // MESSAGE_ACTIVATE_NODES_H
diff --git a/src/lib/utility/messaging/type/MessageActivateTokens.h b/src/lib/utility/messaging/type/MessageActivateTokens.h
index abadba51..836576d4 100644
--- a/src/lib/utility/messaging/type/MessageActivateTokens.h
+++ b/src/lib/utility/messaging/type/MessageActivateTokens.h
@@ -12,7 +12,6 @@ public:
 		: tokenIds(tokenIds)
 		, isEdge(false)
 		, isAggregation(false)
-		, isFromSystem(false)
 		, isFromSearch(false)
 	{
 		setIsReplayed(other->isReplayed());
@@ -37,7 +36,6 @@ public:
 
 	bool isEdge;
 	bool isAggregation;
-	bool isFromSystem;
 	bool isFromSearch;
 };