Merge changes I3b8bf146,I2f7db7ad into main

* changes:
  Remove another unused class member.
  Remove unused class member.