Second round of cleanup.