Removed Guava dependency and changed related code