Remove dependency on Guava