Removed old variables