[#3139] Slimmed down number of CCE paths