Six compatible cleanup