Major source cleanup.