Remove TODOs and add as issues to GitHub.