Eliminating some unsed classes