Care sites and specialty, specialty code clean-up

Referencing prior discussions on this topic