Remove unused referenced and stop using deprecated aliases

Change-Id: I7d3693fa2adb4a59f9da3907d2bfa81802969760
Merge "Remove unused referenced and stop using deprecated aliases"