remove some unused and unnecessary classes