Starting to clean things up, removing kryo and guava dependencies.