Removed dependency on Google's guava library