Remove dependency to Guava