Removed old static deadlock detection
Fixed tunnel deadlock detection; now enabled