More Guava removal.