CCode cleanup