BZ-9967: cleanup text