Get rid of old vars