diff --git a/TODO b/TODO
index edcb41d4..073916f7 100644
--- a/TODO
+++ b/TODO
@@ -46,20 +46,6 @@ Future work:
 		(easy) Start with album art fetching script
 		(hard) Build in to Ocarina
 
-	- Playlist custom sorting:
-		Click column headers to choos sort order
-		Keep a list of fields that the user has selected and place new
-		fields in the front of this list.  Use a recursive stable sort
-		to do the sorting.
-
-	- Better design file format:
-		Todo list in each document instead of all at once in the footer.
-		Leave the Todo list out of the official "design document" and
-		keep it in each individual section instead.
-		XML?
-		Code formatting?
-		Checkbox for when features are done? (reference commit)
-
 	- Copy a song group to a different directory:
 		This can be useful for keeping an external device (like an
 		Android phone) updated with the music you want to listen to.
@@ -105,12 +91,6 @@ Future work:
 		saving on every add / remove won't be a huge performance hit
 		and may actually be more efficient in the long run.
 
-	- Scons improvements:
-		Why does everything compile with the same CONFIG_* parameters?
-		Cleanups to tests/Sconscript
-		Global dependency resolution (rather than having multiple ways
-			in lib/ design/ and tests/)
-
 	- Playqueue and database inherit from common class
 	- "About" dialog
 	- Investigate "Bulk insert" callbacks for performance