Guava dependency removed