Removed obsolete vars