Remove obsolete compatibility aliases

Change-Id: Iaf607a1dc4ad410c0799a467e9150ddb73c66bb3