Remove deprecated fields/members

Change-Id: Ica1c9dbc0f190a0565c548f6566837287b19d39c
6 files changed