second round of cleanup