remove Guava dependency
refactor