Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision a757ba179bb7ccc193cf855ee3b82d2d47d342eb)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision 639e4fc03a02dc79f5ba9c49c73a1e8b6ae95701)
@@ -377,10 +377,4 @@
 	register_tls( proc );
 
-	// io_future_t future;
-	// eventfd_t idle_buf;
-	// proc->idle_wctx.ftr = &future;
-	// proc->idle_wctx.rdbuf = &idle_buf;
-
-
 	// SKULLDUGGERY: We want to create a context for the processor coroutine
 	// which is needed for the 2-step context switch. However, there is no reason
@@ -737,5 +731,5 @@
 	{
 		tytagref( dlink(thread$), dlink(thread$) ) ?`inner( thread$ & this ) = void;
-		with( DLINK_VIA( thread$, typeof(((struct thread$ *)0p)->cltr_link) ) )
+		with( DLINK_VIA( thread$, struct __thread_user_link ) )
 			remove( thrd );
 		cltr->nthreads -= 1;