Index: src/libcfa/concurrency/kernel
===================================================================
--- src/libcfa/concurrency/kernel	(revision ee897e4b569553fa2a4e77d3de048d5fbfcba4fb)
+++ src/libcfa/concurrency/kernel	(revision eafb0940a4d0710ce0168718144c5d75bd21e5fa)
@@ -28,8 +28,4 @@
 //-----------------------------------------------------------------------------
 // Locks
-// void lock( simple_lock * );
-// void lock( simple_lock *, spinlock * );
-// void unlock( simple_lock * );
-
 void lock( spinlock * );
 void unlock( spinlock * );
Index: src/libcfa/concurrency/kernel.c
===================================================================
--- src/libcfa/concurrency/kernel.c	(revision ee897e4b569553fa2a4e77d3de048d5fbfcba4fb)
+++ src/libcfa/concurrency/kernel.c	(revision eafb0940a4d0710ce0168718144c5d75bd21e5fa)
@@ -36,16 +36,4 @@
 #include "invoke.h"
 
-static volatile int lock;
-
-void spin_lock( volatile int *lock ) {
-	for ( unsigned int i = 1;; i += 1 ) {
-	  if ( *lock == 0 && __sync_lock_test_and_set_4( lock, 1 ) == 0 ) break;
-	}
-}
-
-void spin_unlock( volatile int *lock ) {
-	__sync_lock_release_4( lock );
-}
-
 //-----------------------------------------------------------------------------
 // Kernel storage
@@ -176,5 +164,5 @@
 void ?{}(cluster * this) {
 	( &this->ready_queue ){};
-	lock = 0;
+	( &this->lock ){};
 }
 
@@ -413,38 +401,4 @@
 //-----------------------------------------------------------------------------
 // Locks
-// void ?{}( simple_lock * this ) {
-// 	( &this->blocked ){};
-// }
-
-// void ^?{}( simple_lock * this ) {
-
-// }
-
-// void lock( simple_lock * this ) {
-// 	{
-// 		spin_lock( &lock );
-// 		append( &this->blocked, this_thread() );
-// 		spin_unlock( &lock );
-// 	}
-// 	ScheduleInternal();
-// }
-
-// void lock( simple_lock * this, spinlock * to_release ) {
-// 	{
-// 		spin_lock( &lock );
-// 		append( &this->blocked, this_thread() );
-// 		spin_unlock( &lock );
-// 	}
-// 	ScheduleInternal( to_release );
-// 	lock( to_release );
-// }
-
-// void unlock( simple_lock * this ) {
-// 	thread * it;
-// 	while( it = pop_head( &this->blocked) ) {
-// 		ScheduleThread( it );
-// 	}
-// }
-
 void ?{}( spinlock * this ) {
 	this->lock = 0;