More removal of waitForOrKill(xxxx)