Cleanup cpd structure