First round of codechecker cleaning