Fixed additional code path without lock departure
Removed dead code