Index: kernel/generic/src/ddi/ddi.c
===================================================================
--- kernel/generic/src/ddi/ddi.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
+++ kernel/generic/src/ddi/ddi.c	(revision 59dc1817c08e39b828134871d9d9f684ea48c101)
@@ -361,20 +361,6 @@
 NO_TRACE static int dmamem_unmap_anonymous(uintptr_t virt)
 {
-	// TODO: This is an ugly hack
-	as_t *as = TASK->as;
-
-	mutex_lock(&as->lock);
-	as_area_t *area = find_locked_area(as, virt);
-	if (!area) {
-		mutex_unlock(&as->lock);
-		return ENOENT;
-	}
-	frame_free_noreserve(area->backend_data.base);
-	area->backend_data.base = 0;
-	area->backend_data.frames = 0;
-	mutex_unlock(&area->lock);
-	mutex_unlock(&as->lock);
-
-	return as_area_destroy(as, virt);
+	// TODO: implement unlocking & unmap
+	return EOK;
 }
 
Index: kernel/generic/src/mm/as.c
===================================================================
--- kernel/generic/src/mm/as.c	(revision e2a0d76262c824f700198bedc668eb60c9ab9cfa)
+++ kernel/generic/src/mm/as.c	(revision 59dc1817c08e39b828134871d9d9f684ea48c101)
@@ -672,11 +672,4 @@
 	
 	return NULL;
-}
-
-/** UGLY! UGLY! UGLY! */
-// TODO: REMOVE ASAP!
-as_area_t * find_locked_area(as_t *as, uintptr_t va)
-{
-	return find_area_and_lock(as, va);
 }