Code cleanup : removed commented out lines of code and optimized imports

GCP-10152

Reviewer : Cyrus Venn Casada