GCP-8065 and cleanup of deprecated