Remove dead code
Add local thread id to the frwlock to simplify debugging pair-lock
related pileups.