removing commons-lang and using guava