First round of cleanup.