final round of cleanup