Change lock ordering to prevent deadlocks
Missed obsolete item