[ACR-1820] Deprecate low usability fields