Some classes deleted and others reformatted.