SLT-275 Guava upgrade cleanup