Index: libcfa/src/concurrency/locks.hfa
===================================================================
--- libcfa/src/concurrency/locks.hfa	(revision f835806612595a6682261400a9575e2a7fa995c5)
+++ libcfa/src/concurrency/locks.hfa	(revision 490d17e0b39c90f5bb07fc31145f9ddae9ca2a1d)
@@ -366,72 +366,4 @@
 static inline void ?=?( simple_owner_lock & this, simple_owner_lock this2 ) = void;
 
-static inline void lock(simple_owner_lock & this) with(this) {
-	if (owner == active_thread()) {
-		recursion_count++;
-		return;
-	}
-	lock( lock __cfaabi_dbg_ctx2 );
-
-	if (owner != 0p) {
-		insert_last( blocked_threads, *active_thread() );
-		unlock( lock );
-		park( );
-		return;
-	}
-	owner = active_thread();
-	recursion_count = 1;
-	unlock( lock );
-}
-
-void pop_and_set_new_owner( simple_owner_lock & this ) with( this ) {
-	thread$ * t = &try_pop_front( blocked_threads );
-	owner = t;
-	recursion_count = ( t ? 1 : 0 );
-	unpark( t );
-}
-
-static inline void unlock(simple_owner_lock & this) with(this) {
-	lock( lock __cfaabi_dbg_ctx2 );
-	/* paranoid */ verifyf( owner != 0p, "Attempt to release lock %p that isn't held", &this );
-	/* paranoid */ verifyf( owner == active_thread(), "Thread %p other than the owner %p attempted to release owner lock %p", owner, active_thread(), &this );
-	// if recursion count is zero release lock and set new owner if one is waiting
-	recursion_count--;
-	if ( recursion_count == 0 ) {
-		pop_and_set_new_owner( this );
-	}
-	unlock( lock );
-}
-
-static inline void on_notify(simple_owner_lock & this, struct thread$ * t ) with(this) {
-	lock( lock __cfaabi_dbg_ctx2 );
-	// lock held
-	if ( owner != 0p ) {
-		insert_last( blocked_threads, *t );
-		unlock( lock );
-	}
-	// lock not held
-	else {
-		owner = t;
-		recursion_count = 1;
-		unpark( t );
-		unlock( lock );
-	}
-}
-
-static inline size_t on_wait(simple_owner_lock & this) with(this) { 
-	lock( lock __cfaabi_dbg_ctx2 );
-	/* paranoid */ verifyf( owner != 0p, "Attempt to release lock %p that isn't held", &this );
-	/* paranoid */ verifyf( owner == active_thread(), "Thread %p other than the owner %p attempted to release owner lock %p", owner, active_thread(), &this );
-
-	size_t ret = recursion_count;
-
-	pop_and_set_new_owner( this );
-
-	unlock( lock );
-	return ret;
-}
-
-static inline void on_wakeup(simple_owner_lock & this, size_t recursion ) with(this) { recursion_count = recursion; }
-
 //-----------------------------------------------------------------------------
 // Spin Queue Lock