remove deadlock causing app/network threads to acquire locks in different orders