cleanup !i6 queries