diff --git a/emper/ContextManager.cpp b/emper/ContextManager.cpp
index 3f7291be714fba8f525f5ac6a427e8736eaf99b6..b76a3335ca6752a8d5517f05c5c13b2210b763d0 100644
--- a/emper/ContextManager.cpp
+++ b/emper/ContextManager.cpp
@@ -13,22 +13,11 @@
 #include "Emper.hpp"
 #include "Fibril.hpp"
 #include "Runtime.hpp"
-#include "emper-common.h"
 #include "emper-config.h"	 // // IWYU pragma: keep
 
 class AbstractFiber;
 
-ContextManager::ContextManager(Runtime& runtime) : MemoryManager(runtime), runtime(runtime) {
-	auto newWorkerHook = [this](ATTR_UNUSED workerid_t workerId) {
-		for (unsigned int i = 0; i < CONTEXT_MANAGER_FIRST_LAYER_QUEUE_SIZE * 2; ++i) {
-			auto* context = new Context(this->runtime.dispatcher.getDispatchLoop());
-			putFreeContext(context);
-		}
-	};
-	// Note that it is important that this hook is executed *after*
-	// the one of the MemoryManager superclass.
-	runtime.addNewWorkerHook(newWorkerHook);
-}
+ContextManager::ContextManager(Runtime& runtime) : MemoryManager(runtime), runtime(runtime) {}
 
 auto ContextManager::getFreeContext() -> Context* {
 	if constexpr (!emper::CONTEXT_MANAGER_WITH_MEMORY_MANAGER) {