Removed dependency to guava