SelectWordUtil cleanup (IDEA-CR-15854)