Remove deprecated Guava usage