Trim the TODO after migrating some to issues

These removed lines are now issues in the repo, will need to
eventually decide on everything else and get rid of this file.