Fix old CBP not deleting C and B if there are no matching Parts