Removing runtime dep to guava