Index: libcfa/src/concurrency/channel.hfa
===================================================================
--- libcfa/src/concurrency/channel.hfa	(revision ca8c91ce061adc1907a354dacabb789d39f641ba)
+++ libcfa/src/concurrency/channel.hfa	(revision cb69fba7fe6d9bdecb12c9cd99a859696553437e)
@@ -343,5 +343,4 @@
 
 static inline bool register_select( chan_read(T) & this, select_node & node ) with(this.chan, this) {
-    // mutex(sout) sout | "register_read";
     lock( mutex_lock );
     node.extra = &ret; // set .extra so that if it == 0p later in on_selected it is due to channel close
@@ -416,5 +415,4 @@
 
 static inline bool register_select( chan_write(T) & this, select_node & node ) with(this.chan, this) {
-    // mutex(sout) sout | "register_write";
     lock( mutex_lock );
     node.extra = &elem; // set .extra so that if it == 0p later in on_selected it is due to channel close
@@ -441,9 +439,5 @@
     // handle blocked consumer case via handoff (buffer is implicitly empty)
     ConsEmpty: if ( !cons`isEmpty ) {
-        if ( !__handle_waituntil_OR( cons ) ) {
-            // mutex(sout) sout | "empty";
-            break ConsEmpty;
-        }
-        // mutex(sout) sout | "signal";
+        if ( !__handle_waituntil_OR( cons ) ) break ConsEmpty;
         __cons_handoff( chan, elem );
         __set_avail_then_unlock( node, mutex_lock );