Cleanup some extern vars