one more round of cleanup