a round of cleanup