Removed old vars