replaced dateUtils and StringUtils with OSS variants