Removed commented out code.

Issue: GCP-7512, GCP-9697