[TAC-116] cc to nothing refactoring