Remove commented codes and organized imports for this project

GCP-10151

Reviewer: Jaira Villarino