Remove over-complicated locking code.