change method names, add streaming methods
remove unused dep