Refs #695. Removed old specific code from generic code.