Remove guava where possible

Fixes #28