Remove unused funcs
Fix data race
Merge remote-tracking branch 'upstream/master' into next