Remove unwanted attributes in the pojo

Reviewer: Cy Casada

Issue: GCP-9457