Removing wait_until