More copy cleanup.