TOI2 cleanup