Removing all dependencies to Google Guava