Removed some old variables