Remove dep on StringUtils and fix logging