Remove unused funcs
Use std::timed_mutex
Merge remote-tracking branch 'upstream/master' into next
Fix locks