Cleanup some of the auto variables