cleanup for code-analysis