Removed unused imports and commented codes

GCP-10150

Reviewer: Mae Isabelle Turiana