BuildAnalysis cleanup