diff --git a/kernel/ds/tree.c b/kernel/ds/tree.c
index 68375cdd..1ce0a9d7 100644
--- a/kernel/ds/tree.c
+++ b/kernel/ds/tree.c
@@ -15,8 +15,7 @@ tree_t * tree_create() {
 }
 
 void tree_set_root(tree_t * tree, void * value) {
-	/* Set the root node for a tree
-	 * XXX THAT DIDN'T ALREADY HAVE ONE! XXX */
+	/* Set the root node for a new tree. */
 	tree_node_t * root = tree_node_create(value);
 	tree->root = root;
 	tree->nodes = 1;
diff --git a/kernel/fs/ext2_disk.c b/kernel/fs/ext2_disk.c
index 5a1094b7..3599082e 100644
--- a/kernel/fs/ext2_disk.c
+++ b/kernel/fs/ext2_disk.c
@@ -90,6 +90,7 @@ void ext2_disk_write_block(uint32_t block_no, uint8_t *buf) {
 	for (uint32_t i = 0; i < BLOCKSIZE / SECTORSIZE; ++i) {
 		ide_write_sector(DISK_PORT, 0, btos(block_no) + i, (uint8_t *)((uint32_t)buf + SECTORSIZE * i));
 		//XXX: a hack? how about making ide_write_sector() blocking?
+		//  XXX: ^ ide_write_sector() IS blocking, we don't get notified properly of finishes to write calls
 		timer_wait(10);
 	}
 	
@@ -654,12 +655,12 @@ uint32_t read_ext2_disk(fs_node_t *node, uint32_t offset, uint32_t size, uint8_t
 
 void
 open_ext2_disk(fs_node_t *node, uint8_t read, uint8_t write) {
-	//TODO: implementation
+	/* Nothing to do here */
 }
 
 void
 close_ext2_disk(fs_node_t *node) {
-	//TODO: implementation
+	/* Nothing to do here */
 }
 
 /**
diff --git a/kernel/mem/alloc.c b/kernel/mem/alloc.c
index 2896a348..ce121d41 100644
--- a/kernel/mem/alloc.c
+++ b/kernel/mem/alloc.c
@@ -8,8 +8,6 @@
  * Overall competition winner for speed.
  * Well ranked in memory usage.
  *
- * XXX: Modified to work withe the ToAru kernel.
- *
  * Copyright (c) 2010 Kevin Lange.  All rights reserved.
  *
  * Developed by: Kevin Lange <lange7@acm.uiuc.edu>
@@ -781,9 +779,7 @@ static void klfree(void *ptr) {
 				 * coalesce it into us to form one larger bin.
 				 */
 
-				// XXX
 				size_t old_size = bheader->size;
-				// XXX
 
 				klmalloc_skip_list_delete(next);
 				bheader->size = (size_t)bheader->size + (size_t)sizeof(klmalloc_big_bin_header) + next->size;