Removed a number of unused class declarations
Synced to ffc1b10cc76e3959a4254959a609e04c91792cc2
Synced to ffc1b10cc76e3959a4254959a609e04c91792cc2