Index: kernel/genarch/src/kbd/i8042.c
===================================================================
--- kernel/genarch/src/kbd/i8042.c	(revision c9b550bff53b2109d2746935072fca1bbe632894)
+++ kernel/genarch/src/kbd/i8042.c	(revision 00eace30da787ce4c1daedfb63575ce441cf65d9)
@@ -95,36 +95,4 @@
 static irq_t i8042_mouse_irq;
 
-void i8042_grab(void)
-{
-	ipl_t ipl = interrupts_disable();
-	
-	spinlock_lock(&i8042_kbd_irq.lock);
-	i8042_kbd_irq.notif_cfg.notify = false;
-	spinlock_unlock(&i8042_kbd_irq.lock);
-	
-	spinlock_lock(&i8042_mouse_irq.lock);
-	i8042_mouse_irq.notif_cfg.notify = false;
-	spinlock_unlock(&i8042_mouse_irq.lock);
-	
-	interrupts_restore(ipl);
-}
-
-void i8042_release(void)
-{
-	ipl_t ipl = interrupts_disable();
-	
-	spinlock_lock(&i8042_kbd_irq.lock);
-	if (i8042_kbd_irq.notif_cfg.answerbox)
-		i8042_kbd_irq.notif_cfg.notify = true;
-	spinlock_unlock(&i8042_kbd_irq.lock);
-	
-	spinlock_lock(&i8042_mouse_irq.lock);
-	if (i8042_mouse_irq.notif_cfg.answerbox)
-		i8042_mouse_irq.notif_cfg.notify = true;
-	spinlock_unlock(&i8042_mouse_irq.lock);
-	
-	interrupts_restore(ipl);
-}
-
 static irq_ownership_t i8042_claim(irq_t *irq)
 {
@@ -139,12 +107,4 @@
 static void i8042_irq_handler(irq_t *irq)
 {
-	if (irq->notif_cfg.notify && irq->notif_cfg.answerbox) {
-		/*
-		 * This will hopefully go to the IRQ dispatcher code soon.
-		 */ 
-		ipc_irq_send_notif(irq);
-		return;
-	}
-
 	i8042_instance_t *instance = irq->instance;
 	i8042_t *dev = instance->i8042;
@@ -214,6 +174,4 @@
 	sysinfo_set_item_val("mouse.devno", NULL, mouse_devno);
 	sysinfo_set_item_val("mouse.inr", NULL, mouse_inr);
-	
-	i8042_grab();
 }