AGOVA-56 Get rid of Guava