diff --git a/TODO b/TODO
index a2943e1f..1471b0c7 100644
--- a/TODO
+++ b/TODO
@@ -69,8 +69,6 @@ Future work:
 		- Save window size
 		- Set album art size
 
-	- Rip out Ocarina 5.x importing and legacy file support
-
 	- AirPlay / remote audio support
 
 	- Media keys
@@ -83,9 +81,8 @@ Future work:
 	- Playqueue and database inherit from common class
 	- "About" dialog
 	- Investigate "Bulk insert" callbacks for performance
-	- Use "friend" class for valid and id flags of a DatabaseEntry
-	- Doxygen support for documentation?
 	- Jenkins
 		- Run tests
 		- Show gcov graph
 		- Run cppcheck
+	- Read tags with gstreamer?