am 90f17901: Merge "Delete unused fields in class"

* commit '90f1790105beb185fb0df6f0fe9c6cd7031c7d1e':
  Delete unused fields in class