Beginning of major clean-up to support property CPT and term removal
More clean-up...
More clean-up...
Merge in changes from staging...