CP-8538: Removed references to DVSC deprecation