replaced Guava with Java 8