Analyzer cleanup