CCC-6 - code cleanup