Removed StringUtil usage