Hygiene: Remove unused class aliases

Change-Id: I859a091a4130feb17087394d90d26dd4d23f4a71