NOVAD: Close #630

Removed TODO, removed commented code.

close #630