Index: kernel/generic/include/ipc/event_types.h
===================================================================
--- kernel/generic/include/ipc/event_types.h	(revision 5a8fbcb97392f7c0b940ef1f854b4979f533bddc)
+++ kernel/generic/include/ipc/event_types.h	(revision 5ab16485f681adfc74e088c4343befe8a30bc0b7)
@@ -39,12 +39,6 @@
 	EVENT_KLOG = 0,
 	EVENT_KCONSOLE,
-	EVENT_WAIT,
 	EVENT_END
 } event_type_t;
-
-typedef enum wait_type {
-	TASK_CREATE = 0,
-	TASK_DESTROY
-} wait_type_t;
 
 #endif
Index: kernel/generic/src/proc/task.c
===================================================================
--- kernel/generic/src/proc/task.c	(revision 5a8fbcb97392f7c0b940ef1f854b4979f533bddc)
+++ kernel/generic/src/proc/task.c	(revision 5ab16485f681adfc74e088c4343befe8a30bc0b7)
@@ -197,11 +197,4 @@
 	interrupts_restore(ipl);
 	
-	/*
-	 * Notify about task creation.
-	 */
-	if (event_is_subscribed(EVENT_WAIT))
-		event_notify_3(EVENT_WAIT, TASK_CREATE, LOWER32(ta->taskid),
-		    UPPER32(ta->taskid));
-	
 	return ta;
 }
@@ -235,11 +228,4 @@
 	if (atomic_predec(&t->as->refcount) == 0) 
 		as_destroy(t->as);
-	
-	/*
-	 * Notify about task destruction.
-	 */
-	if (event_is_subscribed(EVENT_WAIT))
-		event_notify_3(EVENT_WAIT, TASK_DESTROY, LOWER32(t->taskid),
-		    UPPER32(t->taskid));
 	
 	free(t);
Index: uspace/srv/ns/task.h
===================================================================
--- uspace/srv/ns/task.h	(revision 5a8fbcb97392f7c0b940ef1f854b4979f533bddc)
+++ uspace/srv/ns/task.h	(revision 5ab16485f681adfc74e088c4343befe8a30bc0b7)
@@ -35,10 +35,8 @@
 
 #include <ipc/ipc.h>
-#include <event.h>
 
 extern int task_init(void);
 extern void process_pending_wait(void);
 
-extern void wait_notification(wait_type_t et, task_id_t id);
 extern void wait_for_task(task_id_t id, ipc_call_t *call, ipc_callid_t callid);