code clean up
changes for GCP-6378