GCP-7747 - cleanup (previous commit was for GCP-7747)