another round of cleanup