2.0 ccheck cleanup