Removed obsolete variables
Removed obsolete variables