Cleanup enhancement