diff --git a/TODO b/TODO
index fdefb08a..246a6ddc 100644
--- a/TODO
+++ b/TODO
@@ -92,12 +92,8 @@ Future work:
 		  that it is used for text processing)
 	- Make DatabaseEntry::primary_key() private (only used by Database)
 	- "On demand" databases that load the first time they are accessed?
-	- Split filtering code into index for searching and text formatting
-	  - Text formatting includes lowercase, length strings, and date strings
-	  - Queues have their own indexes?
+	- Queues have their own indexes?
 	- Remove callbacks (may need "driver" for queues)
-	- Reorganize gui code into distinct layers
-	  - Possibly merge back with lib/?
 	- Remove glib specifc code from core/
 	- Virtual file system
 	  - Fake filesystem access for testing