[PATCH 2/8] Remove unused classes and their associated problems.