Tidy up CS violations