Locking cleanup in the Engine.
Locking cleanup in the Slave.