NO-JIRA: remove now-stale comments missed when switching to cp files in 71b781d9193c6...