fix joining waitds
explicit stream locking
remove unused vars
remove dumper task