Get rid of some Guava dependencies