Remove guava dependency in favor of more lightweight primative support