Remove usage of newly deprecated Guava methods