update to use new streams modules; clements code all gone