remove more classes from aluminium, the less prod puppet the better

Change-Id: Ia59dbd1b4d732ea653c6f9000f36820c9c5c4322
Merge "remove more classes from aluminium, the less prod puppet the better" into production