More tuning of local cleanup