NOVAD: Removed trivial TODO issues.

Removed TODOs for issues #628, #632, #633, #634

Closed #628, #632, #633, #634
Merge branch 'issue628' into integration