Remove the wait_until function