CP old object dependency removal changes