replace dataflow with simpler Thread code, remove dataflow dependency

While debugging other issues it come to me there were some complicated backtraces for code that could be a lot simpler - so here it is smaller code and removed dependency.