Removed deadlocks