Remove almost unused StringUtils and replace the two usage occurrences of one 'trim' function.
@ssnyder