Removed custom StringUtils and used Apache Commons instead.