first round of cleanup