Removing all dependencis on Google Guava