Removed duplicate random delay
Made thread deadlock timeout stricter