Make locking more uniform
Remove a couple of orphaned lines