More Parature cleanup.