Work towards use of QualityFactorFactory throughout application.
Removed another direct use of QualityFactor class.
Removed unused 'use' statements