Removed dependency on Google Guava