Review changes, part II: remove stale comments