Remove commented codes and organized imports for this project

GCP-10154

Reviewer: Jaira Villarino