Codechecker clean-up