Eliminate custom wait_until from step definitions