remote unnecessary classes