Major round of cleanup.