Tidy CCI manifest