Removed dependency to Google Guava