Cleaned up locks.