Minor change: removed obsolete variables.