Remove dead code
Add analysisRecord