Cleanup dead fields

Bug: 273591201
Test: m
Flag: None
Change-Id: Iebcbcc2883420c8fb1976acd42d069ee65034f07
1 file changed