Removed TODOs that turned into GitHub issues, see #6