Remove guava dependency in favor of more lightweight primitive support