Significant cleanup.