api cleanup, stream api migration