Another round of cleanup