Cleanup workers in preparation for rewrite