Clean and switch to q-io