Code cleanup : Remove commented out code and unused methods
Discovered while fixing : GCP-10148
Reviewer : Cyrus Venn Casada