Code cleanup, remove commented code

Reviewer: Chezka Arevalo (post commit)

Issue: GCP-9225