More native cleanup.