Some TODO updates

 - Unnecessary todo statemens either removed, or converted into regular comments.