Replaced third party StringUtil with local StringUtils