Making a round of cleanup.