tidy up, upgrade to guava 17