Code cleaning after guava upgrade