Move deadlock tracker to new class and remove from original tracker.