removed  unnecessary classes