Also removes old TODOs which obviously won't be tackled: issue number not existing anymore.
refs 2693