after first round of cleanup