Remove unused imports and commented-out lines of codes

GCP-10156

Reviewer: Chezka Camille Arevalo