Update libraries
Replace guava code with normal java constructs