Remove ping wait, not strictly required