remove guava dependency
remove guava dependency
changes to support guava removal