Updating todo & removing comment.