Index: libcfa/src/concurrency/ready_queue.cfa
===================================================================
--- libcfa/src/concurrency/ready_queue.cfa	(revision f6fdfb146eefcb8dc22afd3c5b331077835db18b)
+++ libcfa/src/concurrency/ready_queue.cfa	(revision eeb9f9f094667c8208ca6e79e9de4c9e6e60e836)
@@ -524,5 +524,4 @@
 				assert(!lanes.data[idx].lock);
 
-				#if defined(USE_NEW_SUBQUEUE)
 					if(is_empty(sl)) {
 						assert( sl.anchor.next == 0p );
@@ -534,18 +533,4 @@
 						assert( mock_head(sl)  != sl.prev );
 					}
-				#else
-					assert(head(sl)->link.prev == 0p );
-					assert(head(sl)->link.next->link.prev == head(sl) );
-					assert(tail(sl)->link.next == 0p );
-					assert(tail(sl)->link.prev->link.next == tail(sl) );
-
-					if(is_empty(sl)) {
-						assert(tail(sl)->link.prev == head(sl));
-						assert(head(sl)->link.next == tail(sl));
-					} else {
-						assert(tail(sl)->link.prev != head(sl));
-						assert(head(sl)->link.next != tail(sl));
-					}
-				#endif
 			}
 		}
@@ -569,23 +554,8 @@
 static inline void fix(__intrusive_lane_t & ll) {
 	#if !defined(USE_MPSC)
-		#if defined(USE_NEW_SUBQUEUE)
 			if(is_empty(ll)) {
 				verify(ll.anchor.next == 0p);
 				ll.prev = mock_head(ll);
 			}
-		#else
-			// if the list is not empty then follow he pointer and fix its reverse
-			if(!is_empty(ll)) {
-				head(ll)->link.next->link.prev = head(ll);
-				tail(ll)->link.prev->link.next = tail(ll);
-			}
-			// Otherwise just reset the list
-			else {
-				verify(tail(ll)->link.next == 0p);
-				tail(ll)->link.prev = head(ll);
-				head(ll)->link.next = tail(ll);
-				verify(head(ll)->link.prev == 0p);
-			}
-		#endif
 	#endif
 }