Beginning of major clean-up to support property CPT and term removal