GCP-6051
GCP-6051 Code Clean Up