CombinedSingleAnalysis cleanup