Index: kernel/generic/src/proc/scheduler.c
===================================================================
--- kernel/generic/src/proc/scheduler.c	(revision d0c82c531ddd91c5c32e571f69768c044cf234b2)
+++ kernel/generic/src/proc/scheduler.c	(revision e821e497bdb3d07036342b84204a38ccc7f2bc09)
@@ -455,17 +455,5 @@
 			irq_spinlock_unlock(&THREAD->sleep_queue->lock, false);
 			
-			/*
-			 * Check for possible requests for out-of-context
-			 * invocation.
-			 *
-			 */
-			if (THREAD->call_me) {
-				THREAD->call_me(THREAD->call_me_with);
-				THREAD->call_me = NULL;
-				THREAD->call_me_with = NULL;
-			}
-			
 			irq_spinlock_unlock(&THREAD->lock, false);
-			
 			break;
 		
Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision d0c82c531ddd91c5c32e571f69768c044cf234b2)
+++ kernel/generic/src/proc/thread.c	(revision e821e497bdb3d07036342b84204a38ccc7f2bc09)
@@ -48,5 +48,4 @@
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
-#include <synch/rwlock.h>
 #include <cpu.h>
 #include <str.h>
@@ -329,6 +328,4 @@
 	thread->flags = flags;
 	thread->state = Entering;
-	thread->call_me = NULL;
-	thread->call_me_with = NULL;
 	
 	timeout_initialize(&thread->sleep_timeout);
@@ -343,6 +340,4 @@
 	thread->detached = false;
 	waitq_initialize(&thread->join_wq);
-	
-	thread->rwlock_holder_type = RWLOCK_NONE;
 	
 	thread->task = task;
@@ -583,22 +578,4 @@
 	
 	(void) waitq_sleep_timeout(&wq, usec, SYNCH_FLAGS_NON_BLOCKING);
-}
-
-/** Register thread out-of-context invocation
- *
- * Register a function and its argument to be executed
- * on next context switch to the current thread. Must
- * be called with interrupts disabled.
- *
- * @param call_me      Out-of-context function.
- * @param call_me_with Out-of-context function argument.
- *
- */
-void thread_register_call_me(void (* call_me)(void *), void *call_me_with)
-{
-	irq_spinlock_lock(&THREAD->lock, false);
-	THREAD->call_me = call_me;
-	THREAD->call_me_with = call_me_with;
-	irq_spinlock_unlock(&THREAD->lock, false);
 }