GCP-6411 - comment unnecessary methods
GCP-6411 - merged with previous changes