NOJIRA Remove obsolete TODO comments