Another round of cleanup.