Removing some outdated todo comments.