Ali's cleanup