Remove unused class aliases

Change-Id: I7e00b779bd8aad336e00e7627b02b28fbba762f7
Merge "Remove unused class aliases"