CCC-Public cleanup