c4p cleanup