GCP-8515 (remove unused codes)