diff --git a/TODO b/TODO
index 98219f24..a2943e1f 100644
--- a/TODO
+++ b/TODO
@@ -61,8 +61,8 @@ Future work:
 		the library?  Perhaps create a mirror group?
 
 	- Extra testing ideas:
-		- Double check that all inputs and outputs are tested
 		- Test callbacks
+		- Create a default main() that deletes data directory
 
 	- Preferences:
 		- Set default sort
@@ -83,12 +83,7 @@ Future work:
 	- Playqueue and database inherit from common class
 	- "About" dialog
 	- Investigate "Bulk insert" callbacks for performance
-	- Initialize PQs with multiple flags
 	- Use "friend" class for valid and id flags of a DatabaseEntry
-	- New tag layer
-		- Functions to tag individual files
-		- Functions to read multiple tags from a single text file when
-		  CONFIG_TEST == true
 	- Doxygen support for documentation?
 	- Jenkins
 		- Run tests