Cleanup some leftover Native oldness