TUP-2293: change and remove some comments.