code cleanup GCP-7236