Make the local lock per lock id
Remove stale entries