Remove unused field

Change-Id: I2f86556effb4938a94446406e9b75b2a7ff55a0f
Merge "Remove unused field"