Item12705: And make Crawford's cleanup functional