add new stream method
remove plugin related things