removed obsolete vars