Removed Guava dependency