got rid of guava dependency