GCP-6553 remove unused code