clean-up, changes to streamgraph data prep