NOVAD: Removed TODO and comments around it that were unneeded.