Hygiene: Cleanup unused class aliases

Change-Id: I06ca00c4fa4b77d4f04f95f59bcc8d7dfb4dd5ba
Merge "Hygiene: Cleanup unused class aliases"