Remove deprecated members

Change-Id: Ia74baf6a15b878c04a1dec3cea03eddd3eb123f4