Removed class variables that can be localized.