Eliminate paddle wait