Remove timeoutWait due to improved scheduler handling